Changeset 1624 for pykota/trunk/pykota

Timestamp:

07/23/04 00:41:48 (20 years ago)

Author:

jalet

Message:

Hardware accounting for LPRng should be OK now. UNTESTED.

Location:

pykota/trunk/pykota

Files:

• accounter.py (modified) (4 diffs)
• accounters/hardware.py (modified) (2 diffs)
• storage.py (modified) (2 diffs)

pykota/trunk/pykota/accounter.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.18  2004/07/22 22:41:48  jalet
+# Hardware accounting for LPRng should be OK now. UNTESTED.
+#
 # Revision 1.17  2004/07/16 12:22:47  jalet
 # LPRng support early version
@@ -103 +106 @@
             return 0
             
-    def beginJob(self, userpquota) :    
+    def beginJob(self, printer) :    
         """Saves the computed job size."""
         # computes job's size
@@ -113 +116 @@
         
         # get last job information for this printer
-        if not userpquota.Printer.LastJob.Exists :
+        if not printer.LastJob.Exists :
             # The printer hasn't been used yet, from PyKota's point of view
             self.LastPageCounter = 0
@@ -120 +123 @@
             # Last lifetime page counter before actual job is 
             # last page counter + last job size
-            self.LastPageCounter = int(userpquota.Printer.LastJob.PrinterPageCounter or 0) + int(userpquota.Printer.LastJob.JobSize or 0)
+            self.LastPageCounter = int(printer.LastJob.PrinterPageCounter or 0) + int(printer.LastJob.JobSize or 0)
         
-    def endJob(self, userpquota) :    
+    def fakeBeginJob(self) :    
+        """Do nothing."""
+        pass
+        
+    def endJob(self, printer) :    
         """Do nothing."""
         pass

pykota/trunk/pykota/accounters/hardware.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.8  2004/07/22 22:41:48  jalet
+# Hardware accounting for LPRng should be OK now. UNTESTED.
+#
 # Revision 1.7  2004/07/16 12:22:47  jalet
 # LPRng support early version
@@ -72 +75 @@
         return counter    
         
-    def beginJob(self, userpquota) :    
+    def beginJob(self, printer) :    
         """Saves printer internal page counter at start of job."""
         # save page counter before job
-        self.LastPageCounter = self.counterbefore = self.getPrinterInternalPageCounter()
+        self.LastPageCounter = self.getPrinterInternalPageCounter()
+        self.fakeBeginJob()
         
-    def endJob(self, userpquota) :    
+    def fakeBeginJob(self) :    
+        """Fakes a begining of a job."""
+        self.counterbefore = self.getLastPageCounter()
+        
+    def endJob(self, printer) :    
         """Saves printer internal page counter at end of job."""
         # save page counter after job

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.57  2004/07/22 22:41:48  jalet
+# Hardware accounting for LPRng should be OK now. UNTESTED.
+#
 # Revision 1.56  2004/07/01 17:45:49  jalet
 # Added code to handle the description field for printers
@@ -513 +516 @@
         self.Printer = printer
         
-    def __getattr__(self, name) :    
-        """Delays data retrieval until it's really needed."""
-        if name == "User" : 
-            self.User = self.parent.getUser(self.UserName)
-            return self.User
-        else :    
-            raise AttributeError, name
-        
-    def setSize(self, userpquota, jobsize) :
-        """Sets the last job's size."""
-        jobprice = userpquota.computeJobPrice(jobsize)
-        self.parent.writeLastJobSize(self, jobsize, jobprice)
-        self.JobSize = jobsize
-        self.JobPrice = jobprice
-        return jobprice
-        
 class BaseStorage :
     def __init__(self, pykotatool) :