Changeset 1451 for pykota/trunk/bin

Timestamp:

05/06/04 14:37:47 (20 years ago)

Author:

jalet

Message:

pkpgcounter : comments
pkprinters : when --add is used, existing printers are now skipped.

Location:

pykota/trunk/bin

Files:

• pkpgcounter (modified) (2 diffs)
• pkprinters (modified) (2 diffs)

pykota/trunk/bin/pkpgcounter

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.5  2004/05/06 12:37:29  jalet
+# pkpgcounter : comments
+# pkprinters : when --add is used, existing printers are now skipped.
+#
 # Revision 1.4  2004/05/04 12:21:55  jalet
 # Now uses mmap in PCL mode
@@ -88 +92 @@
     # Backported from C to Python by Jerome Alet, then enhanced
     # with more PCL tags detected. I think all the necessary PCL tags
-    # are recognized to correctly handle PCL5e files wrt their number
-    # of pages
-    # 
+    # are recognized to correctly handle PCL5 files wrt their number
+    # of pages. The documentation used for this was :
+    #
+    # HP PCL/PJL Reference Set
+    # PCL5 Printer Language Technical Quick Reference Guide
+    # http://h20000.www2.hp.com/bc/docs/support/SupportManual/bpl13205/bpl13205.pdf 
+    #
     infileno = infile.fileno()
     infile = mmap.mmap(infileno, os.fstat(infileno).st_size, access=mmap.ACCESS_READ)
-    tagsends = { "&n" : "W", "&b": "W", "*i" : "W", "*l" : "W", "*m" : "W", "*v": "W", "*c" : "W", "(f" : "W", "*b" : "VW", "(s" : "W", ")s" : "W", "&p" : "X", "&l" : "X" } 
+    tagsends = { "&n" : "W", 
+                 "&b" : "W", 
+                 "*i" : "W", 
+                 "*l" : "W", 
+                 "*m" : "W", 
+                 "*v" : "W", 
+                 "*c" : "W", 
+                 "(f" : "W", 
+                 "*b" : "VW",
+                 "(s" : "W", 
+                 ")s" : "W", 
+                 "&p" : "X", 
+                 "&l" : "X" } 
     copies = 1
     pagecount = 0

pykota/trunk/bin/pkprinters

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.6  2004/05/06 12:37:29  jalet
+# pkpgcounter : comments
+# pkprinters : when --add is used, existing printers are now skipped.
+#
 # Revision 1.5  2004/04/16 16:52:09  jalet
 # Better formatting
@@ -163 +167 @@
             for pname in names :
                 printer = self.storage.getPrinter(pname)
-                if not printer.Exists :
+                if printer.Exists :
+                    self.logger.log_message(_("Printer %s already exists, skipping.") % printer.Name, "warn")
+                else :
                     if self.isValidName(pname) :
                         printer = self.storage.addPrinter(pname)
                         if not printer.Exists :
                             raise PyKotaToolError, _("Impossible to add printer %s") % pname
+                        else :    
+                            printers.append(printer)
                     else :    
                         raise PyKotaToolError, _("Invalid printer name %s") % pname
-                printers.append(printer)
         else :        
             printers = self.storage.getMatchingPrinters(",".join(names))