Changeset 2066

Timestamp:

02/16/05 01:29:33 (19 years ago)

Author:

jalet

Message:

Fixed the maxdenybanners directive.
Introduced the denyduplicates directive.
Fixed some database related glitches.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (7 diffs)
• bin/lprngpykota (modified) (2 diffs)
• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (2 diffs)
• pykota/storage.py (modified) (2 diffs)
• pykota/storages/sql.py (modified) (4 diffs)
• pykota/version.py (modified) (1 diff)
• TODO (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.89  2005/02/16 00:29:33  jalet
+# Fixed the maxdenybanners directive.
+# Introduced the denyduplicates directive.
+# Fixed some database related glitches.
+#
 # Revision 1.88  2005/02/14 23:39:50  jalet
 # Introduces the new 'trustjobsize' directive to workaround some printers
@@ -534 +539 @@
             self.logdebug("Precomputed job's size is %s pages, price is %s units" % (self.softwareJobSize, self.softwareJobPrice))
             
-            # if no data to pass to real backend, probably a filter
-            # higher in the chain failed because of a misconfiguration.
-            # we deny the job in this case (nothing to print anyway)
             if not self.jobSizeBytes :
+                # if no data to pass to real backend, probably a filter
+                # higher in the chain failed because of a misconfiguration.
+                # we deny the job in this case (nothing to print anyway)
                 self.printMoreInfo(user, printer, _("Job contains no data. Printing is denied."), "warn")
                 action = "DENY"
+            elif self.config.getDenyDuplicates(printer.Name) \
+                 and printer.LastJob.Exists \
+                 and (printer.LastJob.UserName == user.Name) \
+                 and (printer.LastJob.JobMD5Sum == self.checksum) :
+                self.printMoreInfo(user, printer, _("Job is a duplicate. Printing is denied."), "warn")
+                action = "DENY" 
             else :    
                 # checks the user's quota
@@ -557 +568 @@
             accountbanner = self.config.getAccountBanner(printer.Name)
             if accountbanner in ["ENDING", "NONE"] :
-                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                if (action == 'DENY') and (userpquota.WarnCount >= self.config.getMaxDenyBanners(printer.Name)) :
                     self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
                 else :
                     if action == 'DENY' :
-                        userpquota.warn() # increments the warning counter
+                        self.logdebug("Incrementing the number of deny banners for user %s on printer %s" % (user.Name, printer.Name))
+                        userpquota.incDenyBannerCounter() # increments the warning counter
                         self.exportUserInfo(userpquota)
                     banner = self.startingBanner(printer.Name)
@@ -573 +585 @@
             # handle starting banner pages during accounting
             if accountbanner in ["STARTING", "BOTH"] :
-                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                if (action == 'DENY') and (userpquota.WarnCount >= self.config.getMaxDenyBanners(printer.Name)) :
                     self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
                 else :
                     if action == 'DENY' :
-                        userpquota.warn() # increments the warning counter
+                        self.logdebug("Incrementing the number of deny banners for user %s on printer %s" % (user.Name, printer.Name))
+                        userpquota.incDenyBannerCounter() # increments the warning counter
                         self.exportUserInfo(userpquota)
                     banner = self.startingBanner(printer.Name)
@@ -604 +617 @@
             # handle ending banner pages during accounting
             if accountbanner in ["ENDING", "BOTH"] :
-                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                if (action == 'DENY') and (userpquota.WarnCount >= self.config.getMaxDenyBanners(printer.Name)) :
                     self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
                 else :
                     if action == 'DENY' :
-                        userpquota.warn() # increments the warning counter
+                        self.logdebug("Incrementing the number of deny banners for user %s on printer %s" % (user.Name, printer.Name))
+                        userpquota.incDenyBannerCounter() # increments the warning counter
                         self.exportUserInfo(userpquota)
                     banner = self.endingBanner(printer.Name)
@@ -626 +640 @@
                 self.printMoreInfo(user, printer, _("Job size forced to 0 because printing is denied."))
             else :    
+                userpquota.resetDenyBannerCounter()
                 jobsize = self.accounter.getJobSize(printer)
                 if self.softwareJobSize and (jobsize != self.softwareJobSize) :
@@ -664 +679 @@
             # handle ending banner pages after accounting ends
             if accountbanner in ["STARTING", "NONE"] :
-                if (action == 'DENY') and (userpquota.WarnCount < self.config.getMaxDenyBanners()) :
+                if (action == 'DENY') and (userpquota.WarnCount >= self.config.getMaxDenyBanners(printer.Name)) :
                     self.printInfo(_("Banner won't be printed : maximum number of deny banners reached."), "warn")
                 else :
                     if action == 'DENY' :
-                        userpquota.warn() # increments the warning counter
+                        self.logdebug("Incrementing the number of deny banners for user %s on printer %s" % (user.Name, printer.Name))
+                        userpquota.incDenyBannerCounter() # increments the warning counter
                         self.exportUserInfo(userpquota)
                     banner = self.endingBanner(printer.Name)

pykota/trunk/bin/lprngpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.17  2005/02/16 00:29:33  jalet
+# Fixed the maxdenybanners directive.
+# Introduced the denyduplicates directive.
+# Fixed some database related glitches.
+#
 # Revision 1.16  2005/02/14 23:39:50  jalet
 # Introduces the new 'trustjobsize' directive to workaround some printers
@@ -156 +161 @@
             self.printMoreInfo(user, printer, _("Job contains no data. Printing is denied."), "warn")
             action = "DENY"
+        elif self.config.getDenyDuplicates(printer.Name) \
+             and printer.LastJob.Exists \
+             and (printer.LastJob.UserName == user.Name) \
+             and (printer.LastJob.JobMD5Sum == self.checksum) :
+            self.printMoreInfo(user, printer, _("Job is a duplicate. Printing is denied."), "warn")
+            action = "DENY" 
         else :    
             # checks the user's quota

pykota/trunk/conf/pykota.conf.sample

@@ -755 +755 @@
 # SOFTWARE.
 trustjobsize : yes
+
+# Should we deny duplicate jobs ?
+#
+# A duplicate is a job sent twice (or more) in a row to the same printer
+# by the same user.
+#
+# This can be defined either globally or on a per printer basis
+# The default value is 'no', meaning that duplicate jobs are
+# allowed.
+#
+# NB : if an user prints a job, a second user prints another
+#      job, and the first user prints the first job again,
+#      this is NOT considered as a duplicate since the two
+#      identical jobs printed by the first user are not
+#      one just after the other.
+#
+# Possible values are 'yes' and 'no'
+#
+denyduplicates : no
+

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.21alpha26 :
+    
+        - Fixed the handling of the 'maxdenybanners' directive.
+        
+        - Introduced the 'denyduplicates' directive.
+        
+        - Fixed some database related glitches.
+        
     - 1.21alpha25 :
     

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.61  2005/02/16 00:29:33  jalet
+# Fixed the maxdenybanners directive.
+# Introduced the denyduplicates directive.
+# Fixed some database related glitches.
+#
 # Revision 1.60  2005/02/14 23:39:50  jalet
 # Introduces the new 'trustjobsize' directive to workaround some printers
@@ -604 +609 @@
         return self.isTrue(self.getGlobalOption("reject_unknown", ignore=1))
         
+    def getDenyDuplicates(self, printername) :          
+        """Returns 1 if we want to deny duplicate jobs, else 0."""
+        try : 
+            return self.isTrue(self.getPrinterOption(printername, "denyduplicates"))
+        except PyKotaConfigError :    
+            return 0
+        
     def getWinbindSeparator(self) :          
         """Returns the winbind separator's value if it is set, else None."""

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.70  2005/02/16 00:29:33  jalet
+# Fixed the maxdenybanners directive.
+# Introduced the denyduplicates directive.
+# Fixed some database related glitches.
+#
 # Revision 1.69  2005/02/13 22:48:37  jalet
 # Added the md5sum to the history
@@ -487 +492 @@
         self.WarnCount = 0
 
-    def warn(self) :
-        """Increases the warn counter for this user quota."""
+    def incDenyBannerCounter(self) :
+        """Increment the deny banner counter for this user quota."""
         self.parent.increaseUserPQuotaWarnCount(self)
         self.WarnCount = (self.WarnCount or 0) + 1
+        
+    def resetDenyBannerCounter(self) :
+        """Resets the deny banner counter for this user quota."""
+        self.parent.writeUserPQuotaWarnCount(self, 0)
+        self.WarnCount = 0
         
     def reset(self) :    

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.67  2005/02/16 00:29:33  jalet
+# Fixed the maxdenybanners directive.
+# Introduced the denyduplicates directive.
+# Fixed some database related glitches.
+#
 # Revision 1.66  2005/02/13 22:48:38  jalet
 # Added the md5sum to the history
@@ -319 +324 @@
         userpquota = StorageUserPQuota(self, user, printer)
         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)))
