Changeset 1027

Timestamp:

06/13/03 21:07:57 (21 years ago)

Author:

jalet

Message:

Two big bugs fixed, time to release something ;-)

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/version.py (modified) (1 diff)
• README (modified) (1 diff)

pykota/trunk/conf/pykota.conf.sample

@@ -46 +46 @@
 # NB : storageuser and storageuserpw are not used anymore
 
-# LDAP example :
+# LDAP example (DOESN'T WORK YET) :
 #storagebackend: ldapstorage
 #storageserver: ldap://ldap.librelogiciel.com:389
@@ -146 +146 @@
 # one section per printer, or no other section at all if all options 
 # are defined globally.
-# The section's name must be the same as the printer's name as defined
+# Each section's name must be the same as the printer's name as defined
 # in your printing system, be it CUPS or LPRng.
+# If you don't want any special printer section, just comment out
+# the line below so that following options are global.
 [hpmarketing]
 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.08 :
+    
+        - Major bug fix wrt LPRng support for remote jobs.
+        
+        - Major bug fix wrt increase/decrease account balances.
+        
     - 1.08alpha8 :
     

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.6  2003/06/13 19:07:57  jalet
+# Two big bugs fixed, time to release something ;-)
+#
 # Revision 1.5  2003/06/10 16:37:54  jalet
 # Deletion of the second user which is not needed anymore.
@@ -134 +137 @@
             
     def getJobHistoryId(self, jobid, userid, printerid) :        
-        """Returns the history line's id given a (jobid, userid, printerid)."""
+        """Returns the history line's id given a (jobid, userid, printerid).
+        
+           TODO : delete because shouldn't be needed by the LDAP backend
+        """
         raise PyKotaStorageError, "Not implemented !"
             
@@ -344 +350 @@
     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."""
-        return # TODO
-        result = self.doSearch("objectClass=pykotaPrinterJob", ["pykotaJobHistoryId", "pykotaJobId", "uid", "pykotaPrinterPageCounter", "pykotaJobSize", "pykotaAction", "pykotaJobDate"], base=printerid)
-        if result :
-            pass # TODO
+        result = self.doSearch("objectClass=pykotaPrinter", ["pykotaPrinterName", "cn"], base=printerid, scope=ldap.SCOPE_BASE)
+        if result :
+            fields = result[0][1]
+            printername = (fields.get("pykotaPrinterName") or fields.get("cn"))[0]
+            result = self.doSearch("(&(objectClass=pykotaLastjob)(|(pykotaPrinterName=%s)(cn=%s)))" % (printername, printername), ["pykotaLastJobIdent"])
+            if result :
+                lastjobident = result[0][1]["pykotaLastJobIdent"][0]
+                result = self.doSearch("(&(objectClass=pykotaJob)(cn=%s))" % lastjobident, ["pykotaUserName", "pykotaPrinterName", "pykotaJobId", "pykotaPrinterPageCounter", "pykotaJobSize", "pykotaAction", "createTimestamp"])
+                if result :
+                    pass # TODO
         
     def addUserToGroup(self, userid, groupid) :    

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.08alpha8_unofficial"
+__version__ = "1.08_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/README

@@ -84 +84 @@
           used to limit the user printing instead of a print quota.
           Actually you can limit either by account balance OR by
-          print quota, but maybe both should be checked at the 
-          same time. Tell me what you prefer.
+          print quota. Account balance is shared between printers
+          for an user, while quotas are define separately for
+          each printer the user prints on.
           
 All the command line tools accept the -h | --help command line option