Changeset 750 for ZMS/trunk/_copysupport.py

Timestamp:

23.10.2009 16:12:55 (3 years ago)

Author:

chris

Message:

zms-2.11.4-01

File:

• ZMS/trunk/_copysupport.py (modified) (4 diffs)

ZMS/trunk/_copysupport.py

@@ -144 +144 @@
       
       copy_of_prefix = 'copy_of_'
-      _id = REQUEST.get( '_id')
-      REQUEST.set( '_id', None)
+      id_prefix = REQUEST.get( 'id_prefix')
+      REQUEST.set( 'id_prefix', None)
       ob_ids = copy.copy(self.objectIds( self.dGlobalAttrs.keys()))
       for ob in self.objectValues( self.dGlobalAttrs.keys()):
@@ -152 +152 @@
           _globals.writeBlock( self, '[_normalize_ids_after_copy]: %s(%s)'%(id,ob.meta_id))
           
-          if _id is not None:
-            new_id = _globals.id_prefix(_id)
-            if new_id != _globals.id_prefix(id): 
-              if new_id == 'e':
-                new_id = self.getNewId(new_id)
+          if id_prefix:
+            id_prefix = _globals.id_prefix(id_prefix)
+            if id_prefix != _globals.id_prefix(id): 
+              new_id = self.getNewId(id_prefix)
               _globals.writeBlock( self, '[_normalize_ids_after_copy]: Rename %s(%s) to %s'%(id,ob.meta_id,new_id))
               self.manage_renameObject(id=id,new_id=new_id)
@@ -197 +196 @@
       
       copy_of_prefix = 'copy_of_'
-      _id = REQUEST.get( '_id')
-      REQUEST.set( '_id', None)
+      id_prefix = REQUEST.get( 'id_prefix')
+      REQUEST.set( 'id_prefix', None)
       ob_ids = copy.copy(self.objectIds( self.dGlobalAttrs.keys()))
       for ob in self.objectValues( self.dGlobalAttrs.keys()):
@@ -205 +204 @@
           _globals.writeBlock( self, '[_normalize_ids_after_move]: %s(%s)'%(id,ob.meta_id))
           
-          if _id is not None:
-            new_id = _globals.id_prefix(_id)
-            if new_id != _globals.id_prefix(id): 
-              if new_id == 'e':
-                new_id = self.getNewId(new_id)
+          if id_prefix:
+            id_prefix = _globals.id_prefix(id_prefix)
+            if id_prefix != _globals.id_prefix(id): 
+              new_id = self.getNewId(id_prefix)
               _globals.writeBlock( self, '[_normalize_ids_after_move]: Rename %s(%s) to %s'%(id,ob.meta_id,new_id))
               self.manage_renameObject(id=id,new_id=new_id)