Changeset 2665 for pykota/trunk/pykota/storages

Timestamp:

02/11/06 11:47:29 (18 years ago)

Author:

jerome

Message:

Ensures that date based filtering works consistently between LDAP and SQL.
Doesn't set an empty date to the other date anymore, because this gave
unexpected results :
dumpykota --data history start=20060101
gave only the history for 20060101 and not the history from
this date to the current date, as probably most people would
have expected. This is now fixed.

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/sql.py

@@ -130 +130 @@
             thefilter = "AND %s" % thefilter
         (startdate, enddate) = self.cleanDates(startdate, enddate)
-        if startdate and enddate : 
-            thefilter = "%s AND jobdate>=%s AND jobdate<=%s" % (thefilter, self.doQuote(startdate), self.doQuote(enddate))
+        if startdate : 
+            thefilter = "%s AND jobdate>=%s" % (thefilter, self.doQuote(startdate))
+        if enddate : 
+            thefilter = "%s AND jobdate<=%s" % (thefilter, self.doQuote(enddate))
         result = self.doRawSearch("SELECT users.username,printers.printername,jobhistory.* FROM users,printers,jobhistory WHERE users.id=jobhistory.userid AND printers.id=jobhistory.printerid %s ORDER BY jobhistory.id ASC" % thefilter)
         return self.prepareRawResult(result)