Changeset 371

Timestamp:

05/23/08 14:23:23 (6 months ago)

Author:

johnbywater

Message:

Added stuff to postpone and then add-in references to instances of the same class, needed for persisting linked lists.

Files:

• trunk/src/dm/migrate.py (modified) (6 diffs)

trunk/src/dm/migrate.py

@@ -111 +111 @@
-        classRefs = self.outstandingReferences[className]
-        for attrTypeName in classRefs.values():
+            if attrTypeName == className:
+                continue
-            if attrTypeName in self.outstandingReferences:
-                return True
@@ -168 +170 @@
-            classDataKeys.sort()
-            #print "Iterating over %s %s" % (className, classDataKeys)
+            reflexiveClassData = {}
+            freshDomainObjects = {}
-            for objectId in classDataKeys:
-                #if objectId == 'metaData':
@@ -178 +182 @@
-                self.logger.info(msg)
-                strObjectData = {}
+                reflexiveStrObjectData = {}
-                for attr in domainClass.meta.attributes:
-                    if attr.isAssociateList:
@@ -183 +188 @@
-                    elif attr.isImageFile:
-                        continue
-se
-if objectData.has_key(attr.name):
-    value = objectData[attr.name]
-f attr.isDomainObjectRef and (
-    value.__class__ == int
-):
-idMapKey = "%s %s" % (attr.typeName, value)
-if idMapKey in self.idMap.keys():
-    mappedValue = self.idMap[idMapKey]
-    #msg = "Updating %s %s from %s to %s" % (
-    #    classNam
-    #    attr.name,
-    #    value,
-    #    mappedValue,
-            #)
-        #print msg
-        value = mappedValue
-if value.__class__ == unicode:
-    # SQLObject doesn't handle unicode.
-try:
-    value = str(value)
-except:
-    msg = "Failed to convert unicode to str"
-    msg += " for '%s' of %s %s: %s" % (
-        attr.name, className, objectId, value
-    
-    self.logger.error(msg)
-
-            self.logger.info(msg)
-        value = ""
-
+if objectData.has_key(attr.name)
+value = objectData[attr.name]
+if attr.isDomainObjectRef and value.__class__ == int:
+dMapKey = "%s %s" % (attr.typeName, value)
+if idMapKey in self.idMap.keys():
+    mappedValue = self.idMap[idMapKey]
+#msg = "Updating %s %s from %s to %s" % (
+#    className,
+#    attr.name,
+#    value,
+#    mappedValu
+#)
+#print msg
+value = mappedValue
+if value.__class__ == unicode:
+# SQLObject doesn't handle unicode.
+try:
+    value = str(value)
+except:
+msg = "Failed to convert unicode to str"
+msg += " for '%s' of %s %s: %s" % (
+    attr.name, className, objectId, value
+)
+self.logger.error(msg)
+msg = "Continuing with null string value."
+self.logger.info(msg
+value = ""
+
+if attr.isDomainObjectRef and (attr.typeName==className):
+reflexiveStrObjectData[attr.name] = value
+
-                            strObjectData[attr.name] = value
+                if reflexiveStrObjectData:
+                    reflexiveClassData[objectId] = reflexiveStrObjectData
-                objectDict = MultiValueDict()
-                objectDict.update(strObjectData)
@@ -256 +263 @@
-                domainObject = manipulator.domainObject
-                newObjectId = domainObject.id
+                freshDomainObjects[newObjectId] = domainObject
-                if newObjectId != objectId:
-                    idMapKey = "%s %s" % (className, objectId)
@@ -263 +271 @@
-                )
-                #print msg
+
+
+            reflexiveIds = reflexiveClassData.keys()
+            reflexiveIds.sort()
+            for id in reflexiveIds:
+                reflexiveStrObjectData = reflexiveClassData[id]
+                domainObject = freshDomainObjects.pop(id)
+                manipulator=DomainObjectManipulator(classRegister,domainObject)
+                objectDict = MultiValueDict()
+                objectDict.update(reflexiveStrObjectData)
+                for attrName in reflexiveStrObjectData:
+                    m = domainObject.meta.attributeNames[attrName]
+                    refObject = m.makeValueFromMultiValueDict(objectDict)
+                    setattr(domainObject, attrName, refObject)
+                    domainObject.save()
+
-            #print "Importing %s objects completed OK." % className
-        #print "Imported all domain objects records OK."