Changeset 1228

Timestamp:

11/29/03 23:02:14 (20 years ago)

Author:

jalet

Message:

Don't try to retrieve the user print quota information if current printer
doesn't exist.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (2 diffs)
• pgstorage.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.40  2003/11/29 22:02:14  jalet
+# Don't try to retrieve the user print quota information if current printer
+# doesn't exist.
+#
 # Revision 1.39  2003/11/26 23:35:32  jalet
 # Added a bit of code to support the setting of the user's email address
@@ -345 +349 @@
         """Extracts a user print quota."""
         userpquota = StorageUserPQuota(self, user, printer)
-        if user.Exists :
+        if printer.Exists and user.Exists :
             result = self.doSearch("(&(objectClass=pykotaUserPQuota)(pykotaUserName=%s)(pykotaPrinterName=%s))" % (user.Name, printer.Name), ["pykotaPageCounter", "pykotaLifePageCounter", "pykotaSoftLimit", "pykotaHardLimit", "pykotaDateLimit"], base=self.info["userquotabase"])
             if result :

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.24  2003/11/29 22:02:14  jalet
+# Don't try to retrieve the user print quota information if current printer
+# doesn't exist.
+#
 # Revision 1.23  2003/11/23 19:01:37  jalet
 # Job price added to history
@@ -250 +254 @@
         """Extracts a user print quota."""
         userpquota = StorageUserPQuota(self, user, printer)
-        if user.Exists :
+        if printer.Exists and user.Exists :
             result = self.doSearch("SELECT id, lifepagecounter, pagecounter, softlimit, hardlimit, datelimit FROM userpquota WHERE userid=%s AND printerid=%s" % (self.doQuote(user.ident), self.doQuote(printer.ident)))
             if result :