Revision: 789 http://trac.macosforge.org/projects/calendarserver/changeset/789 Author: cdaboo@apple.com Date: 2006-12-11 09:21:13 -0800 (Mon, 11 Dec 2006) Log Message: ----------- Fix getting the realm from XML. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/sqldb.py CalendarServer/trunk/twistedcaldav/directory/xmlfile.py Modified: CalendarServer/trunk/twistedcaldav/directory/sqldb.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-09 07:17:00 UTC (rev 788) +++ CalendarServer/trunk/twistedcaldav/directory/sqldb.py 2006-12-11 17:21:13 UTC (rev 789) @@ -59,22 +59,8 @@ dbFilename = ".db.accounts" dbFormatVersion = "2" - def _getRealmName(self): - # - # This is used frequently enough that it's worth caching. - # Downside is that changing the realm name (with SQL directly) requires - # a server restart. - # - if not hasattr(self, "_realmName"): - realmName = None - for row in self._db_execute("select REALM from SERVICE"): - assert realmName is None - realmName = row[0] - self._realmName = realmName - return self._realmName + realmName = None - realmName = property(_getRealmName) - def __init__(self, path): path = os.path.join(path, SQLDirectoryManager.dbFilename) super(SQLDirectoryManager, self).__init__(path, SQLDirectoryManager.dbFormatVersion) @@ -86,7 +72,7 @@ if os.path.exists(self.dbpath): os.remove(self.dbpath) - self._realmName = parser.realm + self.realmName = parser.realm self._db_execute("insert into SERVICE (REALM) values (:1)", parser.realm) Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2006-12-09 07:17:00 UTC (rev 788) +++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py 2006-12-11 17:21:13 UTC (rev 789) @@ -37,13 +37,8 @@ """ baseGUID = "9CA8DEC5-5A17-43A9-84A8-BE77C1FB9172" - def _getRealmName(self): - if not hasattr(self, "_realmName"): - self._accounts() - return self._realmName + realmName = None - realmName = property(_getRealmName) - def __repr__(self): return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, self.xmlFile) @@ -55,6 +50,7 @@ self.xmlFile = xmlFile self._fileInfo = None + self._accounts() def recordTypes(self): recordTypes = ("user", "group", "resource") @@ -90,7 +86,7 @@ if fileInfo != self._fileInfo: parser = XMLAccountsParser(self.xmlFile) self._parsedAccounts = parser.items - self._realmName = parser.realm + self.realmName = parser.realm self._fileInfo = fileInfo return self._parsedAccounts