[CalendarServer-changes] [10182] CalDAVTester/branches/users/gaya/sharedgroupstester/src/caldavtest. py

[source_changes at macosforge.org]

Revision: 10182
          http://trac.calendarserver.org//changeset/10182
Author:   gaya at apple.com
Date:     2012-12-17 15:16:54 -0800 (Mon, 17 Dec 2012)
Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester/src/caldavtest.py

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester/src/caldavtest.py
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester/src/caldavtest.py	2012-12-17 22:26:01 UTC (rev 10181)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester/src/caldavtest.py	2012-12-17 23:16:54 UTC (rev 10182)
@@ -630,6 +630,8 @@
         if req.grabcalprop:
             for propname, variable in req.grabcalprop:
                 # grab the property here
+                propname = self.manager.server_info.subs(propname)
+                propname = self.manager.server_info.extrasubs(propname)
                 propvalue = self.extractCalProperty(propname, respdata)
                 if propvalue == None:
                     result = False
@@ -640,6 +642,8 @@
         if req.grabcalparam:
             for paramname, variable in req.grabcalparam:
                 # grab the property here
+                paramname = self.manager.server_info.subs(paramname)
+                paramname = self.manager.server_info.extrasubs(paramname)
                 paramvalue = self.extractCalParameter(paramname, respdata)
                 if paramvalue == None:
                     result = False
@@ -822,7 +826,11 @@
         # e.g. VEVENT/ATTACH
         bits = parametername.split("/")
         propertyname = "/".join(bits[:-1])
-        pname = bits[-1]
+        param = bits[-1]
+        bits = param.split("$")
+        pname = bits[0]
+        if len(bits) > 1:
+            propertyname += "$%s" % (bits[1],)
 
         prop = self._calProperty(propertyname, respdata)
 
@@ -843,7 +851,10 @@
         # e.g. VEVENT/ATTACH
         bits = propertyname.split("/")
         components = bits[:-1]
-        pname = bits[-1]
+        prop = bits[-1]
+        bits = prop.split("$")
+        pname = bits[0]
+        pvalue = bits[1] if len(bits) > 1 else None
 
         while components:
             for c in cal.getComponents():
@@ -858,7 +869,14 @@
             return None
 
         props = cal.getProperties(pname)
-        return props[0] if props else None
+        if pvalue:
+            for prop in props:
+                if prop.getValue().getValue() == pvalue:
+                    return prop
+            else:
+                return None
+        else:
+            return props[0] if props else None
 
 
     def postgresInit(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121217/72d2f065/attachment.html>