Changeset 1358 for pykota/trunk/pykota/storages/ldapstorage.py
- Timestamp:
- 02/23/04 23:53:21 (20 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r1357 r1358 22 22 # 23 23 # $Log$ 24 # Revision 1.55 2004/02/23 22:53:21 jalet 25 # Don't retrieve data when it's not needed, to avoid database queries 26 # 24 27 # Revision 1.54 2004/02/20 16:38:39 jalet 25 28 # ldapcache directive marked as experimental … … 472 475 printer.PricePerJob = float(fields.get("pykotaPricePerJob")[0] or 0.0) 473 476 printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0) 474 printer.LastJob = self.getPrinterLastJob(printer)475 477 printer.uniqueMember = fields.get("uniqueMember", []) 476 478 printer.Exists = 1 … … 557 559 lastjob.ident = result[0][0] 558 560 lastjob.JobId = fields.get("pykotaJobId")[0] 559 lastjob.User = self.getUser(fields.get("pykotaUserName")[0])561 lastjob.UserName = fields.get("pykotaUserName")[0] 560 562 lastjob.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter")[0] or 0) 561 563 lastjob.JobSize = int(fields.get("pykotaJobSize", [0])[0]) … … 636 638 printer.PricePerPage = float(fields.get("pykotaPricePerPage")[0] or 0.0) 637 639 printer.uniqueMember = fields.get("uniqueMember", []) 638 printer.LastJob = self.getPrinterLastJob(printer)639 640 printer.Exists = 1 640 641 printers.append(printer) … … 993 994 job.JobDate = "%04i-%02i-%02i %02i:%02i:%02i" % (year, month, day, hour, minute, second) 994 995 if (datelimit is None) or (job.JobDate <= datelimit) : 995 job.User = self.getUser(fields.get("pykotaUserName")[0])996 job.Printer = self.getPrinter(fields.get("pykotaPrinterName")[0])996 job.UserName = fields.get("pykotaUserName")[0] 997 job.PrinterName = fields.get("pykotaPrinterName")[0] 997 998 job.Exists = 1 998 999 jobs.append(job)