Changeset 1361 for pykota

Timestamp:

02/25/04 17:52:39 (21 years ago)

Author:

jalet

Message:

Small fix wrt empty user groups

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.56  2004/02/25 16:52:39  jalet
+# Small fix wrt empty user groups
+#
 # Revision 1.55  2004/02/23 22:53:21  jalet
 # Don't retrieve data when it's not needed, to avoid database queries
@@ -539 +542 @@
                 grouppquota.LifePageCounter = 0
                 usernamesfilter = "".join(["(pykotaUserName=%s)" % member.Name for member in self.getGroupMembers(group)])
-                result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)(|%s))" % (printer.Name, usernamesfilter), ["pykotaPageCounter", "pykotaLifePageCounter"], base=self.info["userquotabase"])
+                if usernamesfilter :
+                    usernamesfilter = "(|%s)" % usernamesfilter
+                result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaPrinterName=%s)%s)" % (printer.Name, usernamesfilter), ["pykotaPageCounter", "pykotaLifePageCounter"], base=self.info["userquotabase"])
                 if result :
                     for userpquota in result :