Changeset 1043

Timestamp:

06/25/03 21:52:31 (21 years ago)

Author:

jalet

Message:

Should be ready for testing :-)

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)
• README (modified) (3 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.48  2003/06/25 19:52:30  jalet
+# Should be ready for testing :-)
+#
 # Revision 1.47  2003/06/25 14:10:01  jalet
 # Hey, it may work (edpykota --reset excepted) !
@@ -479 +482 @@
                                 if changed[entry.Name].get("balance") is None :
                                     if balance.startswith("+") or balance.startswith("-") :
-                                        entry.consumeAccountBalance(-balancevalue)
+                                        newbalance = float(entry.AccountBalance or 0.0) + balancevalue
+                                        newlifetimepaid = float(entry.LifeTimePaid or 0.0) + balancevalue
+                                        entry.setAccountBalance(newbalance, newlifetimepaid)
                                     else :
-                                        entry.consumeAccountBalance(float(entry.AccountBalance or 0.0) - balancevalue)
+                                        diff = balancevalue - float(entry.AccountBalance or 0.0)
+                                        newlifetimepaid = float(entry.LifeTimePaid or 0.0) + diff
+                                        entry.setAccountBalance(balancevalue, newlifetimepaid)
                                     changed[entry.Name]["balance"] = balance
                             for groupname in groupnames :        

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.09beta :
+    
+        - edpykota finalized
+        
     - 1.09alpha2 :
     

pykota/trunk/pykota/storage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.16  2003/06/25 19:52:31  jalet
+# Should be ready for testing :-)
+#
 # Revision 1.15  2003/06/25 14:10:58  jalet
 # Exception raising for now.
@@ -115 +118 @@
     def setAccountBalance(self, balance, lifetimepaid) :    
         """Sets the user's account balance in case he pays more money."""
-        raise PyKotaStorageError, "Not implemented."
+        self.parent.writeUserAccountBalance(self, balance, lifetimepaid)
+        self.AccountBalance = balance
+        self.LifeTimePaid = lifetimepaid
         
     def setLimitBy(self, limitby) :    

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.09alpha2_unofficial"
+__version__ = "1.09beta_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/README

@@ -31 +31 @@
 
         - Supports both CUPS and LPRng backends.
+        
+        - Can store quota information either with PostgreSQL or with 
+          OpenLDAP.
         
         - Per printer user and group quotas.
@@ -146 +149 @@
     - Python v2.1 or above
     - eGenix' mxDateTime Python extension
-    - PostgreSQL's PygreSQL Python extension and the PostgreSQL client
-      libraries.
     - SNMP tools (specifically the snmpget command) if you plan to
       request your printer's lifetime page counter via SNMP.
     - Netatalk (specifically the pap command) if you plan to
       request your printer's lifetime page counter via AppleTalk.
+    - PostgreSQL's PygreSQL Python extension and the PostgreSQL client
+      libraries if you plan to use PostgreSQL as the Quota Storage
+      backend.
+ or     
+    - python-ldap Python module and the OpenLDAP client libraries  
+      if you plan to use OpenLDAP as the Quota Storage backend.
     
   You need to have the following tools installed on the Quota Storage  
@@ -158 +165 @@
     - PostgreSQL
     
-  PygreSQL and the PostgreSQL client libraries's versions on the Print
+  or  
+  
+    - OpenLDAP
+    
+  PygreSQL and the PostgreSQL client libraries' versions on the Print
   Server must match the PostgreSQL version used on the Quota Storage 
+  Server.
+  
+or  
+
+  python-ldap and the OpenLDAP client libraries' versions on the Print
+  Server must match the OpenLDAP version used on the Quota Storage 
   Server.