Changeset 2060 for pykota/trunk/bin/lprngpykota

Timestamp:

02/14/05 23:53:44 (19 years ago)

Author:

jalet

Message:

Now always precomputes the job's size with the internal PDL parser, and not
only when 'enforcement: strict' was set in pykota.conf

Files:

• pykota/trunk/bin/lprngpykota (modified) (3 diffs)

pykota/trunk/bin/lprngpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.15  2005/02/14 22:53:44  jalet
+# Now always precomputes the job's size with the internal PDL parser, and not
+# only when 'enforcement: strict' was set in pykota.conf
+#
 # Revision 1.14  2005/02/13 22:48:37  jalet
 # Added the md5sum to the history
@@ -137 +141 @@
         os.environ["PYKOTAPHASE"] = "BEFORE"
         
-        # do we want strict or laxist quota enforcement ?
-        if self.config.getPrinterEnforcement(printer.Name) == "STRICT" :
-            self.softwareJobSize = self.precomputeJobSize()
-            self.softwareJobPrice = userpquota.computeJobPrice(self.softwareJobSize)
-            self.logdebug("Precomputed job's size is %s pages, price is %s units" % (self.softwareJobSize, self.softwareJobPrice))
-        os.environ["PYKOTAPRECOMPUTEDJOBSIZE"] = str(self.softwareJobSize)
+        # precomputes the job's price
+        self.softwareJobPrice = userpquota.computeJobPrice(self.softwareJobSize)
         os.environ["PYKOTAPRECOMPUTEDJOBPRICE"] = str(self.softwareJobPrice)
+        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
@@ -251 +252 @@
             # retrieve the job size    
             jobsize = self.accounter.getJobSize(printer)
+            if self.softwareJobSize and (jobsize != self.softwareJobSize) :
+                self.printInfo(_("Beware : computed job size (%s) != precomputed job size (%s)") % (jobsize, self.softwareJobSize), "error")
             
             self.printMoreInfo(user, printer, _("Job size : %i") % jobsize)