Changeset 900 for pykota/trunk/bin

Timestamp:

04/10/03 23:47:20 (22 years ago)

Author:

jalet

Message:

Job history added. Upgrade script neutralized for now !

Location:

pykota/trunk/bin

Files:

• edpykota (modified) (6 diffs)
• pykota (modified) (3 diffs)
• repykota (modified) (4 diffs)
• warnpykota (modified) (2 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.33  2003/04/10 21:47:20  jalet
+# Job history added. Upgrade script neutralized for now !
+#
 # Revision 1.32  2003/04/08 21:31:39  jalet
 # (anything or 0) = anything !!! Go back to school Jerome !
@@ -232 +235 @@
     def main(self, names, options) :
         """Edit user or group quotas."""
-        printernames = self.storage.getMatchingPrinters(options["printer"])
-        if not printernames :
+        printers = self.storage.getMatchingPrinters(options["printer"])
+        if not printers :
             pname = options["printer"]
             if options["add"] and pname :
                 if self.isValidName(pname) :
-                    self.storage.addPrinter(pname)
-                    printernames = [ (pname, 0) ]
+                    printerid = self.storage.addPrinter(pname)
+                    printers = [ (printerid, pname) ]
                 else :    
                     raise PyKotaToolError, _("Invalid printer name %s") % pname
@@ -263 +266 @@
             else :    
                 names = [ "*" ] # all users
-        for (printer, printerpagecounter) in printernames :
+        for (printerid, printer) in printers :
             if options["prototype"] :
                 if options["groups"] :
-                    prototype = self.storage.getGroupPQuota(options["prototype"], printer)
+                    prototype = self.storage.getGroupPQuota(self.storage.getGroupId(options["prototype"]), printerid)
                 else :     
                     # default is user quota edition
-                    prototype = self.storage.getUserPQuota(options["prototype"], printer)
+                    prototype = self.storage.getUserPQuota(self.storage.getUserId(options["prototype"]), printerid)
                 if prototype is None :
                     self.logger.log_message(_("Prototype %s not found in Quota Storage for printer %s.") % (options["prototype"], printer))
@@ -283 +286 @@
                 if softlimit is not None :
                     self.logger.log_message(_("Undefined soft limit set to hard limit (%s) on printer %s.") % (str(softlimit), printer))
-            if (not options["reset"] and not options["noquota"]) and ((hardlimit is None) or (softlimit is None)) :
+            if (not options["reset"] and not options["noquota"] and not options["prototype"]) and ((hardlimit is None) or (softlimit is None)) :
                 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.")
             if options["add"] :    
-                allnames = names
+                allidnames = [(None, n) for n in names]
             else :   
                 if options["groups"] :    
-                    allnames = self.storage.getPrinterGroups(printer)
+                    allidnames = self.storage.getPrinterGroups(printerid)
                 else :    
-                    allnames = self.storage.getPrinterUsers(printer)
-            for name in [n for n in allnames if self.matchString(n, names)]:
+                    allidnames = self.storage.getPrinterUsers(printerid)
+            for (ident, name) in [(i, n) for (i, n) in allidnames if self.matchString(n, names)]:
                 if options["groups"] :
-                    quota = self.storage.getGroupPQuota(name, printer)
+                    quota = self.storage.getGroupPQuota(ident, printerid)
                 else :
-                    quota = self.storage.getUserPQuota(name, printer)
+                    quota = self.storage.getUserPQuota(ident, printerid)
                 if quota is None :
                     # not found
@@ -306 +309 @@
                         if options["groups"] :
                             if self.isValidName(name) :
-                                self.storage.addGroupPQuota(name, printer)
-                                quota = self.storage.getGroupPQuota(name, printer)
+                                (ident, printerid) = self.storage.addGroupPQuota(name, printerid)
+                                quota = self.storage.getGroupPQuota(ident, printerid)
                             else :    
                                 self.logger.log_message(_("Invalid group name %s") % name)
                         else :
                             if self.isValidName(name) :
-                                self.storage.addUserPQuota(name, printer)
-                                quota = self.storage.getUserPQuota(name, printer)
+                                (ident, printerid) = self.storage.addUserPQuota(name, printerid)
+                                quota = self.storage.getUserPQuota(ident, printerid)
                             else :    
                                 self.logger.log_message(_("Invalid user name %s") % name)
@@ -320 +323 @@
                 else :    
                     if options["groups"] :
-                        if options["noquota"] or ((softlimit is not None) and (hardlimit is not None)) :
-                            self.storage.setGroupPQuota(name, printer, softlimit, hardlimit)
+                        if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) :
+                            self.storage.setGroupPQuota(ident, printerid, softlimit, hardlimit)
                         if options["reset"] :
