Changeset 2013 for pykota/trunk

Timestamp:

01/08/05 11:52:01 (20 years ago)

Author:

jalet

Message:

Now dumpykota can dump the history into CUPS' page_log format, allowing the
use of tools like PrintAnalyzer? or phpPrintAnalyzer along with PyKota

Location:

pykota/trunk

Files:

• bin/dumpykota (modified) (5 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/dumpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.19  2005/01/08 10:52:01  jalet
+# Now dumpykota can dump the history into CUPS' page_log format, allowing the
+# use of tools like PrintAnalyzer or phpPrintAnalyzer along with PyKota
+#
 # Revision 1.18  2005/01/07 12:40:53  jalet
 # Fixed field type's name in XML dumps.
@@ -92 +96 @@
 import os
 import pwd
+from mx import DateTime
 
 try :
@@ -144 +149 @@
                          - tsv : separate datas with tabs
                          - xml : dump data as XML
+                         - cups : dump datas in CUPS' page_log format :
+                                  ONLY AVAILABLE WITH --data history
                          
   -o | --output fname  All datas will be dumped to the file instead of
@@ -236 +243 @@
                     
         format = options["format"]
-        if format not in [ "csv",
+        if (format not in [ "csv",
                            "ssv",
                            "tsv",
                            "xml",
-                         ] :
-            raise PyKotaToolError, _("Invalid modifier [%s] for --format command line option, see help.") % datatype
+                           "cups",
+                         ]) \
+              or ((format == "cups") and (datatype != "history")) :
+            raise PyKotaToolError, _("Invalid modifier [%s] for --format command line option, see help.") % format
             
         if (format == "xml") and not hasJAXML :
@@ -285 +294 @@
         """Dumps datas with a comma as the separator."""
         return self.dumpWithSeparator("\t", entries)
+        
+    def dumpCups(self, entries, dummy) :    
+        """Dumps history datas as CUPS' page_log format."""
+        fieldnames = entries[0]
+        fields = {}
+        for i in range(len(fieldnames)) :
+            fields[fieldnames[i]] = i
+        sortindex = fields["jobdate"]    
+        entries = entries[1:]
+        entries.sort(lambda m,n : cmp(m[sortindex], n[sortindex]))
+        for entry in entries[1:] :    
+            printername = entry[fields["printername"]]
+            username = entry[fields["username"]]
+            jobid = entry[fields["jobid"]]
+            jobdate = DateTime.ISO.ParseDateTime(entry[fields["jobdate"]]).strftime("%d/%b/%Y:%H:%M:%S %z")
+            jobsize = entry[fields["jobsize"]]
+            copies = entry[fields["copies"]]
+            hostname = entry[fields["hostname"]]
+            self.outfile.write("%s %s %s [%s] %s %s - %s\n" % (printername, username, jobid, jobdate, jobsize, copies, hostname))
         
     def dumpXml(self, entries, datatype) :    

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.21alpha18 :
+    
+        - Now dumpykota can dumps the job history into CUPS' page_log
+          format (even when the printing system is LPRng). This allows
+          people to use tools like PrintAnalyzer or phpPrintAnalyzer 
+          (two completely different beasts) with PyKota.
+          
     - 1.21alpha17 :
      

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.21alpha17_unofficial"
+__version__ = "1.21alpha18_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""