[CalendarServer-changes] [7388] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 7388
          http://trac.macosforge.org/projects/calendarserver/changeset/7388
Author:   cdaboo at apple.com
Date:     2011-04-29 12:16:38 -0700 (Fri, 29 Apr 2011)
Log Message:
-----------
Backwards compatibility.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/augment.py
    CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml
    CalendarServer/trunk/twistedcaldav/directory/xmlaugmentsparser.py

Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py	2011-04-29 18:14:36 UTC (rev 7387)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py	2011-04-29 19:16:38 UTC (rev 7388)
@@ -408,8 +408,10 @@
         del recordNode.getchildren()[:]
         addSubElement(recordNode, xmlaugmentsparser.ELEMENT_UID, record.uid)
         addSubElement(recordNode, xmlaugmentsparser.ELEMENT_ENABLE, "true" if record.enabled else "false")
-        addSubElement(recordNode, xmlaugmentsparser.ELEMENT_SERVERID, record.serverID)
-        addSubElement(recordNode, xmlaugmentsparser.ELEMENT_PARTITIONID, record.partitionID)
+        if record.serverID:
+            addSubElement(recordNode, xmlaugmentsparser.ELEMENT_SERVERID, record.serverID)
+        if record.partitionID:
+            addSubElement(recordNode, xmlaugmentsparser.ELEMENT_PARTITIONID, record.partitionID)
         addSubElement(recordNode, xmlaugmentsparser.ELEMENT_ENABLECALENDAR, "true" if record.enabledForCalendaring else "false")
         addSubElement(recordNode, xmlaugmentsparser.ELEMENT_ENABLEADDRESSBOOK, "true" if record.enabledForAddressBooks else "false")
         addSubElement(recordNode, xmlaugmentsparser.ELEMENT_AUTOSCHEDULE, "true" if record.autoSchedule else "false")

Modified: CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml	2011-04-29 18:14:36 UTC (rev 7387)
+++ CalendarServer/trunk/twistedcaldav/directory/test/augments-test.xml	2011-04-29 19:16:38 UTC (rev 7388)
@@ -52,7 +52,7 @@
   <record>
     <uid>6A73326A-F781-47E7-A9F8-AF47364D4152</uid>
     <enable>true</enable>
-    <partition-id>00002</partition-id>
+    <hosted-at>00002</hosted-at>
     <enable>true</enable>
     <enable-calendar>true</enable-calendar>
     <enable-addressbook>true</enable-addressbook>

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaugmentsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaugmentsparser.py	2011-04-29 18:14:36 UTC (rev 7387)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaugmentsparser.py	2011-04-29 19:16:38 UTC (rev 7388)
@@ -37,6 +37,7 @@
 ELEMENT_ENABLE            = "enable"
 ELEMENT_SERVERID          = "server-id"
 ELEMENT_PARTITIONID       = "partition-id"
+ELEMENT_HOSTEDAT          = "hosted-at"   # Backwards compatibility
 ELEMENT_ENABLECALENDAR    = "enable-calendar"
 ELEMENT_ENABLEADDRESSBOOK = "enable-addressbook"
 ELEMENT_AUTOSCHEDULE      = "auto-schedule"
@@ -51,6 +52,7 @@
     ELEMENT_ENABLE:            "enabled",
     ELEMENT_SERVERID:          "serverID",
     ELEMENT_PARTITIONID:       "partitionID",
+    ELEMENT_HOSTEDAT:          "partitionID",   # Backwards compatibility
     ELEMENT_ENABLECALENDAR:    "enabledForCalendaring",
     ELEMENT_ENABLEADDRESSBOOK: "enabledForAddressBooks",
     ELEMENT_AUTOSCHEDULE:      "autoSchedule",
@@ -95,6 +97,7 @@
                     ELEMENT_UID,
                     ELEMENT_SERVERID,
                     ELEMENT_PARTITIONID,
+                    ELEMENT_HOSTEDAT,
                 ):
                     fields[node.tag] = node.text if node.text else ""
                 elif node.tag in (
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110429/1b7b22a5/attachment-0001.html>