epoch times in json now floats

metobsapi/modifyData.py

@@ -216,7 +216,7 @@ def asciiReturn(frame, sep, symbols, site, inst, epoch):
         output.write('<br/>')                          
     return output
 
-def jsonReturn(frame, symbols, site, inst, jsonFormat):
+def jsonReturn(frame, symbols, site, inst, jsonFormat, epoch):
     output = {}
     output['status'] = 'Success'
     output['message'] = ''
@@ -227,6 +227,15 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat):
 
     package['timestamps'] = list(frame.columns.values)
 
+    if(epoch):
+        newStamps = []
+
+        for stamp in package['timestamps']:
+            newStamps.append(float(stamp))
+
+        package['timestamps'] = newStamps    
+
+
     if(jsonFormat == 'column'):
 
         data = {}
@@ -510,10 +519,10 @@ def modifyData(fmt, begin, end, site, inst, symbols, interval, sep, callback, js
         return output.getvalue()
 
     elif(fmt == 'json'):
-        return jsonReturn(frame, symbols, site, inst, jsonFormat)
+        return jsonReturn(frame, symbols, site, inst, jsonFormat, epoch)
 
     elif(fmt == 'jsonp'):
-        return jsonReturn(frame, symbols, site, inst, jsonFormat)
+        return jsonReturn(frame, symbols, site, inst, jsonFormat, epoch)
 
     elif(fmt == 'xml'):
         return xmlReturn(site, inst, frame, symbols, sep, epoch)

metobsapi/multiData.py

@@ -145,7 +145,7 @@ def asciiReturn(frame, sep, symbols, epoch):
         output.write('<br/>')                          
     return output            
                     
-def jsonReturn(frame, symbols, jsonFormat):
+def jsonReturn(frame, symbols, jsonFormat, epoch):
     output = {}
     output['status'] = 'Success'
     output['message'] = ''
@@ -159,6 +159,14 @@ def jsonReturn(frame, symbols, jsonFormat):
 
     package['timestamps'] = list(frame.columns.values)
 
+    if(epoch):
+        newStamps = []
+
+        for stamp in package['timestamps']:
+            newStamps.append(float(stamp))
+
+        package['timestamps'] = newStamps
+
     if jsonFormat == 'column':
         frame = frame.transpose()
 

metobsapi/server.py

@@ -147,7 +147,7 @@ def handleMultiSites(fmt):
         return multiData.asciiReturn(frame, sep, modifiedSymbols, epoch).getvalue()
 
     if(fmt == 'json' or fmt == 'jsonp'):
-        jsonReturn = multiData.jsonReturn(frame, modifiedSymbols, jsonFormat)
+        jsonReturn = multiData.jsonReturn(frame, modifiedSymbols, jsonFormat, epoch)
 
         if(fmt == 'jsonp'):
             return modifyData.jsonpReturn(jsonReturn)