Changeset 1133

Timestamp:

10/03/03 14:27:03 (21 years ago)

Author:

jalet

Message:

Several optimizations, especially with LDAP backend

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/storages/pgstorage.py (modified) (3 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.58  2003/10/03 12:27:01  jalet
+# Several optimizations, especially with LDAP backend
+#
 # Revision 1.57  2003/08/20 16:01:19  jalet
 # Comment added.
@@ -473 +476 @@
                     allentries.append((entry, entrypquota))
             else :   
-                allentries = getattr(self.storage, "getPrinter%ssAndQuotas" % suffix)(printer)
+                allentries = getattr(self.storage, "getPrinter%ssAndQuotas" % suffix)(printer, names)
                 
-            for (entry, entrypquota) in [(e, q) for (e, q) in allentries if self.matchString(e.Name, names)] :
+            for (entry, entrypquota) in allentries :
                 if not changed.has_key(entry.Name) :
                     changed[entry.Name] = {}

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.28  2003/10/03 12:27:02  jalet
+# Several optimizations, especially with LDAP backend
+#
 # Revision 1.27  2003/10/03 08:57:55  jalet
 # Caching mechanism now caches all that's cacheable.
@@ -403 +406 @@
         printers = []
         # see comment at the same place in pgstorage.py
-        result = self.doSearch("objectClass=pykotaPrinter", ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob"], base=self.info["printerbase"])
+        result = self.doSearch("(&(objectClass=pykotaPrinter)(|%s))" % "".join(["(pykotaPrinterName=%s)" % pname for pname in printerpattern.split(",")]), ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob"], base=self.info["printerbase"])
         if result :
             for (printerid, fields) in result :
                 printername = fields["pykotaPrinterName"][0]
-                if self.tool.matchString(printername, [ printerpattern ]) :
-                    printer = StoragePrinter(self, printername)
-                    printer.ident = printerid
-                    printer.PricePerJob = float(fields.get("pykotaPricePerJob")[0] or 0.0)
-                    printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0)
-                    printer.LastJob = self.getPrinterLastJob(printer)
-                    printer.Exists = 1
-                    printers.append(printer)
-                    self.cacheEntry("PRINTERS", printer.Name, printer)
+                printer = StoragePrinter(self, printername)
+                printer.ident = printerid
+                printer.PricePerJob = float(fields.get("pykotaPricePerJob")[0] or 0.0)
+                printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0)
+                printer.LastJob = self.getPrinterLastJob(printer)
+                printer.Exists = 1
+                printers.append(printer)
+                self.cacheEntry("PRINTERS", printer.Name, printer)
         return printers        
         
-    def getPrinterUsersAndQuotas(self, printer, names=None) :        
+    def getPrinterUsersAndQuotas(self, printer, names=["*"]) :        
         """Returns the list of users who uses a given printer, along with their quotas."""
         usersandquotas = []
-        result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s))" % printer.Name, ["pykotaUserName", "pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit"], base=self.info["userquotabase"])
+        result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, "".join(["(pykotaUserName=%s)" % uname for uname in names])), ["pykotaUserName", "pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit"], base=self.info["userquotabase"])
         if result :
             for (userquotaid, fields) in result :
