Changeset 2030 for pykota/trunk

Timestamp:

01/18/05 20:47:50 (20 years ago)

Author:

jalet

Message:

Big bug fix wrt the datelimit attribute

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/storage.py (modified) (5 diffs)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/storages/sql.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.85  2005/01/18 19:47:49  jalet
+# Big bug fix wrt the datelimit attribute
+#
 # Revision 1.84  2005/01/17 08:44:23  jalet
 # Modified copyright years
@@ -691 +694 @@
                             changed[entry.Name]["limitby"] = limitby
                     
+                    if options["reset"] :
+                        entrypquota.reset()
+                        
+                    if options["hardreset"] :    
+                        entrypquota.hardreset()
+                        
                     if not options["groups"] :
-                        if options["reset"] :
-                            entrypquota.reset()
-                        if options["hardreset"] :    
-                            entrypquota.hardreset()
                         if options["used"] :
                             entrypquota.setUsage(used)
@@ -773 +778 @@
         elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
-        elif options["groups"] and (options["balance"] or options["ingroups"] or options["used"] or options["reset"] or options["hardreset"]) :
+        elif options["groups"] and (options["balance"] or options["ingroups"] or options["used"]) :
             raise PyKotaToolError, _("incompatible options, see help.")
         else :

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.21alpha20 :
+    
+        - Big bug fix wrt the datelimit field which was never
+          reset.
+          
     - 1.21alpha19 :
     

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.67  2005/01/18 19:47:50  jalet
+# Big bug fix wrt the datelimit attribute
+#
 # Revision 1.66  2004/12/02 21:24:50  jalet
 # Integrated the patch by Wilson Roberto Afonso and Matt Hyclak to allow
@@ -447 +450 @@
         vused = int(used)
         if used.startswith("+") or used.startswith("-") :
-           self.parent.increaseUserPQuotaPagesCounters(self, vused)
-           self.PageCounter += vused
-           self.LifePageCounter += vused
+            self.parent.beginTransaction()
+            try :
+                self.parent.increaseUserPQuotaPagesCounters(self, vused)
+                self.parent.writeUserPQuotaDateLimit(self, None)
+            except PyKotaStorageError, msg :    
+                self.parent.rollbackTransaction()
+                raise PyKotaStorageError, msg
+            else :
+                self.parent.commitTransaction()
+            self.PageCounter += vused
+            self.LifePageCounter += vused
         else :
-           self.parent.writeUserPQuotaPagesCounters(self, vused, vused)
-           self.PageCounter = self.LifePageCounter = vused
+            self.parent.writeUserPQuotaPagesCounters(self, vused, vused)
+            self.PageCounter = self.LifePageCounter = vused
+        self.DateLimit = None
 
     def reset(self) :    
@@ -458 +470 @@
         self.parent.writeUserPQuotaPagesCounters(self, 0, int(self.LifePageCounter or 0))
         self.PageCounter = 0
+        self.DateLimit = None
         
     def hardreset(self) :    
@@ -463 +476 @@
         self.parent.writeUserPQuotaPagesCounters(self, 0, 0)
         self.PageCounter = self.LifePageCounter = 0
+        self.DateLimit = None
         
     def computeJobPrice(self, jobsize) :    
@@ -512 +526 @@
             raise AttributeError, name
         
+    def reset(self) :    
+        """Resets page counter to 0."""
+        self.parent.beginTransaction()
+        try :
+            for user in self.parent.getGroupMembers(self.Group) :
+                uq = self.parent.getUserPQuota(user, self.Printer)
+                uq.reset()
+            self.parent.writeGroupPQuotaDateLimit(self, None)
+        except PyKotaStorageError, msg :    
+            self.parent.rollbackTransaction()
+            raise PyKotaStorageError, msg
+        else :    
+            self.parent.commitTransaction()
+        self.PageCounter = 0
+        self.DateLimit = None
+        
+    def hardreset(self) :    
+        """Resets actual and life time page counters to 0."""
+        self.parent.beginTransaction()
+        try :
+            for user in self.parent.getGroupMembers(self.Group) :
+                uq = self.parent.getUserPQuota(user, self.Printer)
+                uq.hardreset()
+            self.parent.writeGroupPQuotaDateLimit(self, None)
+        except PyKotaStorageError, msg :    
+            self.parent.rollbackTransaction()
+            raise PyKotaStorageError, msg
+        else :    
+            self.parent.commitTransaction()
+        self.PageCounter = self.LifePageCounter = 0
+        self.DateLimit = None
+        
     def setDateLimit(self, datelimit) :    
         """Sets the date limit for this quota."""

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.95  2005/01/18 19:47:50  jalet
+# Big bug fix wrt the datelimit attribute
+#
 # Revision 1.94  2005/01/01 18:53:27  jalet
 # Implemented in the LDAP backend code the same fix than in PostgreSQL backend
@@ -1167 +1170 @@
                    "pykotaPageCounter" : str(newpagecounter),
                    "pykotaLifePageCounter" : str(newlifepagecounter),
+                   "pykotaDateLimit" : None,
                  }  
         return self.doModify(userpquota.ident, fields)         

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.64  2005/01/18 19:47:50  jalet
+# Big bug fix wrt the datelimit attribute
+#
 # Revision 1.63  2005/01/01 08:16:17  jalet
 # Fixed a problem which occured when 'limitby' was unset in the PostgreSQL
@@ -522 +525 @@
     def writeUserPQuotaPagesCounters(self, userpquota, newpagecounter, newlifepagecounter) :    
         """Sets the new page counters permanently for a user print quota."""
-        self.doModify("UPDATE userpquota SET pagecounter=%s,lifepagecounter=%s WHERE id=%s" % (self.doQuote(newpagecounter), self.doQuote(newlifepagecounter), self.doQuote(userpquota.ident)))
+        self.doModify("UPDATE userpquota SET pagecounter=%s, lifepagecounter=%s, datelimit=NULL WHERE id=%s" % (self.doQuote(newpagecounter), self.doQuote(newlifepagecounter), self.doQuote(userpquota.ident)))
        
     def decreaseUserAccountBalance(self, user, amount) :    

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.21alpha19_unofficial"
+__version__ = "1.21alpha20_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""