Changeset 976

Timestamp:

04/30/03 15:36:40 (21 years ago)

Author:

jalet

Message:

Stupid accounting method was added.

Location:

pykota/trunk

Files:

• bin/pykota (modified) (3 diffs)
• conf/pykota.conf.sample (modified) (1 diff)
• NEWS (modified) (1 diff)
• po/en/pykota.po (modified) (2 diffs)
• po/fr/pykota.mo (modified) (previous)
• po/fr/pykota.po (modified) (2 diffs)
• po/pykota.pot (modified) (2 diffs)
• pykota/accounter.py (modified) (3 diffs)
• pykota/accounters/querying.py (modified) (3 diffs)
• pykota/accounters/stupid.py (added)
• pykota/config.py (modified) (2 diffs)
• pykota/storages/postgresql.py (modified) (2 diffs)
• pykota/storages/sql.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.31  2003/04/30 13:36:39  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.30  2003/04/29 22:03:38  jalet
 # Better error handling.
@@ -192 +195 @@
         return (None, None, None, None, None, None)   # Unknown printing system          
         
-    def filterInput(self, inputfile) :
-        """Transparent filter."""
-        mustclose = 0    
-        if inputfile is not None :    
-            infile = open(inputfile, "rb")
-            mustclose = 1
-        else :    
-            infile = sys.stdin
-        data = infile.read(256*1024)    
-        while data :
-            sys.stdout.write(data)
-            data = infile.read(256*1024)
-        if mustclose :    
-            infile.close()
-            
     def acceptJob(self) :        
         """Returns the exit code needed by the printing backend to accept the job and print it."""
@@ -270 +258 @@
         
     # pass the job untouched to the underlying layer
-    kotafilter.filterInput(kotafilter.inputfile)      
+    kotafilter.accounter.filterInput(kotafilter.inputfile)      
     
     return kotafilter.acceptJob()

pykota/trunk/conf/pykota.conf.sample

@@ -58 +58 @@
 #
 #    - querying : asks the printer for its lifetime page counter
+#                 via either SNMP, AppleTalk, or any external
+#                 command. This method is the method used by
+#                 default in PyKota since its beginning.
+#
+#    - stupid : counts the occurences of the 'showpage' postscript
+#               statement in the document to be printed, only at
+#               the beginning of each line which makes the postscript
+#               file. THIS IS NOT RELIABLE. This is just to serve as
+#               an example on how to implement your own accounting
+#               method.
+#
 #    - more to be added in the future
 #
 # This value can be set either globally or on a per printer basis
-# if not set it defaults to 'querying'
+# If both are defined, the printer option has priority.
+# if not set it defaults to 'querying'.
 accounter: querying
 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.05alpha3 :
+    
+        - A 'stupid' and unreliable accounting method was
+          implemented to serve as an example on how to
+          do this sort of things. This method only counts
+          the 'showpage' statements in the input data.
+          See sample configuration file for details.
+          Pluggable accounting methods work, but I advise
+          you TO NOT USE THIS ONE WHICH IS JUST AN EXAMPLE.
+          It is not reliable enough to be used.
+          
     - 1.05alpha2 :
     

pykota/trunk/po/en/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.23  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.22  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -337 +340 @@
 msgid "Option requester for printer %s was not set"
 msgstr ""
+
+msgid "Using the 'stupid' accounting method is unreliable."
+msgstr ""

pykota/trunk/po/fr/pykota.po

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.22  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.21  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -349 +352 @@
 msgid "Option requester for printer %s was not set"
 msgstr "L'option requester pour l'imprimante %s n'a pas � d�nie"
+
+msgid "Using the 'stupid' accounting method is unreliable."
+msgstr "Utiliser la m�ode 'stupid' n'est pas fiable."

pykota/trunk/po/pykota.pot

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.23  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.22  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -337 +340 @@
 msgid "Option requester for printer %s was not set"
 msgstr ""
+
+msgid "Using the 'stupid' accounting method is unreliable."
+msgstr ""

pykota/trunk/pykota/accounter.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.2  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.1  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -26 +29 @@
 #
 #
+
+import sys
 
 class PyKotaAccounterError(Exception):
@@ -42 +47 @@
         self.filter = kotafilter
         
