diff --git a/webserver.py b/webserver.py
index 1dddf0a..77b3768 100755
--- a/webserver.py
+++ b/webserver.py
@@ -14,6 +14,9 @@ import flask
import circularlog
+instlist = ['AMOR', 'BOA', 'CAMEA', 'DMC', 'EIGER', 'FOCUS', 'HRPT', 'SANS', 'TASP', 'ZEBRA']
+
+
def guess_mimetype(filename):
if filename.endswith('.js'):
mimetype = 'text/javascript'
@@ -303,28 +306,31 @@ def default():
return general_file('SEAWebClient.html')
-@app.route('/select_instrument')
-def select_instrument():
- out = ['''
-
-instrument | devices |
''']
- result = {}
- for stream, tags in server.db.get_streams().items():
- ins = tags.get('instrument', '0')
- result.setdefault(ins, []).append((stream, tags.get('device')))
- bare_streams = result.pop('0', [])
- for ins, streams in result.items():
- out.append(f'{ins} | ')
- out.extend(f'{d or s} | ' for s, d in streams)
- out.append('
')
- for stream, device in bare_streams:
- out.append(f'{stream} | {device} |
')
- out.extend(['
', ''])
- return '\n'.join(out)
+#@app.route('/select_instrument')
+#def select_instrument():
+# out = ['''
+#
+#instrument | devices |
''']
+# result = {}
+# for stream, tags in server.db.get_streams().items():
+# ins = tags.get('instrument', '0')
+# result.setdefault(ins, []).append((stream, tags.get('device')))
+# bare_streams = result.pop('0', [])
+# for ins, streams in result.items():
+# out.append(f'{ins} | ')
+# out.extend(f'{d or s} | ' for s, d in streams)
+# out.append('
')
+# for stream, device in bare_streams:
+# out.append(f'{stream} | {device} |
')
+# out.append('
')
+# out.append('servers on the instruments:
')
+# out.extend([f"{i} \n" for i in instlist])
+# out.extend(['', ''])
+# return '\n'.join(out)
@app.route('/select_experiment')
@@ -389,7 +395,10 @@ a {
out.append(f'{daterange} | ')
if timerange:
out.append(f'
')
- out.extend(['