Changeset 768

Timestamp:

02/08/03 23:39:46 (21 years ago)

Author:

jalet

Message:

--reset command line option added

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (5 diffs)
• pykota/storage.py (modified) (3 diffs)
• pykota/storages/sql.py (modified) (4 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.16  2003/02/08 22:39:46  jalet
+# --reset command line option added
+#
 # Revision 1.15  2003/02/08 22:20:01  jalet
 # Clarification on why we don't check with /etc/passwd to see if the user
@@ -98 +101 @@
   -p | --prototype u|g Uses user u or group g as a prototype to set
                        print quotas
+                       
+  -r | --reset         Resets the printed page counter for the user
+                       or group to zero. The life time page counter 
+                       is kept unchanged.
                        
   -S | --softlimit sl  Sets the quota soft limit to sl pages.                       
@@ -223 +230 @@
                     if options["users"] :
                         self.storage.setUserPQuota(name, printer, softlimit, hardlimit)
+                        if options["reset"] :
+                            self.storage.resetUserPQuota(name, printer)
                     else :
                         self.storage.setGroupPQuota(name, printer, softlimit, hardlimit)
+                        if options["reset"] :
+                            self.storage.resetGroupPQuota(name, printer)
                      
 if __name__ == "__main__" : 
@@ -233 +244 @@
                      "printer" : "*", \
                    }
-        short_options = "vhaugp:P:S:H:"
-        long_options = ["help", "version", "add", "users", "groups", "prototype=", "printer=", "softlimit=", "hardlimit="]
+        short_options = "vhaugrp:P:S:H:"
+        long_options = ["help", "version", "add", "users", "groups", "reset", "prototype=", "printer=", "softlimit=", "hardlimit="]
         
         # Initializes the command line tool
@@ -252 +263 @@
         options["softlimit"] = options["S"] or options["softlimit"]
         options["hardlimit"] = options["H"] or options["hardlimit"] 
+        options["reset"] = options["r"] or options["reset"] 
         
         if options["help"] :

pykota/trunk/pykota/storage.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.5  2003/02/08 22:39:46  jalet
+# --reset command line option added
+#
 # Revision 1.4  2003/02/08 09:59:59  jalet
 # Added preliminary base class for all storages
@@ -66 +69 @@
         
     def addUserPQuota(self, username, printername) :
-        """Adds a tuple (user, printer) to the Quota Storage, both are also added individually if needed."""
+        """Initializes a user print quota on a printer, adds the printer and the user to the quota storage if needed."""
         pass
         
@@ -79 +82 @@
     def setUserPQuota(self, username, printername, softlimit, hardlimit) :
         """Sets soft and hard limits for a user quota on a specific printer given (username, printername)."""
+        pass
+        
+    def resetUserPQuota(self, username, printername) :    
+        """Resets the page counter to zero. Life time page counter is kept unchanged."""
         pass
         

pykota/trunk/pykota/storages/sql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.16  2003/02/08 22:39:46  jalet
+# --reset command line option added
+#
 # Revision 1.15  2003/02/08 22:12:09  jalet
 # Life time counter for users and groups added.
@@ -135 +138 @@
         
     def addUserPQuota(self, username, printername) :
+        """Initializes a user print quota on a printer, adds the printer and the user to the quota storage if needed."""
         (userid, printerid) = self.getUPIds(username, printername)
         if printerid is None :    
@@ -152 +156 @@
         (userid, printerid) = self.getUPIds(username, printername)
         if (userid is not None) and (printerid is not None) :
-            result = self.doQuery("SELECT pagecounter, softlimit, hardlimit, datelimit FROM userpquota WHERE userid=%s AND printerid=%s;" % (self.doQuote(userid), self.doQuote(printerid)))
+            result = self.doQuery("SELECT lifepagecounter, pagecounter, softlimit, hardlimit, datelimit FROM userpquota WHERE userid=%s AND printerid=%s;" % (self.doQuote(userid), self.doQuote(printerid)))
             try :
                 return self.doParseResult(result)[0]
@@ -163 +167 @@
         if (userid is not None) and (printerid is not None) :
             self.doQuery("UPDATE userpquota SET softlimit=%s, hardlimit=%s, datelimit=NULL WHERE userid=%s AND printerid=%s;" % (self.doQuote(softlimit), self.doQuote(hardlimit), self.doQuote(userid), self.doQuote(printerid)))
+        
+    def resetUserPQuota(self, username, printername) :    
+        """Resets the page counter to zero. Life time page counter is kept unchanged."""
+        (userid, printerid) = self.getUPIds(username, printername)
+        if (userid is not None) and (printerid is not None) :
+            self.doQuery("UPDATE userpquota SET pagecounter=0 WHERE userid=%s AND printerid=%s;" % (self.doQuote(userid), self.doQuote(printerid)))
         
     def setDateLimit(self, username, printername, datelimit) :