Index: openacs-4/packages/cms/www/modules/categories/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/cms/www/modules/categories/delete.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/cms/www/modules/categories/delete.tcl 24 May 2001 01:30:52 -0000 1.2 @@ -6,7 +6,7 @@ request set_param mount_point -datatype keyword -optional -value categories # Determine if the folder is empty -template::query is_empty onevalue " +template::query get_empty_status is_empty onevalue " select content_keyword.is_leaf(:id) from dual " @@ -20,13 +20,10 @@ } else { - # Otherwise, delete the folder - set db [template::begin_db_transaction] - template::query delete_keyword dml " - begin content_keyword.delete(:id); end; - " - template::end_db_transaction - template::release_db_handle + db_transaction { + # Otherwise, delete the folder + set delete_keyword [db_exec_plsql delete_keyword "begin content_keyword.delete(:id); end;"] + } # Remove it from the clipboard, if it exists set clip [clipboard::parse_cookie] @@ -36,4 +33,4 @@ template::forward "refresh-tree?id=_all_&goto_id=$parent_id&mount_point=$mount_point" } - \ No newline at end of file +