Changeset 1113 for pykota/trunk/bin

Timestamp:

07/29/03 22:55:17 (21 years ago)

Author:

jalet

Message:

1.14 is out !

Location:

pykota/trunk/bin

Files:

• edpykota (modified) (3 diffs)
• pykota (modified) (3 diffs)
• pykotme (modified) (3 diffs)
• repykota (modified) (2 diffs)
• warnpykota (modified) (3 diffs)

pykota/trunk/bin/edpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.56  2003/07/29 20:55:17  jalet
+# 1.14 is out !
+#
 # Revision 1.55  2003/07/28 09:11:12  jalet
 # PyKota now tries to add its attributes intelligently in existing LDAP
@@ -538 +541 @@
                      
 if __name__ == "__main__" : 
+    retcode = 0
     try :
         defaults = { \
@@ -584 +588 @@
             raise PyKotaToolError, _("incompatible options, see help.")
         else :
-            sys.exit(editor.main(args, options))
+            retcode = editor.main(args, options)
     except (PyKotaToolError, PyKotaConfigError, PyKotaStorageError), msg :            
         sys.stderr.write("%s\n" % msg)
         sys.stderr.flush()
-        sys.exit(-1)
-
+        retcode = -1
+
+    try :
+        editor.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
+    sys.exit(retcode)    

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.37  2003/07/29 20:55:17  jalet
+# 1.14 is out !
+#
 # Revision 1.36  2003/07/10 06:09:52  jalet
 # Incorrect documentation string
@@ -232 +235 @@
             return -1
             
-def main() :    
+def main(thefilter) :    
     """Do it, and do it right !"""
-    # Initializes the current tool
-    kotafilter = PyKotaFilter()    
-    
     #
     # If this is a CUPS filter, we should act and die like a CUPS filter when needed
-    if kotafilter.printingsystem == "CUPS" :
+    if thefilter.printingsystem == "CUPS" :
         if len(sys.argv) not in (6, 7) :    
             sys.stderr.write("ERROR: %s job-id user title copies options [file]\n" % sys.argv[0])
-            return kotafilter.removeJob()
+            return thefilter.removeJob()
     
     # Get the last page counter and last username from the Quota Storage backend
-    printer = kotafilter.storage.getPrinter(kotafilter.printername)
+    printer = thefilter.storage.getPrinter(thefilter.printername)
     if not printer.Exists :
         # 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")
+        thefilter.logger.log_message(_("Printer %s not registered in the PyKota system") % thefilter.printername, "warn")
     else :    
-        user = kotafilter.storage.getUser(kotafilter.username)
+        user = thefilter.storage.getUser(thefilter.username)
         if not user.Exists :
             # The user is unknown from the Quota Storage perspective
@@ -257 +257 @@
             # either let the job pass through or reject it, but we
             # log a message in any case.
-            policy = kotafilter.config.getPrinterPolicy(kotafilter.printername)
+            policy = thefilter.config.getPrinterPolicy(thefilter.printername)
             if policy == "ALLOW" :
                 action = "POLICY_ALLOW"
             else :    
                 action = "POLICY_DENY"
-            kotafilter.logger.log_message(_("User %s not registered in the PyKota system, applying default policy (%s) for printer %s") % (kotafilter.username, action, kotafilter.printername), "warn")
+            thefilter.logger.log_message(_("User %s not registered in the PyKota system, applying default policy (%s) for printer %s") % (thefilter.username, action, thefilter.printername), "warn")
             if action == "POLICY_DENY" :
-                return kotafilter.removeJob()
+                return thefilter.removeJob()
         else :
             # Now does the accounting and act depending on the result
-            action = kotafilter.accounter.doAccounting(printer, user)
+            action = thefilter.accounter.doAccounting(printer, user)
             
             # if not allowed to print then die, else proceed.
             if action == "DENY" :
                 # No, just die cleanly
-                return kotafilter.removeJob()
+                return thefilter.removeJob()
         
     # pass the job untouched to the underlying layer
-    kotafilter.accounter.filterInput(kotafilter.inputfile)      
+    thefilter.accounter.filterInput(thefilter.inputfile)      
     
-    return kotafilter.acceptJob()
+    return thefilter.acceptJob()
 
 if __name__ == "__main__" :    
     retcode = -1
     try :
-        retcode = main()
+        # Initializes the current tool
+        kotafilter = PyKotaFilter()    
+        retcode = main(kotafilter)
     except (PyKotaToolError, PyKotaConfigError, PyKotaStorageError, PyKotaAccounterError, AttributeError, KeyError, IndexError, ValueError, IOError), msg :
         sys.stderr.write("ERROR : PyKota filter failed (%s)\n" % msg)
         sys.stderr.flush()
+        retcode = -1
+
+    try :
+        kotafilter.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
     sys.exit(retcode)    
-    

pykota/trunk/bin/pykotme

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.3  2003/07/29 20:55:17  jalet
+# 1.14 is out !
+#
 # Revision 1.2  2003/07/25 10:41:29  jalet
 # Better documentation.
@@ -150 +153 @@
         
 if __name__ == "__main__" : 
+    retcode = 0
     try :
         defaults = { \
@@ -173 +177 @@
             sender.display_version_and_quit()
         else :
-            sys.exit(sender.main(args, options))
+            retcode = sender.main(args, options)
     except (PyKotaToolError, PyKotaConfigError, PyKotaStorageError), msg :            
         sys.stderr.write("%s\n" % msg)
         sys.stderr.flush()
-        sys.exit(-1)
+        retcode = -1
 
+    try :
+        sender.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
+    sys.exit(retcode)    

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.42  2003/07/29 20:55:17  jalet
+# 1.14 is out !
+#
 # Revision 1.41  2003/07/07 12:19:52  jalet
 # Now repykota and warnpykota --groups check the groups the user is a member of
@@ -287 +290 @@
             raise PyKotaToolError, _("incompatible options, see help.")
         else :
-            sys.exit(reportTool.main(args, options))
+            retcode = reportTool.main(args, options)
     except (PyKotaToolError, PyKotaConfigError, PyKotaStorageError, PyKotaReporterError), msg :            
         sys.stderr.write("%s\n" % msg)
         sys.stderr.flush()
-        sys.exit(-1)
-
+        retcode = -1 
+
+    try :
+        reportTool.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
+    sys.exit(retcode)    

pykota/trunk/bin/warnpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.22  2003/07/29 20:55:17  jalet
+# 1.14 is out !
+#
 # Revision 1.21  2003/07/07 12:19:52  jalet
 # Now repykota and warnpykota --groups check the groups the user is a member of
@@ -199 +202 @@
                      
 if __name__ == "__main__" : 
+    retcode = 0
     try :
         defaults = { \
@@ -226 +230 @@
             raise PyKotaToolError, _("incompatible options, see help.")
         else :
-            sys.exit(sender.main(args, options))
+            retcode = sender.main(args, options)
     except (PyKotaToolError, PyKotaConfigError, PyKotaStorageError), msg :            
         sys.stderr.write("%s\n" % msg)
         sys.stderr.flush()
-        sys.exit(-1)
-
+        retcode = -1
+        
+    try :
+        sender.storage.close()
+    except (TypeError, NameError, AttributeError) :    
+        pass
+        
+    sys.exit(retcode)