Changeset 3142 for pykota/trunk/pykota/storages

Timestamp:

02/08/07 21:13:03 (17 years ago)

Author:

jerome

Message:

Make start= and end= filters also work with payments. For an unknown
reason it didn't already work (not implemented !)...
Ensures that these filters are only allowed for payments and
history, otherwise an SQL syntax error could have occured.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (2 diffs)
• sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1620 +1620 @@
     def extractPayments(self, extractonly={}) :
         """Extracts all payment records."""
+        startdate = extractonly.get("start")
+        enddate = extractonly.get("end")
+        (startdate, enddate) = self.cleanDates(startdate, enddate)
         uname = extractonly.get("username")
         entries = [u for u in [self.getUser(name) for name in self.getAllUsersNames(uname)] if u.Exists]
@@ -1626 +1629 @@
             for entry in entries :
                 for (date, amount, description) in entry.Payments :
-                    result.append((entry.Name, amount, date, description))
+                    if ((startdate is None) and (enddate is None)) or \
+                       ((startdate is None) and (date <= enddate)) or \
+                       ((enddate is None) and (date >= startdate)) or \
+                       ((date >= startdate) and (date <= enddate)) :
+                        result.append((entry.Name, amount, date, description))
             return result        
         

pykota/trunk/pykota/storages/sql.py

@@ -187 +187 @@
     def extractPayments(self, extractonly={}) :
         """Extracts all payment records."""
+        startdate = extractonly.get("start")
+        enddate = extractonly.get("end")
+        for limit in ("start", "end") :
+            try :
+                del extractonly[limit]
+            except KeyError :    
+                pass
         thefilter = self.createFilter(extractonly)
         if thefilter :
             thefilter = "AND %s" % thefilter
+        (startdate, enddate) = self.cleanDates(startdate, enddate)
+        if startdate : 
+            thefilter = "%s AND date>=%s" % (thefilter, self.doQuote(startdate))
+        if enddate : 
+            thefilter = "%s AND date<=%s" % (thefilter, self.doQuote(enddate))
         result = self.doRawSearch("SELECT username,payments.* FROM users,payments WHERE users.id=payments.userid %s ORDER BY payments.id ASC" % thefilter)
         return self.prepareRawResult(result)