Changeset 2193

Timestamp:

04/04/05 21:04:21 (19 years ago)

Author:

jerome

Message:

pkbanner now accepts more info to display on its command line

Location:

pykota/trunk

Files:

• bin/pkbanner (modified) (5 diffs)
• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/pkbanner

@@ -55 +55 @@
 command line usage :
 
-  pkbanner  [options] 
+  pkbanner  [options]  [more info]
 
 options :
@@ -144 +144 @@
         return (size + 4)
     
-    def genPDF(self, pagesize, logo, url, savetoner) :
+    def genPDF(self, pagesize, logo, url, text, savetoner) :
         """Generates the banner in PDF format, return the PDF document as a string."""
-        
         document = cStringIO.StringIO()
         c = canvas.Canvas(document, pagesize=pagesize, pageCompression=1)
@@ -183 +182 @@
         # Outputs the username
         ypos -= self.printVar(c, xcenter, ypos, _("Username"), username, 20, savetoner) 
+        
+        # Text    
+        if text :
+            ypos -= self.printVar(c, xcenter, ypos, _("More Info"), text, 20, savetoner) 
         
         # Printer and Job Id
@@ -239 +242 @@
         return document.getvalue()
         
-    def main(self, files, options) :
+    def main(self, arguments, options) :
         """Generates a banner."""
         if not hasRL :
@@ -261 +264 @@
             
         self.logdebug("Generating the banner in PDF format...")    
-        doc = self.genPDF(pagesize, options["logo"].strip(), options["url"].strip(), savetoner)
+        doc = self.genPDF(pagesize, 
+                          options["logo"].strip(), 
+                          options["url"].strip(), 
+                          " ".join(arguments).strip(), 
+                          savetoner)
         
         self.logdebug("Converting the banner to PostScript...")    
         os.environ["PATH"] = "%s:/bin:/usr/bin:/usr/local/bin:/opt/bin:/sbin:/usr/sbin" % os.environ.get("PATH", "")
-        child = popen2.Popen3("gs -q -dNOPAUSE -dBATCH -dPARANOIDSAFER -sDEVICE=pswrite -sOutputFile=- - 2>/tmp/errgs")
-        child.tochild.write(doc)
-        child.tochild.close()
-        sys.stdout.write(child.fromchild.read())
-        sys.stdout.flush()
-        child.fromchild.close()
+        child = popen2.Popen3("gs -q -dNOPAUSE -dBATCH -dPARANOIDSAFER -sDEVICE=pswrite -sOutputFile=- -")
+        try :
+            child.tochild.write(doc)
+            child.tochild.close()
+            sys.stdout.write(child.fromchild.read())
+            sys.stdout.flush()
+            child.fromchild.close()
+        except IOError, msg :    
+            self.printInfo("I/O Error %s" % msg, "error")
         status = child.wait()
         if os.WIFEXITED(status) :

pykota/trunk/conf/pykota.conf.sample

@@ -721 +721 @@
 # NB : pkbanner's default page size is A4
 #
+# A static banner page
 # endingbanner: /home/joe/mystaticbanner.ps
+#
+# A banner with personnalized logo and url
 # endingbanner: /usr/bin/pkbanner --pagesize=A4 --logo="/home/joe/mylogo.jpeg" --url="http://tech.example.com"
+#
+# A banner in the format accepted by the printer
 # endingbanner: /usr/bin/pkbanner | gs -q -dNOPAUSE -dBATCH -dPARANOIDSAFER -sOutputFile=- -sDEVICE=lj5mono -
-# endingbanner: /usr/bin/pkbanner
+#
+# A banner with more info on it, extracted from the yellow pages.
+# the string "Phone 111222333444" will be added to the banner page
+# if extractphone.sh returns 111222333444 for the current user.
+# endingbanner: /usr/bin/pkbanner Phone `extractphone.sh $PYKOTAUSERNAME`
+#
+# Default PyKota banner
+# endingbanner: /usr/bin/pkbanner 
 
 # How should enforcement be done for this printer ?

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.22alpha4 :
+    
+        - Allows pkbanner to accept more info to display on its 
+          command line.
+          
     - 1.22alpha3 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.22alpha3_unofficial"
+__version__ = "1.22alpha4_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""