Index: openacs-4/packages/xowiki/tcl/import-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/import-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/tcl/import-procs.tcl	4 Oct 2008 19:15:45 -0000	1.7
+++ openacs-4/packages/xowiki/tcl/import-procs.tcl	9 Nov 2008 01:37:33 -0000	1.8
@@ -98,6 +98,18 @@
         $o parent_id ""
       }
       set todo($o) 1
+      
+      #
+      # Handle import of categories in the first pass
+      #
+      if {[$o exists __map_command]} {
+        $o package_id [my package_id]
+        $o eval [$o set __map_command]
+      }
+      # FIXME remove?
+      #if {[$o exists __category_map]} {
+      #  array set ::__category_map [$o set __category_map]
+      #}
     }
     #my msg "item_ids=[array names item_ids], parent_ids=[array names parent_ids]"
 
@@ -128,6 +140,7 @@
             #my msg "... delay import of $o (no object with name $template_name_key) imported"
             continue
           }
+          #my msg "we found entry for name_map($template_name_key) = $name_map($template_name_key)"
         }
 
         if {[info exists item_ids($old_parent_id)]} {
@@ -144,8 +157,9 @@
         # objects to new IDs.
         #
         if {[$o istype ::xowiki::PageInstance]} {
-          #my msg "importing page_instance, map $template_name_key to $name_map($template_name_key)"
+          #my msg "importing [$o name] page_instance, map $template_name_key to $name_map($template_name_key)"
           $o page_template $name_map($template_name_key)
+          #my msg "exists template? [my isobject [$o page_template]]"
         }
 
         if {[info exists item_ids($old_parent_id)]} {
@@ -155,18 +169,21 @@
         }
 
         # Everything is mapped, we can now do the import.
-        
+       
         my import \
             -object $o \
             -replace $replace \
             -create_user_ids $create_user_ids
+        #my msg "import for $o done, name=[$o name]"
 
         # Maintain the maps and mark the item as done.
 
         if {$old_item_id ne ""} {
           set id_map($old_item_id) [$o item_id]
         }
         set name_map($old_parent_id-$old_name) [$o item_id]
+        #my msg "setting name_map($old_parent_id-$old_name)=$name_map($old_parent_id-$old_name), o=$o, old_item_id=$old_item_id"
+        #set ::__xowiki_import_object([$o item_id]) [self]
         
         unset todo($o)
         set new 1