Changeset 1629 for pykota/trunk/bin

Timestamp:

07/23/04 13:19:48 (20 years ago)

Author:

jalet

Message:

1.19beta is out !

Files:

• pykota/trunk/bin/lprngpykota (modified) (5 diffs)

pykota/trunk/bin/lprngpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.5  2004/07/23 11:19:48  jalet
+# 1.19beta is out !
+#
 # Revision 1.4  2004/07/22 22:41:48  jalet
 # Hardware accounting for LPRng should be OK now. UNTESTED.
@@ -82 +85 @@
         """First pass done here."""
         # first we have to check if previous job was correctly accounted for
-        if (printer.LastJob.JobAction != "DENY") and (printer.LastJob.JobSize is None) :
+        if printer.LastJob.Exists and not printer.LastJob.JobSize :
             # here we know that previous job wasn't accounted for correctly
             # we are sure (?) that it was hardware accounting which was used
@@ -139 +142 @@
             self.logdebug("Job size forced to 0 because printing was denied.")
             
-        if self.accounter.isSoftware :    
+        if (self.accounter.isSoftware) or (action == "DENY") :    
             # update the quota for the current user on this printer 
             self.logdebug("Job size : %i" % jobsize)
@@ -159 +162 @@
             self.posthook(userpquota)
             
-            # here software accounting was completed.
+            # here accounting was completed, either software, or hardware but over quota
         else :
             printer.addJobToHistory(self.jobid, user, self.accounter.getLastPageCounter(), action, filename=self.preserveinputfile, title=self.title, copies=self.copies, options=self.options, clienthost=clienthost, jobsizebytes=self.jobSizeBytes)
@@ -177 +180 @@
             # in second pass, so all work is already done, 
             # now we just have to exit successfully
-            self.printInfo(_("Software accounting already done in first pass. Exiting."))
-        else :    
-            # Now we have to check if accounting was completely finished :
-            # if it is, then a big problem occured because with hardware
-            # accounting, only the second pass can know the job's size.
-            if (printer.LastJob.JobSize is not None) :
-                # this could only occur if configuration was modified 
-                # between first and second pass, and accounter changed
-                # from software to hardware during this short (?) time.
-                raise PyKotaToolError, _("Hardware accounting already finished ! This should be impossible, please report this problem ASAP.")
-                
+            self.printInfo(_("Software accounting already done in first pass. Ignoring."))
+        elif printer.LastJob.JobAction == "DENY" :
+            # Hardware accounting method was used, but job
+            # was rejected during first pass, so nothing to do
+            self.printInfo(_("Hardware accounting already done in first pass. Ignoring."))
+        else :    
             # here if user and userpquota are both None
             # then it's a special second pass for a job