Changeset 1497

Timestamp:

05/25/04 07:17:52 (21 years ago)

Author:

jalet

Message:

Now precomputes the job's size only if current printer's enforcement
is "STRICT"

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/tool.py (modified) (4 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.50  2004/05/25 05:17:50  jalet
+# Now precomputes the job's size only if current printer's enforcement
+# is "STRICT"
+#
 # Revision 1.49  2004/05/24 22:45:48  jalet
 # New 'enforcement' directive added
@@ -256 +260 @@
             
             # checks the user's quota
-            self.softwareJobPrice = userpquota.computeJobPrice(self.softwareJobSize)
+            if self.config.getPrinterEnforcement(printer.Name) == "STRICT" :
+                self.softwareJobSize = self.precomputeJobSize()
+                self.logdebug("Precomputed job's size is : %s pages" % self.softwareJobSize)
+                self.softwareJobPrice = userpquota.computeJobPrice(self.softwareJobSize)
             action = self.warnUserPQuota(userpquota)
             

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.19alpha14 :
     
+        - Pre-computation of the job's size is now only
+          done when enforcement is "STRICT", this saves
+          CPU for people who don't want to use this new
+          feature.
+          
         - New 'enforcement' directive which accepts either
           STRICT or LAXIST. See sample configuration file

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.91  2004/05/25 05:17:52  jalet
+# Now precomputes the job's size only if current printer's enforcement
+# is "STRICT"
+#
 # Revision 1.90  2004/05/24 22:45:49  jalet
 # New 'enforcement' directive added
@@ -383 +387 @@
         self.smtpserver = self.config.getSMTPServer()
         self.maildomain = self.config.getMailDomain()
+        self.softwareJobSize = 0
         self.softwareJobPrice = 0.0
         
@@ -802 +807 @@
         self.exportJobInfo()
         self.jobdatastream = self.openJobDataStream()
-        self.softwareJobSize = self.precomputeJobSize()
-        self.logdebug("Precomputed job's size is : %s pages" % self.softwareJobSize)
         
     def openJobDataStream(self) :    
@@ -838 +841 @@
         """Computes the job size with a software method."""
         self.logdebug("Precomputing job's size with generic PDL analyzer...")
+        self.jobdatastream.seek(0)
         try :
             parser = pdlanalyzer.PDLAnalyzer(self.jobdatastream)