Changeset 2060 for pykota/trunk/bin/cupspykota

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/cupspykota (modified) (3 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.87  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.86  2005/02/13 22:48:37  jalet
 # Added the md5sum to the history
@@ -378 +382 @@
         """   
         return 0
+        
+    def genBanner(self, bannerfileorcommand) :
+        """Reads a banner or generates one through an external command.
+        
+           Returns the banner's content in a format which MUST be accepted
+           by the printer.
+        """
+        if bannerfileorcommand :
+            banner = "" # no banner by default
+            if os.access(bannerfileorcommand, os.X_OK) or not os.path.isfile(bannerfileorcommand) :
+                self.logdebug("Launching %s to generate a banner." % bannerfileorcommand)
+                child = popen2.Popen3(bannerfileorcommand, capturestderr=1)
+                banner = child.fromchild.read()
+                child.tochild.close()
+                child.childerr.close()
+                child.fromchild.close()
+                status = child.wait()
+                if os.WIFEXITED(status) :
+                    status = os.WEXITSTATUS(status)
+                self.printInfo(_("Banner generator %s exit code is %s") % (bannerfileorcommand, str(status)))
+            else :
+                self.logdebug("Using %s as the banner." % bannerfileorcommand)
+                try :
+                    fh = open(bannerfileorcommand, 'r')
+                except IOError, msg :    
+                    self.printInfo("Impossible to open %s : %s" % (bannerfileorcommand, msg), "error")
+                else :    
+                    banner = fh.read()
+                    fh.close()
+            if banner :        
+                return cStringIO.StringIO(banner)
+    
+    def startingBanner(self, printername) :
+        """Retrieves a starting banner for current printer and returns its content."""
+        self.logdebug("Retrieving starting banner...")
+        return self.genBanner(self.config.getStartingBanner(printername))
+    
+    def endingBanner(self, printername) :
+        """Retrieves an ending banner for current printer and returns its content."""
+        self.logdebug("Retrieving ending banner...")
+        return self.genBanner(self.config.getEndingBanner(printername))
         
     def getCupsConfigDirectives(self, directives=[]) :
@@ -480 +525 @@
             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