Changeset 1252

Timestamp:

01/06/04 17:02:57 (21 years ago)

Author:

jalet

Message:

This time printer groups caching works.

Files:

• pykota/trunk/pykota/storage.py (modified) (3 diffs)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.32  2004/01/06 16:02:57  jalet
+# This time printer groups caching works.
+#
 # Revision 1.31  2004/01/06 15:51:24  jalet
 # Fixed caching of printer groups
@@ -353 +356 @@
         if self.usecache :
             self.tool.logdebug("Caching enabled.")
-            self.caches = { "USERS" : {}, "GROUPS" : {}, "PRINTERS" : {}, "USERPQUOTAS" : {}, "GROUPPQUOTAS" : {}, "JOBS" : {}, "LASTJOBS" : {}, "PARENTPRINTERS" : {} }
+            self.caches = { "USERS" : {}, "GROUPS" : {}, "PRINTERS" : {}, "USERPQUOTAS" : {}, "GROUPPQUOTAS" : {}, "JOBS" : {}, "LASTJOBS" : {} }
         
     def close(self) :    
@@ -431 +434 @@
     def getParentPrinters(self, printer) :    
         """Extracts parent printers information for a given printer from cache."""
-        parents = self.getFromCache("PARENTPRINTERS", printer.Name)
-        if parents is None :
-            parents = self.getParentPrintersFromBackend(printer)
-            self.cacheEntry("PARENTPRINTERS", printer.Name, parents)
-        return parents    
+        if self.usecache :
+            if not hasattr(printer, "Parents") :
+                self.tool.logdebug("Cache miss (%s->Parents)" % printer.Name)
+                printer.Parents = self.getParentPrintersFromBackend(printer)
+                self.tool.logdebug("Cache store (%s->Parents)" % printer.Name)
+            else :
+                self.tool.logdebug("Cache hit (%s->Parents)" % printer.Name)
+        else :        
+            printer.Parents = self.getParentPrintersFromBackend(printer)
+        return printer.Parents
         
     def getGroupMembers(self, group) :