Changeset 1200 for pykota/trunk/pykota

Timestamp:

11/21/03 15:28:46 (21 years ago)

Author:

jalet

Message:

More complete job history.

Location:

pykota/trunk/pykota

Files:

• accounters/external.py (modified) (2 diffs)
• accounters/querying.py (modified) (2 diffs)
• accounters/stupid.py (modified) (2 diffs)
• storage.py (modified) (2 diffs)
• storages/ldapstorage.py (modified) (3 diffs)
• storages/pgstorage.py (modified) (2 diffs)
• tool.py (modified) (3 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/accounters/external.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.9  2003/11/21 14:28:45  jalet
+# More complete job history.
+#
 # Revision 1.8  2003/11/12 23:29:24  jalet
 # More work on new backend. This commit may be unstable.
@@ -104 +107 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, self.getLastPageCounter(), action, jobsize)
+        printer.addJobToHistory(self.filter.jobid, user, self.getLastPageCounter(), action, jobsize, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
         
         self.endJob(printer, user)

pykota/trunk/pykota/accounters/querying.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2003/11/21 14:28:46  jalet
+# More complete job history.
+#
 # Revision 1.7  2003/11/12 23:29:24  jalet
 # More work on new backend. This commit may be unstable.
@@ -178 +181 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action)
+        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, filename=self.filter.preserveinputfile, title=self.filter.title, copies=self.filter.copies, options=self.filter.options)
             
         return action

pykota/trunk/pykota/accounters/stupid.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.7  2003/11/21 14:28:46  jalet
+# More complete job history.
+#
 # Revision 1.6  2003/11/12 23:29:24  jalet
 # More work on new backend. This commit may be unstable.
@@ -106 +109 @@
         
         # adds the current job to history    
-        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize)
+        printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize, self.filter.preserveinputfile, self.filter.title, self.filter.copies, self.filter.options)
             
         return action

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.26  2003/11/21 14:28:45  jalet
+# More complete job history.
+#
 # Revision 1.25  2003/10/08 21:12:27  jalet
 # Do not cache anymore entries which don't exist.
@@ -211 +214 @@
         self.LastJob = None
         
-    def addJobToHistory(self, jobid, user, pagecounter, action, jobsize=None) :    
+    def addJobToHistory(self, jobid, user, pagecounter, action, jobsize=None, filename=None, title=None, copies=None, options=None) :    
         """Adds a job to the printer's history."""
-        self.parent.writeJobNew(self, user, jobid, pagecounter, action, jobsize)
+        self.parent.writeJobNew(self, user, jobid, pagecounter, action, jobsize, filename, title, copies, options)
         # TODO : update LastJob object ? Probably not needed.
         

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.36  2003/11/21 14:28:46  jalet
+# More complete job history.
+#
 # Revision 1.35  2003/11/12 13:06:37  jalet
 # Bug fix wrt no user/group name command line argument to edpykota
@@ -690 +693 @@
         self.doModify(lastjob.ident, fields)         
         
-    def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None) :    
+    def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, filename=None, title=None, copies=None, options=None) :    
         """Adds a job in a printer's history."""
         if (not self.disablehistory) or (not printer.LastJob.Exists) :
@@ -706 +709 @@
                    "pykotaPrinterPageCounter" : str(pagecounter),
                    "pykotaAction" : action,
+                   "pykotaFileName" : str(filename), 
+                   "pykotaTitle" : str(title), 
+                   "pykotaCopies" : str(copies), 
+                   "pykotaOptions" : str(options), 
                  }
         if (not self.disablehistory) or (not printer.LastJob.Exists) :

pykota/trunk/pykota/storages/pgstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.22  2003/11/21 14:28:46  jalet
+# More complete job history.
+#
 # Revision 1.21  2003/11/12 13:06:38  jalet
 # Bug fix wrt no user/group name command line argument to edpykota
@@ -447 +450 @@
         self.doModify("UPDATE jobhistory SET jobsize=%s WHERE id=%s" % (self.doQuote(jobsize), self.doQuote(lastjob.ident)))
         
-    def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None) :    
+    def writeJobNew(self, printer, user, jobid, pagecounter, action, jobsize=None, filename=None, title=None, copies=None, options=None) :    
         """Adds a job in a printer's history."""
         if (not self.disablehistory) or (not printer.LastJob.Exists) :
             if jobsize is not None :
-                self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, jobsize) VALUES (%s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize)))
+                self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, jobsize, filename, title, copies, options) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options)))
             else :    
-                self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action)))
+                self.doModify("INSERT INTO jobhistory (userid, printerid, jobid, pagecounter, action, filename, title, copies, options) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(user.ident), self.doQuote(printer.ident), self.doQuote(jobid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(filename), self.doQuote(title), self.doQuote(copies), self.doQuote(options)))
         else :        
             # here we explicitly want to reset jobsize to NULL if needed

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.58  2003/11/21 14:28:45  jalet
+# More complete job history.
+#
 # Revision 1.57  2003/11/19 23:19:38  jalet
 # Code refactoring work.
@@ -624 +627 @@
          self.options, \
          self.originalbackend) = self.extractInfoFromCupsOrLprng()
+        self.preserveinputfile = self.inputfile 
         self.accounter = openAccounter(self)
     
@@ -669 +673 @@
         else :    
             # Try to detect LPRng
+            # TODO : try to extract filename, job's title, and options if available
             jseen = Pseen = nseen = rseen = Kseen = None
             for arg in sys.argv :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.16alpha10_unofficial"
+__version__ = "1.16alpha11_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""