-                            self.storage.resetGroupPQuota(name, printer)
+                            self.storage.resetGroupPQuota(ident, printerid)
+                        self.warnGroupPQuota(name, printer)    
                     else :
-                        if options["noquota"] or ((softlimit is not None) and (hardlimit is not None)) :
-                            self.storage.setUserPQuota(name, printer, softlimit, hardlimit)
+                        if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) :
+                            self.storage.setUserPQuota(ident, printerid, softlimit, hardlimit)
                         if options["reset"] :
-                            self.storage.resetUserPQuota(name, printer)
+                            self.storage.resetUserPQuota(ident, printerid)
+                        self.warnUserPQuota(name, printer)    
                      
 if __name__ == "__main__" : 

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.17  2003/04/10 21:47:20  jalet
+# Job history added. Upgrade script neutralized for now !
+#
 # Revision 1.16  2003/04/08 20:38:08  jalet
 # The last job Id is saved now for each printer, this will probably
@@ -151 +154 @@
         # can't get actual page counter, assume printer is off, but warns in log
         kotafilter.logger.log_message("%s" % msg, "warn")
+        counterbeforejob = None
         printerIsOff = 1
     else :    
@@ -156 +160 @@
         
     # Get the last page counter and last username from the Quota Storage backend
-    pgc = kotafilter.storage.getPrinterPageCounter(kotafilter.printername)    
-    if pgc is None :
+    printerid = kotafilter.storage.getPrinterId(kotafilter.printername)
+    if printerid is None :
         # The printer is unknown from the Quota Storage perspective
         # we let the job pass through, but log a warning message
         kotafilter.logger.log_message(_("Printer %s not registered in the PyKota system") % kotafilter.printername, "warn")
     else :    
-        # get last values from Quota Storage
-        (lastpagecounter, lastjobid, lastusername) = (pgc["pagecounter"], pgc["lastjobid"], pgc["lastusername"])
-        
-        # if printer is off then we assume the correct counter value is the last one
-        if printerIsOff :
-            counterbeforejob = lastpagecounter
+        userid = kotafilter.storage.getUserId(username)
+        if userid is None :
+            # The user is unknown from the Quota Storage perspective
+            # we let the job pass through, but log a warning message
+            kotafilter.logger.log_message(_("User %s not registered in the PyKota system") % username, "warn")
+        else :
+            pgc = kotafilter.storage.getPrinterPageCounter(printerid)    
+            if pgc is None :
+                # The printer hasn't been used yet, from PyKota's point of view
+                lasthistoryid = None
+                lastjobid = jobid
+                lastuserid = userid
+                lastusername = username
+                lastpagecounter = counterbeforejob
+            else :    
+                # get last values from Quota Storage
+                (lasthistoryid, lastjobid, lastuserid, lastusername, lastpagecounter) = (pgc["id"], pgc["jobid"], pgc["userid"], pgc["username"], pgc["pagecounter"])
+                
+            # if printer is off then we assume the correct counter value is the last one
+            if printerIsOff :
+                counterbeforejob = lastpagecounter
+                
+            # Update the quota for the previous user on this printer according 
+            # to the job size (difference between actual counter and latest one from storage)
+            jobsize = (counterbeforejob - lastpagecounter)    
+            if jobsize >= 0 :
+                kotafilter.storage.updateUserPQuota(lastuserid, printerid, jobsize)
+                kotafilter.storage.updateJobSizeInHistory(lasthistoryid, jobsize)
+                kotafilter.warnUserPQuota(lastusername)
+            else :    
+                kotafilter.logger.log_message(_("Error in page count value %i for user %s on printer %s") % (jobsize, lastusername, kotafilter.printername), "error")
+                
+            # Is the current user allowed to print at all ?
+            action = kotafilter.warnUserPQuota(username)
             
