Index: openacs-4/packages/file-storage/www/file-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/file-storage/www/file-delete.tcl 19 Jun 2004 14:47:48 -0000 1.10 +++ openacs-4/packages/file-storage/www/file-delete.tcl 13 Jan 2005 13:58:13 -0000 1.11 @@ -46,14 +46,9 @@ if {[string equal $blocked_p "f"] } { # they confirmed that they want to delete the file - db_1row parent_id "select parent_id from cr_items where item_id = :file_id" - db_exec_plsql delete_file " - begin - file_storage.delete_file(:file_id); - end;" + set parent_id [fs::get_parent -item_id $file_id] + fs::delete_file -item_id $file_id -parent_id $parent_id - fs::do_notifications -folder_id $parent_id -filename $title -file_id $file_id -action "delete_file" - ad_returnredirect "?folder_id=$parent_id" ad_script_abort