X-Git-Url: http://spangdorfia.com/code/?p=kismet-logviewer.git;a=blobdiff_plain;f=logviewer%2Fdevices%2Fviews.py;fp=logviewer%2Fdevices%2Fviews.py;h=a7ad512d33661b3765a2a46180cfd729f0d5928d;hp=b65035bf3ce7e7988763ad24b2e0c94bb6b1d840;hb=8b386685d38cdb35f2d4090b14491d17761df339;hpb=5b92d1d581bcc57ff8c95e8f242d2831f2e047c9

diff --git a/logviewer/devices/views.py b/logviewer/devices/views.py
index b65035b..a7ad512 100644
--- a/logviewer/devices/views.py
+++ b/logviewer/devices/views.py
@@ -18,14 +18,24 @@ def load_db(query):
 
 @csrf_exempt
 def index(request,devicename):
-    dev=list(load_db("select cast(device as text) from devices where devkey = \""+devicename+"\""))
-    (dev_info,) = dev[0]
-    #dev_string = "{ \"recordsTotal\": "+str(dev_count)+", \"data\": ["
-    #dev_list = list(load_db("select cast(device as text) from devices limit 50"))
-    #for device in dev_list:
-    #    (dev,) = device
-    #    dev_string = dev_string + dev + ","
-    #dev_string = dev_string[:-1]
-    #dev_string = dev_string + "],\"draw\": 5,\"recordsFiltered\": "+str(dev_count)+"}"
-    return HttpResponse(dev_info, content_type='text/json')
+    print("-------------")
+    print(request.path)
+    print(devicename)
+    print("-------------")
+    if request.path[0:8] == "/devices":
+        print("FIXED")
+        dev=list(load_db("select cast(device as text) from devices where devkey = \""+devicename+"\""))
+        (dev_info,) = dev[0]
+        #dev_string = "{ \"recordsTotal\": "+str(dev_count)+", \"data\": ["
+        #dev_list = list(load_db("select cast(device as text) from devices limit 50"))
+        #for device in dev_list:
+        #    (dev,) = device
+        #    dev_string = dev_string + dev + ","
+        #dev_string = dev_string[:-1]
+        #dev_string = dev_string + "],\"draw\": 5,\"recordsFiltered\": "+str(dev_count)+"}"
+        return HttpResponse(dev_info, content_type='text/json')
+    elif request.path[0:11] == "/datasource":
+        datasource=list(load_db("select cast(json as text) from datasources where uuid = \""+str(devicename)+"\""))
+        (json_result,) = datasource[0]
+        return HttpResponse(json_result, content_type='text/json')