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

[source_changes at macosforge.org]

Revision: 2332
          http://trac.macosforge.org/projects/calendarserver/changeset/2332
Author:   wsanchez at apple.com
Date:     2008-04-21 14:34:22 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
Back out r1941; keep using GUIDs in the stats output, alternative was broken.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/admin/principals.py
    CalendarServer/trunk/twistedcaldav/admin/util.py
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/twistedcaldav/admin/principals.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 19:39:18 UTC (rev 2331)
+++ CalendarServer/trunk/twistedcaldav/admin/principals.py	2008-04-21 21:34:22 UTC (rev 2332)
@@ -62,39 +62,25 @@
                 
                 pcal = self.calendarCollection.child(
                     "__uids__"
-                    ).child(util.getPrincipalName(p))
+                    ).child(p.basename())
             
-                precord['principalName'] = util.getPrincipalName(p)
+                precord['principalName'] = p.basename()
                 
-                if pcal.exists():
-                    precord['calendarHome'] = pcal.path
-    
-                    precord.update(
-                        util.getQuotaStatsForPrincipal(
-                            self.config,
-                            pcal,
-                            self.quota))
-    
-                    precord.update(
-                        util.getCalendarDataCounts(pcal))
-    
-                    precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
-                    
-                    precord['disabled'] = util.isPrincipalDisabled(p)
-                else:
-                    precord.update({
-                        'calendarHome':  "-",
-                        'quotaRoot':     "-",
-                        'quotaUsed':     "-",
-                        'quotaAvail':    "-",
-                        'quotaFree':     "-",
-                        'calendarCount': "-",
-                        'eventCount':    "-",
-                        'todoCount':     "-",
-                        'diskUsage':     "-",
-                        'disabled':      "-",
-                    })
+                precord['calendarHome'] = pcal.path
 
+                precord.update(
+                    util.getQuotaStatsForPrincipal(
+                        self.config,
+                        pcal,
+                        self.quota))
+
+                precord.update(
+                    util.getCalendarDataCounts(pcal))
+
+                precord['diskUsage'] = util.getDiskUsage(self.config, pcal)
+                
+                precord['disabled'] = util.isPrincipalDisabled(p)
+                
                 yield precord
 
         report['records'] = _getRecords()

Modified: CalendarServer/trunk/twistedcaldav/admin/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 19:39:18 UTC (rev 2331)
+++ CalendarServer/trunk/twistedcaldav/admin/util.py	2008-04-21 21:34:22 UTC (rev 2332)
@@ -24,7 +24,7 @@
 
 from twisted.web import microdom
 
-from twistedcaldav.directory.principal import RecordTypeProperty, RecordNameProperty
+from twistedcaldav.directory.principal import RecordTypeProperty
 from twistedcaldav.sql import db_prefix, AbstractSQLDatabase
 from twistedcaldav.index import schema_version, collection_types
 
@@ -104,9 +104,6 @@
 
     return rtp[0].firstChild().value
     
-def getPrincipalName(fp):
-    return os.path.basename(fp.path)
-
 def getResourceType(fp):
     rt = 'WebDAV:{DAV:}resourcetype'
     x = xattr.xattr(fp.path)

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2008-04-21 19:39:18 UTC (rev 2331)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2008-04-21 21:34:22 UTC (rev 2332)
@@ -382,7 +382,6 @@
         result = super(DirectoryPrincipalResource, self).provisionFile()
         if result:
             self.writeDeadProperty(RecordTypeProperty(self.record.recordType))
-            self.writeDeadProperty(RecordNameProperty(self.record.shortName))
         return result
 
     ##
@@ -684,12 +683,6 @@
 
 davxml.registerElement(RecordTypeProperty)
 
-class RecordNameProperty (davxml.WebDAVTextElement):
-    namespace = twisted_private_namespace
-    name = "record-name"
-
-davxml.registerElement(RecordNameProperty)
-
 def format_list(items, *args):
     def genlist():
         try:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080421/4eff54b8/attachment-0001.html