Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	1 Feb 2004 19:12:51 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	8 Feb 2004 17:15:57 -0000	1.5
@@ -14,12 +14,12 @@
 permission::require_permission -object_id $tree_id -privilege category_tree_write
 
 db_transaction {
-    foreach id $category_id {
-	category::delete $id
+    foreach category_id [db_list order_categories_for_delete "" {
+	category::delete $category_id
     }
     category_tree::flush_cache $tree_id
 } on_error {
-    ad_return_complaint 1 "Error Deleting Node<p>This node contains leaf (child) nodes. If you really want to delete those leaf nodes, plesae delete them first. Thank you."
+    ad_return_complaint 1 "Error deleting category.<p>A category still contains subcategories. If you really want to delete those subcategories, please delete them first. Thank you."
     return
 }
 
Index: openacs-4/packages/categories/www/cadmin/category-delete-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.xql	8 Feb 2004 17:16:20 -0000	1.1
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="order_categories_for_delete">
+      <querytext>
+      
+	select category_id
+	from categories
+	where tree_id = :tree_id
+	and category_id in ([join $category_id ,])
+	order by left_ind desc
+
+      </querytext>
+</fullquery>
+
+ 
+</queryset>