+            result = self.doSearch("SELECT * FROM userpquota WHERE userid=%s AND printerid=%s" % (self.doQuote(user.ident), self.doQuote(printer.ident)))
             if result :
                 fields = result[0]
@@ -336 +341 @@
         grouppquota = StorageGroupPQuota(self, group, printer)
         if group.Exists :
-            result = self.doSearch("SELECT id, softlimit, hardlimit, datelimit FROM grouppquota WHERE groupid=%s AND printerid=%s" % (self.doQuote(group.ident), self.doQuote(printer.ident)))
+            result = self.doSearch("SELECT * FROM grouppquota WHERE groupid=%s AND printerid=%s" % (self.doQuote(group.ident), self.doQuote(printer.ident)))
             if result :
                 fields = result[0]
@@ -354 +359 @@
         """Extracts a printer's last job information."""
         lastjob = StorageLastJob(self, printer)
-        result = self.doSearch("SELECT jobhistory.id, jobid, userid, username, pagecounter, jobsize, jobprice, filename, title, copies, options, hostname, jobdate FROM jobhistory, users WHERE printerid=%s AND userid=users.id ORDER BY jobdate DESC LIMIT 1" % self.doQuote(printer.ident))
+        result = self.doSearch("SELECT jobhistory.id, jobid, userid, username, pagecounter, jobsize, jobprice, filename, title, copies, options, hostname, jobdate, md5sum, pages, billingcode FROM jobhistory, users WHERE printerid=%s AND userid=users.id ORDER BY jobdate DESC LIMIT 1" % self.doQuote(printer.ident))
         if result :
             fields = result[0]

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.21alpha25_unofficial"
+__version__ = "1.21alpha26_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/TODO

@@ -38 +38 @@
         - Web enabled pykotme.
         
-        - Uses the MD5 checksum of the job's datas which is now
-          saved into the database to be able to forbid duplicate
-          jobs.
-          
         - Maybe put "gracedelay" in the database.