-        # Update the last page counter and last username in the Quota Storage backend
-        # set them to current user and 
-        kotafilter.storage.updatePrinterPageCounter(kotafilter.printername, username, counterbeforejob, jobid)
-        
-        # Was the printer ever used ?
-        if (lastpagecounter is None) or (lastusername is None) :
-            lastusername = username
-            lastpagecounter = counterbeforejob
+            # adds the current job to history    
+            kotafilter.storage.addJobToHistory(jobid, kotafilter.storage.getUserId(username), printerid, counterbeforejob, action)
             
-        # Update the quota for the previous user on this printer according 
-        # to the job size (difference between actual counter and latest one from storage)
-        jobsize = (counterbeforejob - lastpagecounter)    
-        if jobsize >= 0 :
-            kotafilter.storage.updateUserPQuota(lastusername, kotafilter.printername, jobsize)
-            kotafilter.warnUserPQuota(lastusername)
-        else :    
-            kotafilter.logger.log_message(_("Error in page count value %i for user %s on printer %s") % (jobsize, kotafilter.printername, lastusername), "error")
-            
-        # Is the current user allowed to print at all ?
-        # if no then die, else proceed.
-        action = kotafilter.warnUserPQuota(username)
-        if action == "DENY" :
-            # No, just die cleanly
-            return 1
+            # if not allowed to print then die, else proceed.
+            if action == "DENY" :
+                # No, just die cleanly
+                return 1
         
     # pass the job untouched to the underlying layer

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.21  2003/04/10 21:47:20  jalet
+# Job history added. Upgrade script neutralized for now !
+#
 # Revision 1.20  2003/04/08 21:31:39  jalet
 # (anything or 0) = anything !!! Go back to school Jerome !
@@ -149 +152 @@
     def main(self, options) :
         """Print Quota reports generator."""
-        printernames = self.storage.getMatchingPrinters(options["printer"])
-        if not printernames :
+        printers = self.storage.getMatchingPrinters(options["printer"])
+        if not printers :
             raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-        for (printer, printerpagecounter) in printernames :
+        for (printerid, printer) in printers :
             print _("*** Report for %s quota on printer %s") % ((options["users"] and "user") or "group", printer)
             print _("Pages grace time: %idays") % self.config.getGraceDelay(printer)
@@ -159 +162 @@
                 print _("Group            used     soft     hard   grace        total")
                 print "------------------------------------------------------------"
-                for name in self.storage.getPrinterGroups(printer) :
-                    quota = self.storage.getGroupPQuota(name, printer) 
+                for name in self.storage.getPrinterGroups(printerid) :
+                    quota = self.storage.getGroupPQuota(ident, printerid) 
                     total += self.printQuota(name, quota)
             else :
@@ -166 +169 @@
                 print _("User             used     soft     hard   grace        total")
                 print "------------------------------------------------------------"
-                for name in self.storage.getPrinterUsers(printer) :
-                    quota = self.storage.getUserPQuota(name, printer)
+                for (ident, name) in self.storage.getPrinterUsers(printerid) :
+                    quota = self.storage.getUserPQuota(ident, printerid)
                     total += self.printQuota(name, quota)
             if total :        
                 print (" " * 43) + (_("Total : %9i") % total)
+            printerpagecounter = self.storage.getPrinterPageCounter(printerid)
             if printerpagecounter is None :    
                 msg = _("unknown")
             else :
-                msg = "%9i" % printerpagecounter
+                msg = "%9i" % printerpagecounter["pagecounter"]
             print (" " * 44) + (_("Real : %s") % msg)
             print        

pykota/trunk/bin/warnpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.15  2003/04/10 21:47:20  jalet
+# Job history added. Upgrade script neutralized for now !
+#
 # Revision 1.14  2003/04/08 21:31:39  jalet
 # (anything or 0) = anything !!! Go back to school Jerome !
@@ -134 +137 @@
     def main(self, options) :
         """Warn users or groups over print quota."""
-        printernames = self.storage.getMatchingPrinters(options["printer"])
-        if not printernames :
+        printers = self.storage.getMatchingPrinters(options["printer"])
+        if not printers :
             raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
-        for (printer, printerpagecounter) in printernames :
+        for (printerid, printer) in printers :
             if options["groups"] :
-                for name in self.storage.getPrinterGroups(printer) :
+                for (ident, name) in self.storage.getPrinterGroups(printerid) :
                     self.warnGroupPQuota(name, printer)
             else :
-                for name in self.storage.getPrinterUsers(printer) :
+                for (ident, name) in self.storage.getPrinterUsers(printerid) :
                     self.warnUserPQuota(name, printer)