Changeset 915 for pykota/trunk/bin

Timestamp:

04/15/03 13:30:57 (22 years ago)

Author:

jalet

Message:

More work done on money print charging.
Minor bugs corrected.
All tools now access to the storage as priviledged users, repykota excepted.

Location:

pykota/trunk/bin

Files:

• pykota (modified) (2 diffs)
• repykota (modified) (3 diffs)

pykota/trunk/bin/pykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.23  2003/04/15 11:30:57  jalet
+# More work done on money print charging.
+# Minor bugs corrected.
+# All tools now access to the storage as priviledged users, repykota excepted.
+#
 # Revision 1.22  2003/04/15 11:09:04  jalet
 # Small bug was fixed when a printer was never used and its internal
@@ -111 +116 @@
     """Class for the PyKota filter."""
     def __init__(self, username) :
-        PyKotaTool.__init__(self, isfilter=1)
+        PyKotaTool.__init__(self)
         self.username = username
         self.requester = openRequester(self.config, self.printername)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.25  2003/04/15 11:30:57  jalet
+# More work done on money print charging.
+# Minor bugs corrected.
+# All tools now access to the storage as priviledged users, repykota excepted.
+#
 # Revision 1.24  2003/04/14 20:05:20  jalet
 # Reversed test.
@@ -156 +161 @@
 class RePyKota(PyKotaTool) :        
     """A class for repykota."""
+    def __init__(self, doc) :
+        """Initializes the tool as a non-priviledged storage user."""
+        PyKotaTool.__init__(self, asadmin=0, doc=doc)
+        
     def main(self, options) :
         """Print Quota reports generator."""
@@ -181 +190 @@
                 print (" " * 43) + (_("Total : %9i") % total)
             printerpagecounter = self.storage.getPrinterPageCounter(printerid)
-            if printerpagecounter is None :    
+            try :
+                msg = "%9i" % printerpagecounter["pagecounter"]
+            except TypeError :     
                 msg = _("unknown")
-            else :
-                msg = "%9i" % printerpagecounter["pagecounter"]
             print (" " * 44) + (_("Real : %s") % msg)
             print