Changeset 2307

Timestamp:

06/10/05 22:01:50 (19 years ago)

Author:

jerome

Message:

Added the striptitle directive.

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)
• TODO (modified) (1 diff)

pykota/trunk/conf/pykota.conf.sample

@@ -295 +295 @@
 # [global] section.
 privacy : no
+
+# Should we strip off some characters from the beginning of
+# print jobs' titles ? This can be used to remove smbprn.??????
+# which sometimes appear when printing in raw mode from Windows
+# through Samba.
+# This setting only applies at printing time.
+# When not set, titles are used as received from the printing system.
+# The default is to not strip any character off of jobs' titles.
+# This value can be set either globally or on a per printer basis
+# If both are defined, the printer option has priority.
+# striptitle : smbprn.??????
 
 # What is the accounting backend to use

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.23alpha9 :   
     
+        - Introduced the new 'striptitle' directive to remove ugly prefixes
+          from print job's titles whenever a new print job is submitted.
+          
         - Fixed internal SNMP accounter for printers which only have a life time
           page counter, and not a volatile page counter.

pykota/trunk/pykota/config.py

@@ -191 +191 @@
             return      # No command to launch in the post-hook
             
+    def getStripTitle(self, printername) :    
+        """Returns the striptitle directive's content, or None if unset."""
+        try :
+            return self.getPrinterOption(printername, "striptitle").strip()
+        except PyKotaConfigError :    
+            return      # No prefix to strip off
+            
     def getPrinterEnforcement(self, printername) :    
         """Returns if quota enforcement should be strict or laxist for the current printer."""

pykota/trunk/pykota/tool.py

@@ -665 +665 @@
             self.username = self.username.lower()
             
+        # do we want to strip some prefix off of titles ?    
+        stripprefix = self.config.getStripTitle(self.printername)
+        if stripprefix :
+            if fnmatch.fnmatch(self.title[:len(stripprefix)], stripprefix) :
+                self.logdebug("Prefix [%s] removed from job's title [%s]." % (stripprefix, self.title))
+                self.title = self.title[len(stripprefix):]
+            
         self.preserveinputfile = self.inputfile 
         try :

pykota/trunk/TODO

@@ -64 +64 @@
           be easy.
           
-        - Add a way to strip off "smbprn.????????" from the left of
-          print jobs' titles (only appear when printing as raw from
-          Winboxes it seems)
-
         - Pass-through mode for printers : history correctly filled (including
           job size) but no impact on user's page counter or account