Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	5 Jan 2007 21:22:20 -0000	1.10
+++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl	17 Feb 2007 23:01:36 -0000	1.11
@@ -106,7 +106,7 @@
       ns_log notice "-- upgrading to 0.22"
       set folder_ids [list]
       set package_ids [list]
-      db_foreach get_xowiki_packages {select package_id from apm_packages where package_key = 'xowiki'} {
+      foreach package_id [::xowiki::Package instances] {
         set folder_id [db_list get_folder_id "select f.folder_id from cr_items c, cr_folders f \
                 where c.name = 'xowiki: $package_id' and c.item_id = f.folder_id"]
         if {$folder_id ne ""} {
@@ -133,8 +133,7 @@
         contract_name FtsContentProvider
         owner xowiki
       }
-#       foreach pkgid [site_node::get_children -package_key xowiki -all \
-#                        -node_id 0 -element package_id] {
+#      foreach pkgid [::xowiki::Package instances] {
 #       ::xowiki::Page reindex -package_id $pkgid
 #       }
     }
@@ -177,8 +176,7 @@
       ns_log notice "-- upgrading to 0.31"
       set folder_ids [list]
       set package_ids [list]
-      set package_ids [db_list get_xowiki_packages {select package_id from apm_packages where package_key = 'xowiki'}]
-      foreach package_id $package_ids {
+      foreach package_id [::xowiki::Package instances] {
         set folder_id [db_string get_folder_id "select f.folder_id from cr_items c, cr_folders f \
                 where c.name = 'xowiki: $package_id' and c.item_id = f.folder_id"]
         if {$folder_id ne ""} {
@@ -233,9 +231,7 @@
   } {
     set folder_ids [list]
     set package_ids [list]
-    set package_ids [db_list get_xowiki_packages \
-                         {select package_id from apm_packages where package_key = 'xowiki'}]
-    foreach package_id $package_ids {
+    foreach package_id [::xowiki::Package instances] {
       ns_log notice "checking package_id $package_id"
       set folder_id [db_list get_folder_id "select f.folder_id from cr_items c, cr_folders f \
                 where c.name = 'xowiki: $package_id' and c.item_id = f.folder_id"]