Changeset 1806 for pykota/trunk/pykota

Timestamp:

10/12/04 10:58:53 (20 years ago)

Author:

jalet

Message:

Now warnpykota only warns users who have already printed, to not confuse
users who have just opened their account.

Location:

pykota/trunk/pykota

Files:

• storages/ldapstorage.py (modified) (2 diffs)
• storages/sql.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.84  2004/10/12 08:58:53  jalet
+# Now warnpykota only warns users who have already printed, to not confuse
+# users who have just opened their account.
+#
 # Revision 1.83  2004/10/07 21:14:28  jalet
 # Hopefully final fix for data encoding to and from the database
@@ -522 +526 @@
             groupnames = [record[1]["pykotaGroupName"][0] for record in result]
         return groupnames
+        
+    def getUserNbJobsFromHistory(self, user) :
+        """Returns the number of jobs the user has in history."""
+        result = self.doSearch("(&(pykotaUserName=%s)(objectClass=pykotaJob))" % user.Name, None, base=self.info["jobbase"])
+        return len(result)
         
     def getUserFromBackend(self, username) :    

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.58  2004/10/12 08:58:53  jalet
+# Now warnpykota only warns users who have already printed, to not confuse
+# users who have just opened their account.
+#
 # Revision 1.57  2004/10/10 10:12:21  jalet
 # Improved SQL queries for groups. Same work has to be done for groups print quotas.
@@ -184 +188 @@
             groupnames = [record["groupname"] for record in result]
         return groupnames
+        
+    def getUserNbJobsFromHistory(self, user) :
+        """Returns the number of jobs the user has in history."""
+        result = self.doSearch("SELECT COUNT(*) FROM jobhistory WHERE userid=%s" % self.doQuote(user.ident))
+        if result :
+            return result[0]["count"]
+        return 0
         
     def getUserFromBackend(self, username) :    

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha23_unofficial"
+__version__ = "1.20alpha24_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""