Changeset 1499

Timestamp:

05/25/04 11:15:15 (21 years ago)

Author:

jalet

Message:

accounter.py : old code deleted
the rest : now exports PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/accounter.py (modified) (3 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.52  2004/05/25 09:15:13  jalet
+# accounter.py : old code deleted
+# the rest : now exports PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE
+#
 # Revision 1.51  2004/05/25 08:31:16  jalet
 # Heavy CPU usage seems to be fixed at least !
@@ -265 +269 @@
             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)
+                self.logdebug("Precomputed job's size is %s pages, price is %s units" % (self.softwareJobSize, self.softwareJobPrice))
+            os.putenv("PYKOTAPRECOMPUTEDJOBSIZE", str(self.softwareJobSize))    
+            os.putenv("PYKOTAPRECOMPUTEDJOBPRICE", str(self.softwareJobPrice))    
             action = self.warnUserPQuota(userpquota)
             

pykota/trunk/conf/pykota.conf.sample

@@ -453 +453 @@
 # PYKOTASTATUS : contains "CANCELLED" when SIGTERM was received by PyKota
 #                else is not set.
+# PYKOTAPRECOMPUTEDJOBSIZE : contains the precomputed job's size
+# PYKOTAPRECOMPUTEDJOBPRICE : contains the precomputed job's price
+#
 
 # PreHook : gets executed after being sure the user, printer and user quota

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.19alpha14 :
     
+        - PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE 
+          are now exported as environment variables.
+          
         - Heavy CPU usage is now completely fixed it seems, by 
           introducing some 0.01 second sleeping when nothing to do.

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.16  2004/05/25 09:15:15  jalet
+# accounter.py : old code deleted
+# the rest : now exports PYKOTAPRECOMPUTEDJOBSIZE and PYKOTAPRECOMPUTEDJOBPRICE
+#
 # Revision 1.15  2004/05/24 22:45:49  jalet
 # New 'enforcement' directive added
@@ -71 +75 @@
 
 import sys
-from pykota import pdlanalyzer
 
 class PyKotaAccounterError(Exception):
@@ -88 +91 @@
         self.filter = kotafilter
         self.arguments = arguments
-        self.firstPassSize = None
-        
-    def getSoftwareJobSize(self) :    
-        """Pre-computes the job's size with a software method."""
-        if self.filter.preserveinputfile is None :
-            raise PyKotaAccounterError, "Only supports raw jobs for now."""
-        else :    
-            fname = self.filter.preserveinputfile
-        parser = pdfanalyzer.PDLAnalyzer(fname)    
-        try : 
-            jobsize = parser.getJobSize()
-        except TypeError, msg :    
-            raise PyKotaAccounterError, msg
-        else :    
-            self.firstPassSize = jobsize
         
     def getLastPageCounter(self) :