Changeset 2520

Timestamp:

02/02/10 12:15:28 (6 weeks ago)

Author:

JensDiemer

Message:

sending wbo works better

Files:

• PyLucidPlugins/weave/views.py (modified) (7 diffs)

PyLucidPlugins/weave/views.py

@@ -2 +2 @@
 
 import time
+import datetime
+import traceback
 
 try:
@@ -28 +30 @@
   # influence the "newer" and "older" modifiers
   return round(time.time(), 2)
+
+
+def _datetime2epochtime(dt):
+    assert isinstance(dt, datetime.datetime)
+    timestamp = time.mktime(dt.timetuple()) # datetime -> time since the epoch
+    # Add microseconds. FIXME: Is there a easier way?
+    timestamp += (dt.microsecond / 1000000.0)
+    return round(timestamp, 2)
+
 
 def _debug_request(request):
@@ -76 +87 @@
                 raise AssertionError(msg)
 
-            data_string = json.dumps(data, sort_keys=True)
-            response = http.HttpResponse(data_string, content_type='application/json')
+            try:
+                data_string = json.dumps(data, sort_keys=True)
+            except Exception, err:
+                print traceback.format_exc()
+                raise
+
+            response = http.HttpResponse(data_string,
+#                content_type='application/json'
+                content_type='text/plain'
+            )
             response["X-Weave-Timestamp"] = _timestamp()
 
@@ -100 +119 @@
 
     return "weave plugin, use this url: %s" % request.build_absolute_uri()
+
 
 
@@ -130 +150 @@
     for wbo in wbos:
         lastupdatetime = wbo["lastupdatetime"]
-        # FIXME: Milliseconds
-        timestamp = time.mktime(lastupdatetime.timetuple()) # datetime -> time since the epoch
+        timestamp = _datetime2epochtime(lastupdatetime) # datetime -> time since the epoch
         timestamps[wbo["wboid"]] = str(timestamp)
 
@@ -195 +214 @@
 
         # The server will return the timestamp associated with the modification.
-        data = {wboid: wbo.lastupdatetime}
+        data = {wboid: _datetime2epochtime(wbo.lastupdatetime)}
         return data
     elif request.method == 'GET':
         # Returns a list of the WBO ids contained in a collection.
-        collection = Collection.on_site.get(user=user, name=col_name)
+        try:
+            collection = Collection.on_site.get(user=user, name=col_name)
+        except Collection.DoesNotExist:
+            raise http.Http404
+
         wbos = Wbo.objects.all().filter(collection=collection)
         print "+++", wbos
@@ -205 +228 @@
         for wbo in wbos:
             lastupdatetime = wbo.lastupdatetime
-            # FIXME: Milliseconds
-            timestamp = time.mktime(lastupdatetime.timetuple()) # datetime -> time since the epoch
+            timestamp = _datetime2epochtime(lastupdatetime) # datetime -> time since the epoch
             timestamps[wbo.wboid] = str(timestamp)