[CalendarServer-changes] [13681] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 13681
          http://trac.calendarserver.org//changeset/13681
Author:   sagen at apple.com
Date:     2014-06-24 10:43:22 -0700 (Tue, 24 Jun 2014)
Log Message:
-----------
When converting resources.xml, retain <guid> element

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2014-06-24 16:55:58 UTC (rev 13680)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2014-06-24 17:43:22 UTC (rev 13681)
@@ -1528,7 +1528,7 @@
 </accounts>
 """
 
-newResourcesFormat = """<directory realm="/Search"><record type="location"><short-name>location1</short-name><uid>C4F46062-9094-4D34-8591-61A42D993FAA</uid><full-name>location name</full-name></record><record type="resource"><short-name>resource1</short-name><uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid><full-name>resource name</full-name></record></directory>"""
+newResourcesFormat = """<directory realm="/Search"><record type="location"><short-name>location1</short-name><guid>C4F46062-9094-4D34-8591-61A42D993FAA</guid><uid>C4F46062-9094-4D34-8591-61A42D993FAA</uid><full-name>location name</full-name></record><record type="resource"><short-name>resource1</short-name><guid>60B771CC-D727-4453-ACE0-0FE13CD7445A</guid><uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid><full-name>resource name</full-name></record></directory>"""
 
 
 normalizeEvent = """BEGIN:VCALENDAR

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2014-06-24 16:55:58 UTC (rev 13680)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2014-06-24 17:43:22 UTC (rev 13681)
@@ -675,9 +675,9 @@
         return
 
     tagMap = {
-        "uid": "short-name",
-        "guid": "uid",
-        "name": "full-name",
+        "uid": ("short-name",),
+        "guid": ("guid", "uid"),
+        "name": ("full-name",),
     }
     log.info("Converting resources.xml")
     directoryNode = XMLElement("directory")
@@ -687,11 +687,12 @@
         destNode = XMLElement("record")
         destNode.set("type", recordType)
         for sourceFieldNode in sourceNode:
-            tag = tagMap.get(sourceFieldNode.tag, None)
-            if tag:
-                destFieldNode = XMLElement(tag)
-                destFieldNode.text = sourceFieldNode.text
-                destNode.append(destFieldNode)
+            tags = tagMap.get(sourceFieldNode.tag, None)
+            if tags:
+                for tag in tags:
+                    destFieldNode = XMLElement(tag)
+                    destFieldNode.text = sourceFieldNode.text
+                    destNode.append(destFieldNode)
 
         directoryNode.append(destNode)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140624/0bc3c80a/attachment.html>