Attachment 867563 Details for Bug 1069734 – patch fixing date filtering

[patch] patch fixing date filtering

0001-1069734-hwcert-server-filtering-of-saved-results-by-.patch (text/plain), 2.46 KB, created by Greg Nichols on 2014-02-25 17:28:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-02-25 17:28:58 UTC

Size: 2.46 KB

patch

obsolete

>From 808574edbe587c54d5977edd645fbdc306ddd27c Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 25 Feb 2014 12:27:06 -0500
>Subject: [PATCH] 1069734 - hwcert-server filtering of saved results by date
> doesn't work.
>
>---
> server/cgi/saved.py | 22 +++++++++++++++++++++-
> 1 file changed, 21 insertions(+), 1 deletion(-)
>
>diff --git a/server/cgi/saved.py b/server/cgi/saved.py
>index a1e87c9..6a84e3b 100755
>--- a/server/cgi/saved.py
>+++ b/server/cgi/saved.py
>@@ -43,6 +43,24 @@ def getParameters():
> 
> 
> def showSavedResults(parameters):
>+    # switch to YYYY-MM-DD on filter date if necessary
>+    startDate = None
>+    if "start-date" in parameters:
>+        values = parameters["start-date"].split('-')
>+        if len(values) == 3:
>+            try:
>+                if int(values[0]) <= 12:
>+                    startDate = "%s-%s-%s" % (values[2], values[0], values[1])
>+                else:
>+                    startDate = "%s-%s-%s" % (values[0], values[1], values[2])
>+            except Exception, e:
>+                print "<pre>Error: could not parse date filter value \"%s\"\n" % parameters["start-date"]
>+                print e
>+                print "</pre>"
>+        else:
>+            print "<pre>Error: could not parse date filter value , \"%s\", use MM-DD-YYYY or YYYY-MM-DD </pre>" % parameters["start-date"]
>+        print "<pre>%s</pre>" % startDate
>+
>     localPath = os.path.join(environment.getServerDirectory(), "store")
>     resultsFileFilter = re.compile("\.(xml|xml.gz)$", re.IGNORECASE)  
>     fileNamePattern = re.compile("^hwcert-results-(?P<hostname>.+)-(?P<date>[0-9]+)\.xml(.gz)?$")
>@@ -56,9 +74,11 @@ def showSavedResults(parameters):
>                 if match:
>                     dateStamp = match.group("date")
>                     date = "%s-%s-%s" % (dateStamp[4:6], dateStamp[6:8], dateStamp[:4])
>+                    dateCompare = "%s-%s-%s" % (dateStamp[:4], dateStamp[4:6], dateStamp[6:8])
>                     time = "%s:%s:%s" % (dateStamp[8:10], dateStamp[10:12], dateStamp[12:])
>                     hostname = match.group("hostname")
>-                    if "start-date" not in parameters or ("start-date" in parameters and date >= parameters["start-date"]):
>+                    print "<pre>%s</pre>" % dateCompare
>+                    if not startDate or (dateCompare >= startDate):
>                         if systemHeader:
>                             print systemHeader
>                             systemHeader = None
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1069734: 867563