Changeset 1249

Timestamp:

01/06/04 15:24:59 (21 years ago)

Author:

jalet

Message:

Printer groups should be cached now, if caching is enabled.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/storages/pgstorage.py (modified) (3 diffs)

pykota/trunk/NEWS

@@ -25 +25 @@
     
         - Allows the dot in user and printer names.
+        
+        - Printer groups are now cached too.
         
     - 1.16alpha20 :

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.30  2004/01/06 14:24:59  jalet
+# Printer groups should be cached now, if caching is enabled.
+#
 # Revision 1.29  2003/12/27 16:49:25  uid67467
 # Should be ok now.
@@ -423 +426 @@
         return lastjob    
         
+    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    
+        
     def getGroupMembers(self, group) :        
         """Returns the group's members list from in-group cache."""

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.43  2004/01/06 14:24:59  jalet
+# Printer groups should be cached now, if caching is enabled.
+#
 # Revision 1.42  2003/12/29 14:12:48  uid67467
 # Tries to workaround possible integrity violations when retrieving printer groups
@@ -499 +502 @@
         return groups        
         
+    def getParentPrintersFromBackend(self, printer) :    
+        """Get all the printer groups this printer is a member of."""
+        pgroups = []
+        result = self.doSearch("(&(objectClass=pykotaPrinter)(uniqueMember=%s))" % printer.ident, ["pykotaPrinterName"], base=self.info["printerbase"])
+        if result :
+            for (printerid, fields) in result :
+                if printerid != printer.ident : # In case of integrity violation.
+                    parentprinter = self.getPrinter(fields.get("pykotaPrinterName")[0])
+                    if parentprinter.Exists :
+                        pgroups.append(parentprinter)
+        return pgroups
+        
     def getMatchingPrinters(self, printerpattern) :
         """Returns the list of all printers for which name matches a certain pattern."""
@@ -564 +579 @@
         return groupsandquotas
         
-    def getParentPrinters(self, printer) :    
-        """Get all the printer groups this printer is a member of."""
-        pgroups = []
-        result = self.doSearch("(&(objectClass=pykotaPrinter)(uniqueMember=%s))" % printer.ident, ["pykotaPrinterName"], base=self.info["printerbase"])
-        if result :
-            for (printerid, fields) in result :
-                if printerid != printer.ident : # In case of integrity violation.
-                    parentprinter = self.getPrinter(fields.get("pykotaPrinterName")[0])
-                    if parentprinter.Exists :
-                        pgroups.append(parentprinter)
-        return pgroups
-        
     def addPrinter(self, printername) :        
         """Adds a printer to the quota storage, returns it."""

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.27  2004/01/06 14:24:59  jalet
+# Printer groups should be cached now, if caching is enabled.
+#
 # Revision 1.26  2003/12/29 14:12:48  uid67467
 # Tries to workaround possible integrity violations when retrieving printer groups
@@ -338 +341 @@
                 groups.append(self.getGroup(record.get("groupname")))
         return groups        
+        
+    def getParentPrintersFromBackend(self, printer) :    
+        """Get all the printer groups this printer is a member of."""
+        pgroups = []
+        result = self.doSearch("SELECT groupid,printername FROM printergroupsmembers JOIN printers ON groupid=id WHERE printerid=%s;" % self.doQuote(printer.ident))
+        if result :
+            for record in result :
+                if record["groupid"] != printer.ident : # in case of integrity violation
+                    parentprinter = self.getPrinter(record.get("printername"))
+                    if parentprinter.Exists :
+                        pgroups.append(parentprinter)
+        return pgroups
         
     def getMatchingPrinters(self, printerpattern) :
@@ -398 +413 @@
         return groupsandquotas
         
-    def getParentPrinters(self, printer) :    
-        """Get all the printer groups this printer is a member of."""
-        pgroups = []
-        result = self.doSearch("SELECT groupid,printername FROM printergroupsmembers JOIN printers ON groupid=id WHERE printerid=%s;" % self.doQuote(printer.ident))
-        if result :
-            for record in result :
-                if record["groupid"] != printer.ident : # in case of integrity violation
-                    parentprinter = self.getPrinter(record.get("printername"))
-                    if parentprinter.Exists :
-                        pgroups.append(parentprinter)
-        return pgroups
-        
     def addPrinter(self, printername) :        
         """Adds a printer to the quota storage, returns it."""