Changeset 2268 for pykota/trunk/pykota/storage.py

Timestamp:

05/21/05 23:39:07 (19 years ago)

Author:

jerome

Message:

The start= and end= data dumper filters now accept the magical
keywords 'yesterday', 'today', 'now' and 'tomorrow'.

Files:

• pykota/trunk/pykota/storage.py (modified) (1 diff)

pykota/trunk/pykota/storage.py

@@ -598 +598 @@
         if (startdate is None) and (enddate is None) :    
             return (None, None)
-        if startdate.isdigit() and enddate.isdigit() :
+            
+        now = DateTime.now()    
+        nameddates = ('yesterday', 'today', 'now', 'tomorrow')
+        if ((startdate.lower() in nameddates) or startdate.isdigit()) and \
+           ((enddate.lower() in nameddates) or enddate.isdigit()) : 
             datedict = { "start" : startdate, "end" : enddate }    
             for limit in datedict.keys() :
                 dateval = datedict[limit]
+                if dateval in nameddates :
+                    if limit == "start" :
+                        if dateval == "yesterday" :
+                            dateval = (now - 1).Format("%Y%m%d000000")
+                        elif dateval == "today" :
+                            dateval = now.Format("%Y%m%d000000")
+                        elif dateval == "now" :
+                            dateval = now.Format("%Y%m%d%H%M%S")
+                        else : # tomorrow
+                            dateval = (now + 1).Format("%Y%m%d000000")
+                    else :
+                        if dateval == "yesterday" :
+                            dateval = (now - 1).Format("%Y%m%d235959")
+                        elif dateval == "today" :
+                            dateval = now.Format("%Y%m%d235959")
+                        elif dateval == "now" :
+                            dateval = now.Format("%Y%m%d%H%M%S")
+                        else : # tomorrow
+                            dateval = (now + 1).Format("%Y%m%d235959")
+                        
                 lgdateval = len(dateval)
                 if lgdateval == 4 :