+    def filterInput(self, inputfile) :
+        """Transparent filter."""
+        mustclose = 0    
+        if inputfile is not None :    
+            if hasattr(inputfile, "read") :
+                infile = inputfile
+            else :    
+                infile = open(inputfile, "rb")
+            mustclose = 1
+        else :    
+            infile = sys.stdin
+        data = infile.read(256*1024)    
+        while data :
+            sys.stdout.write(data)
+            data = infile.read(256*1024)
+        if mustclose :    
+            infile.close()
+            
     def doAccounting(self, printerid, userid) :    
         """Does the real accounting."""

pykota/trunk/pykota/accounters/querying.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.2  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.1  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -27 +30 @@
 #
 
+import sys
 from pykota.accounter import AccounterBase, PyKotaAccounterError
 from pykota.requester import openRequester, PyKotaRequesterError
@@ -118 +122 @@
             
         return action
+            

pykota/trunk/pykota/config.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.25  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.24  2003/04/29 18:37:54  jalet
 # Pluggable accounting methods (actually doesn't support external scripts)
@@ -197 +200 @@
            for its internal lifetime page counter.
         """   
-        validaccounters = [ "querying" ]     
+        validaccounters = [ "querying", "stupid" ]     
         try :
             accounter = self.getPrinterOption(printer, "accounter").lower()

pykota/trunk/pykota/storages/postgresql.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.10  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.9  2003/04/27 08:04:15  jalet
 # LDAP storage backend's skeleton added. DOESN'T WORK.
@@ -111 +114 @@
     def doQuote(self, field) :
         """Quotes a field for use as a string in SQL queries."""
-        if type(field) == type(0) : # TODO : do something safer
+        if type(field) in (type(0), type(0.0)) : # TODO : do something safer
             typ = "decimal"
         else :    

pykota/trunk/pykota/storages/sql.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.31  2003/04/30 13:36:40  jalet
+# Stupid accounting method was added.
+#
 # Revision 1.30  2003/04/27 08:04:15  jalet
 # LDAP storage backend's skeleton added. DOESN'T WORK.
@@ -368 +371 @@
         self.doQuery("UPDATE grouppquota SET datelimit=%s::TIMESTAMP WHERE groupid=%s AND printerid=%s" % (self.doQuote("%04i-%02i-%02i %02i:%02i:%02i" % (datelimit.year, datelimit.month, datelimit.day, datelimit.hour, datelimit.minute, datelimit.second)), self.doQuote(groupid), self.doQuote(printerid)))
         
-    def addJobToHistory(self, jobid, userid, printerid, pagecounter, action) :
+    def addJobToHistory(self, jobid, userid, printerid, pagecounter, action, jobsize=None) :
         """Adds a job to the history: (jobid, userid, printerid, last page counter taken from requester)."""
-        self.doQuery("INSERT INTO jobhistory (jobid, userid, printerid, pagecounter, action) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(jobid), self.doQuote(userid), self.doQuote(printerid), self.doQuote(pagecounter), self.doQuote(action)))
+        self.doQuery("INSERT INTO jobhistory (jobid, userid, printerid, pagecounter, action, jobsize) VALUES (%s, %s, %s, %s, %s, %s)" % (self.doQuote(jobid), self.doQuote(userid), self.doQuote(printerid), self.doQuote(pagecounter), self.doQuote(action), self.doQuote(jobsize)))
         return self.getJobHistoryId(jobid, userid, printerid) # in case jobid is not sufficient
     
@@ -379 +382 @@
     def getPrinterPageCounter(self, printerid) :
         """Returns the last page counter value for a printer given its id, also returns last username, last jobid and history line id."""
-        result = self.doQuery("SELECT jobhistory.id, jobid, userid, username, pagecounter FROM jobhistory, users WHERE printerid=%s AND userid=users.id ORDER BY jobdate DESC LIMIT 1" % self.doQuote(printerid))
+        result = self.doQuery("SELECT jobhistory.id, jobid, userid, username, pagecounter, jobsize FROM jobhistory, users WHERE printerid=%s AND userid=users.id ORDER BY jobdate DESC LIMIT 1" % self.doQuote(printerid))
         try :
             return self.doParseResult(result)[0]

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.05alpha2-unofficial"
+__version__ = "1.05alpha3-unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""