Modified JSON return obj

JSON now has status : <status>
code: <code>
message : <message>
package:
    data: <data>
    timestamps: <timestamps>
    symbols: <symbols>

metobsapi/modifyData.py

@@ -222,9 +222,10 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat):
     output['message'] = ''
     output['code'] = 200
     output['num_result'] = str(len(list(frame.columns.values)))
-    output['symbols'] = symbols
 
-    output['timestamps'] = list(frame.columns.values)
+    package = {}
+
+    package['timestamps'] = list(frame.columns.values)
 
     if(jsonFormat == 'column'):
 
@@ -235,12 +236,14 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat):
         for symbol in frame:
             data[symbol] = frame[symbol]
 
-        output['data'] = data
+        package['data'] = data
 
     else:
+        package['symbols'] = symbols
+
         dataList = []
 
-        for date in output['stamps']:
+        for date in package['timestamps']:
             row = frame[date]
             newRow = []
 
@@ -249,7 +252,9 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat):
 
             dataList.append(newRow)
 
-        output['data'] = dataList              
+        package['data'] = dataList
+
+    output['package'] = package                  
 
     return output
 
@@ -389,7 +394,7 @@ def handleResult(fmt, result, symbols, interval, sep, spd, wDir):
                             direction[row] = 180
 
                     elif(wNorth[row] == 0):
-                        if(wEast > 0):
+                        if(wEast[row] > 0):
                             direction[row] = 90
                         else:
                             direction[row] = 270

metobsapi/multiData.py

@@ -154,7 +154,10 @@ def jsonReturn(frame, symbols, jsonFormat):
     frame = frame.transpose()
 
     output['num_results'] = str(len(list(frame.columns.values)))
-    output['timestamps'] = list(frame.columns.values)
+
+    package = {}
+
+    package['timestamps'] = list(frame.columns.values)
 
     if jsonFormat == 'column':
         frame = frame.transpose()
@@ -164,14 +167,14 @@ def jsonReturn(frame, symbols, jsonFormat):
         for symbol in frame:
             data[symbol] = frame[symbol]
 
-        output['data'] = data 
+        package['data'] = data 
 
     else:
         dataList = []
 
-        output['symbols'] = symbols
+        package['symbols'] = symbols
 
-        for date in output['timestamps']:
+        for date in package['timestamps']:
             row = frame[date]
             newRow = []
 
@@ -180,7 +183,9 @@ def jsonReturn(frame, symbols, jsonFormat):
 
             dataList.append(newRow)
 
-        output['data'] = dataList      
+        package['data'] = dataList
+
+    output['package'] = package          
 
     return output