Changeset 1240 for pykota/trunk/pykota/reporter.py

Timestamp:

12/27/03 17:49:25 (20 years ago)

Author:

uid67467

Message:

Should be ok now.

Files:

• pykota/trunk/pykota/reporter.py (modified) (4 diffs)

pykota/trunk/pykota/reporter.py

@@ -22 +22 @@
 #
 # $Log$
-# Revision 1.5  2003/12/27 15:43:36  uid67467
-# Savannah is back online...
+# Revision 1.6  2003/12/27 16:49:25  uid67467
+# Should be ok now.
 #
 # Revision 1.4  2003/12/02 14:40:21  jalet
@@ -41 +41 @@
 #
 #
+
+from mx import DateTime
 
 class PyKotaReporterError(Exception):
@@ -96 +98 @@
                 datelimit = "DENY"
                 reached = "+B"
+            elif balance <= self.tool.config.getPoorMan() :
+                datelimit = "WARNING"
+                reached = "?B"
             else :    
                 datelimit = ""
                 reached = "-B"
         else :
-            if quota.DateLimit is not None :
+            if (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :    
+                datelimit = "DENY"
+            elif (quota.HardLimit is None) and (quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) :
+                datelimit = "DENY"
+            elif quota.DateLimit is not None :
                 now = DateTime.now()
                 datelimit = DateTime.ISO.ParseDateTime(quota.DateLimit)
                 if now >= datelimit :
                     datelimit = "DENY"
-            elif (quota.HardLimit is not None) and (pagecounter >= quota.HardLimit) :    
-                datelimit = "DENY"
-            elif (quota.HardLimit is None) and (quota.SoftLimit is not None) and (pagecounter >= quota.SoftLimit) :
-                datelimit = "DENY"
             else :    
                 datelimit = ""
@@ -124 +129 @@
         raise PyKotaReporterError, _("Unsupported reporter backend %s") % reporttype
     else :    
-        return getattr(reporterbackend, "Reporter")(tool, printers, ugnames, isgroup)
+        return reporterbackend.Reporter(tool, printers, ugnames, isgroup)