diff --git a/PythonServer/pos-python-server.py b/PythonServer/pos-python-server.py index 68eccc2652573068c5500b12291b4750db348390..42c6e51cfe600bd7a85d67fe91c94548d8a891c2 100755 --- a/PythonServer/pos-python-server.py +++ b/PythonServer/pos-python-server.py @@ -50,7 +50,7 @@ for PV in pvlist: except: None -with open('/var/www/data/getData','w') as datafile: +with open('/var/www/data/getData.json','w') as datafile: json.dump(global_dict, datafile) class epicsQuery(Thread): @@ -201,7 +201,7 @@ class epicsQuery(Thread): publicpvs_return_dict['ISrc-010:TS-EVG-01:Mxc1-Frequency-RB']['value']='' publicpvs_return_dict['ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB']['value']='' - with open('/var/www/data/getPublicData','w') as datafile: + with open('/var/www/data/getPublicData.json','w') as datafile: json.dump(publicpvs_return_dict, datafile) interlocks_return_dict={} @@ -216,7 +216,7 @@ class epicsQuery(Thread): else: interlocks_return_dict[pv]['units']='n.c.' interlocks_return_dict[pv]['value']='' - with open('/var/www/data/getInterlocks','w') as datafile: + with open('/var/www/data/getInterlocks.json','w') as datafile: json.dump(interlocks_return_dict, datafile) try: @@ -341,7 +341,7 @@ class epicsQuery(Thread): else: instruments_return_dict[pv]['units']='n.c.' instruments_return_dict[pv]['value']='' - with open('/var/www/data/getInstruments','w') as datafile: + with open('/var/www/data/getInstruments.json','w') as datafile: json.dump(instruments_return_dict, datafile) time.sleep(0.5) diff --git a/WebSites/instruments/dashboard.json b/WebSites/instruments/dashboard.json index 0deee9559367b5f9a6b1b1ed7af042d8d1a4a5b1..4b632fb6430bfbe33b5973998717ab535d94beef 100644 --- a/WebSites/instruments/dashboard.json +++ b/WebSites/instruments/dashboard.json @@ -309,7 +309,7 @@ "name": "Instruments", "type": "JSON", "settings": { - "url": "/data/getInstruments", + "url": "/data/getInstruments.json", "use_thingproxy": false, "refresh": 1, "method": "GET" diff --git a/WebSites/interlocks/dashboard.json b/WebSites/interlocks/dashboard.json index b29929ccb9194c53720ff1f0abab6a8207675bac..09c108b5205c46508863a6414849fe4a9f22940e 100644 --- a/WebSites/interlocks/dashboard.json +++ b/WebSites/interlocks/dashboard.json @@ -148,7 +148,7 @@ "name": "Public Data", "type": "JSON", "settings": { - "url": "/data/getInterlocks", + "url": "/data/getInterlocks.json", "use_thingproxy": false, "refresh": 1, "method": "GET" diff --git a/WebSites/pos-dev/dashboard.json b/WebSites/pos-dev/dashboard.json index 39d46723e14059901600e358efd534b443bd6d74..9c72a4c4987c60d85eecd320fbd478963af4218a 100644 --- a/WebSites/pos-dev/dashboard.json +++ b/WebSites/pos-dev/dashboard.json @@ -309,7 +309,7 @@ "name": "Instruments", "type": "JSON", "settings": { - "url": "/data/getInstruments", + "url": "/data/getInstruments.json", "use_thingproxy": false, "refresh": 1, "method": "GET" diff --git a/WebSites/pos/dashboard.json b/WebSites/pos/dashboard.json index 80cfbd254ff6350f337af6695369765ed591c2cd..162063c7e693751614e37f669f417d7d59c89f06 100644 --- a/WebSites/pos/dashboard.json +++ b/WebSites/pos/dashboard.json @@ -486,7 +486,7 @@ "name": "Public Data", "type": "JSON", "settings": { - "url": "/data/getPublicData", + "url": "/data/getPublicData.json", "use_thingproxy": false, "refresh": 1, "method": "GET"