Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.105 -r1.106
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 May 2007 08:43:10 -0000	1.105
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	4 Jun 2007 12:37:58 -0000	1.106
@@ -254,7 +254,26 @@
 
 
   Page instproc marshall {} {
-    return [my serialize]
+    my instvar name
+    if {[regexp {^..:[0-9]+$} $name] ||
+        [regexp {^[0-9]+$} $name]} {
+      #
+      # for anonymous entries, names might clash in the target
+      # instance. If we create on the target site for anonymous
+      # entries always new instances, we end up with duplicates.
+      # Therefore, we rename anonymous entries during export to
+      #    ip_address:port/item_id
+      #
+      set old_name $name
+      set server [ns_info server]
+      set port [ns_config ns/server/${server}/module/nssock port]
+      set name [ns_info address]:${port}/[my item_id]
+      set content [my serialize]
+      set name $old_name
+    } else {
+      set content [my serialize]
+    }
+    return $content
   }
 
   File instproc marshall {} {
@@ -272,10 +291,7 @@
     my set parent_id $parent_id
     my set package_id $package_id 
     my set creation_user $creation_user
-    # handle anonymous entries
-    my instvar name
-    if {[regexp {^..:[0-9]+$} $name]} {set name ""}
-    # in the general case, no actions required
+    # in the general case, no more actions required
   }
 
   File instproc demarshall {args} {