-                user = self.getUser(fields["pykotaUserName"][0])
-                if (names is None) or self.tool.matchString(user.Name, names) :
-                    userpquota = StorageUserPQuota(self, user, printer)
-                    userpquota.ident = userquotaid
-                    userpquota.PageCounter = int(fields.get("pykotaPageCounter")[0] or 0)
-                    userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter")[0] or 0)
-                    userpquota.SoftLimit = fields.get("pykotaSoftLimit")
-                    if userpquota.SoftLimit is not None :
-                        if userpquota.SoftLimit[0].upper() == "NONE" :
-                            userpquota.SoftLimit = None
-                        else :    
-                            userpquota.SoftLimit = int(userpquota.SoftLimit[0])
-                    userpquota.HardLimit = fields.get("pykotaHardLimit")
-                    if userpquota.HardLimit is not None :
-                        if userpquota.HardLimit[0].upper() == "NONE" :
-                            userpquota.HardLimit = None
-                        elif userpquota.HardLimit is not None :    
-                            userpquota.HardLimit = int(userpquota.HardLimit[0])
-                    userpquota.DateLimit = fields.get("pykotaDateLimit")
-                    if userpquota.DateLimit is not None :
-                        if userpquota.DateLimit[0].upper() == "NONE" : 
-                            userpquota.DateLimit = None
-                        else :    
-                            userpquota.DateLimit = userpquota.DateLimit[0]
-                    userpquota.Exists = 1
-                    usersandquotas.append((user, userpquota))
-                    self.cacheEntry("USERPQUOTAS", "%s@%s" % (user.Name, printer.Name), userpquota)
+                user = self.getUser(fields.get("pykotaUserName")[0])
+                userpquota = StorageUserPQuota(self, user, printer)
+                userpquota.ident = userquotaid
+                userpquota.PageCounter = int(fields.get("pykotaPageCounter")[0] or 0)
+                userpquota.LifePageCounter = int(fields.get("pykotaLifePageCounter")[0] or 0)
+                userpquota.SoftLimit = fields.get("pykotaSoftLimit")
+                if userpquota.SoftLimit is not None :
+                    if userpquota.SoftLimit[0].upper() == "NONE" :
+                        userpquota.SoftLimit = None
+                    else :    
+                        userpquota.SoftLimit = int(userpquota.SoftLimit[0])
+                userpquota.HardLimit = fields.get("pykotaHardLimit")
+                if userpquota.HardLimit is not None :
+                    if userpquota.HardLimit[0].upper() == "NONE" :
+                        userpquota.HardLimit = None
+                    elif userpquota.HardLimit is not None :    
+                        userpquota.HardLimit = int(userpquota.HardLimit[0])
+                userpquota.DateLimit = fields.get("pykotaDateLimit")
+                if userpquota.DateLimit is not None :
+                    if userpquota.DateLimit[0].upper() == "NONE" : 
+                        userpquota.DateLimit = None
+                    else :    
+                        userpquota.DateLimit = userpquota.DateLimit[0]
+                userpquota.Exists = 1
+                usersandquotas.append((user, userpquota))
+                self.cacheEntry("USERPQUOTAS", "%s@%s" % (user.Name, printer.Name), userpquota)
         usersandquotas.sort(lambda x, y : cmp(x[0].Name, y[0].Name))            
         return usersandquotas
                 
-    def getPrinterGroupsAndQuotas(self, printer, names=None) :        
+    def getPrinterGroupsAndQuotas(self, printer, names=["*"]) :        
         """Returns the list of groups which uses a given printer, along with their quotas."""
         groupsandquotas = []
-        result = self.doSearch("(&(objectClass=pykotaGroupPQuota)(pykotaPrinterName=%s))" % printer.Name, ["pykotaGroupName"], base=self.info["groupquotabase"])
+        result = self.doSearch("(&(objectClass=pykotaGroupPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, "".join(["(pykotaGroupName=%s)" % gname for gname in names])), ["pykotaGroupName"], base=self.info["groupquotabase"])
         if result :
             for (groupquotaid, fields) in result :
                 group = self.getGroup(fields.get("pykotaGroupName")[0])
-                if (names is None) or self.tool.matchString(group.Name, names) :
-                    grouppquota = self.getGroupPQuota(group, printer)
-                    groupsandquotas.append((group, grouppquota))
+                grouppquota = self.getGroupPQuota(group, printer)
+                groupsandquotas.append((group, grouppquota))
         groupsandquotas.sort(lambda x, y : cmp(x[0].Name, y[0].Name))            
         return groupsandquotas

pykota/trunk/pykota/storages/pgstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.15  2003/10/03 12:27:03  jalet
+# Several optimizations, especially with LDAP backend
+#
 # Revision 1.14  2003/10/03 08:57:55  jalet
 # Caching mechanism now caches all that's cacheable.
@@ -302 +305 @@
         if result :
             for record in result :
-                user = StorageUser(self, record.get("username"))
-                if (names is None) or self.tool.matchString(user.Name, names) :
+                if (names is None) or self.tool.matchString(record.get("username"), names) :
+                    user = StorageUser(self, record.get("username"))
                     user.ident = record.get("uid")
                     user.LimitBy = record.get("limitby")
@@ -329 +332 @@
         if result :
             for record in result :
-                group = self.getGroup(record.get("groupname"))
-                if (names is None) or self.tool.matchString(group.Name, names) :
+                if (names is None) or self.tool.matchString(record.get("groupname"), names) :
+                    group = self.getGroup(record.get("groupname"))
                     grouppquota = self.getGroupPQuota(group, printer)
                     groupsandquotas.append((group, grouppquota))