Changeset 1041 for pykota/trunk/pykota/accounters/stupid.py
- Timestamp:
- 06/25/03 16:10:01 (21 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/accounters/stupid.py
r1000 r1041 21 21 # 22 22 # $Log$ 23 # Revision 1.4 2003/06/25 14:10:01 jalet 24 # Hey, it may work (edpykota --reset excepted) ! 25 # 23 26 # Revision 1.3 2003/05/27 23:00:21 jalet 24 27 # Big rewrite of external accounting methods. … … 39 42 40 43 class Accounter(AccounterBase) : 41 def doAccounting(self, printer id, userid) :44 def doAccounting(self, printer, user) : 42 45 """Does print accounting by stupidly counting the 'showpage' postscript instructions in the document. 43 46 … … 51 54 52 55 # get last job information for this printer 53 pgc = self.filter.storage.getPrinterPageCounter(printerid) 54 if pgc is None : 56 if not printer.LastJob.Exists : 55 57 # The printer hasn't been used yet, from PyKota's point of view 56 58 counterbeforejob = 0 … … 59 61 # Last lifetime page counter before actual job is 60 62 # last page counter + last job size 61 counterbeforejob = (pgc["pagecounter"] or 0) + (pgc["jobsize"]or 0)63 counterbeforejob = int(printer.LastJob.PrinterPageCounter or 0) + int(printer.LastJob.JobSize or 0) 62 64 63 65 # Is the current user allowed to print at all ? 64 action = self.filter.warnUserPQuota(self.filter.username, self.filter.printername) 66 userpquota = self.filter.storage.getUserPQuota(user, printer) 67 action = self.filter.warnUserPQuota(userpquota) 65 68 66 69 # update the quota for the current user on this printer, if allowed to print … … 68 71 jobsize = 0 69 72 else : 70 self.filter.storage.updateUserPQuota(userid, printerid,jobsize)73 userpquota.increasePagesUsage(jobsize) 71 74 72 75 # adds the current job to history 73 self.filter.storage.addJobToHistory(self.filter.jobid, self.filter.storage.getUserId(self.filter.username), printerid, counterbeforejob, action, jobsize)76 printer.addJobToHistory(self.filter.jobid, user, counterbeforejob, action, jobsize) 74 77 75 78 return action