From f8bc0fbf5e40b06920e255a9525e159169a23eb8 Mon Sep 17 00:00:00 2001
From: Andrew Melton <andrew.melton@rackspace.com>
Date: Thu, 14 Feb 2013 15:27:02 -0500
Subject: [PATCH 1/2] Improving str_time_to_unix()

---
 stacktach/views.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/stacktach/views.py b/stacktach/views.py
index d770645..10e6a6d 100644
--- a/stacktach/views.py
+++ b/stacktach/views.py
@@ -321,17 +321,25 @@ def aggregate_usage(raw):
 
 
 def str_time_to_unix(when):
-    try:
-        when = datetime.datetime.strptime(when, "%Y-%m-%d %H:%M:%S")
-    except ValueError:
+    if 'T' in when:
+        try:
+            # Old way of doing it
+            when = datetime.datetime.strptime(when, "%Y-%m-%dT%H:%M:%S.%f")
+        except ValueError:
+            try:
+                # Old way of doing it, no millis
+                when = datetime.datetime.strptime(when, "%Y-%m-%dT%H:%M:%S")
+            except Exception, e:
+                print "BAD DATE: ", e
+    else:
         try:
             when = datetime.datetime.strptime(when, "%Y-%m-%d %H:%M:%S.%f")
         except ValueError:
             try:
-                # Old way of doing it
-                when = datetime.datetime.strptime(when, "%Y-%m-%dT%H:%M:%S.%f")
+                when = datetime.datetime.strptime(when, "%Y-%m-%d %H:%M:%S")
             except Exception, e:
                 print "BAD DATE: ", e
+
     return dt.dt_to_decimal(when)
 
 

From 4a991e5cd2284e0dec6c00471fe11cdf1df68583 Mon Sep 17 00:00:00 2001
From: Andrew Melton <andrew.melton@rackspace.com>
Date: Thu, 14 Feb 2013 18:01:13 -0500
Subject: [PATCH 2/2] Fixing 'stack/timings/uuid/' url

---
 stacktach/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stacktach/urls.py b/stacktach/urls.py
index 59c6098..0ed6901 100644
--- a/stacktach/urls.py
+++ b/stacktach/urls.py
@@ -9,7 +9,7 @@ urlpatterns = patterns('',
     url(r'stacky/hosts/$', 'stacktach.stacky_server.do_hosts'),
     url(r'stacky/uuid/$', 'stacktach.stacky_server.do_uuid'),
     url(r'stacky/timings/$', 'stacktach.stacky_server.do_timings'),
-    url(r'stacky/timings/uuid$', 'stacktach.stacky_server.do_timings_uuid'),
+    url(r'stacky/timings/uuid/$', 'stacktach.stacky_server.do_timings_uuid'),
     url(r'stacky/summary/$', 'stacktach.stacky_server.do_summary'),
     url(r'stacky/request/$', 'stacktach.stacky_server.do_request'),
     url(r'stacky/show/(?P<event_id>\d+)/$',