From 46fca20f0942ea144acd21b81ea987568fc6b3f3 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 20 May 2025 15:09:57 +0200 Subject: [PATCH] add links to servers on intruments --- webserver.py | 55 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 23 deletions(-) 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 = [''' - -'''] - 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'') - out.extend(f'' for s, d in streams) - out.append('') - for stream, device in bare_streams: - out.append(f'') - out.extend(['
instrumentdevices
{ins}{d or s}
{stream}{device}
', '']) - return '\n'.join(out) +#@app.route('/select_instrument') +#def select_instrument(): +# out = [''' +# +#'''] +# 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'') +# out.extend(f'' for s, d in streams) +# out.append('') +# for stream, device in bare_streams: +# out.append(f'') +# out.append('
instrumentdevices
{ins}{d or s}
{stream}{device}
') +# 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'

earlier dates


') - out.extend(['', '']) + out.append('') + out.append('

servers on the instruments:

') + out.extend([f"{i} \n" for i in instlist]) + out.extend(['', '']) except Exception as e: logging.error('%s', traceback.format_exc()) circularlog.log()