diff --git a/config/config.cfg.default b/config/config.cfg.default index 6f2c027..9513db2 100644 --- a/config/config.cfg.default +++ b/config/config.cfg.default @@ -6,12 +6,11 @@ rotation_wait_time = 30 max_img_rotation = 10 hours_spanned = 48 zoomlevel = 15 -item_to_plot = Attribute.category # [1->12] size_dashboard_left_width = 5 size_openStreet_pannel_perc = 55 size_world_pannel_perc = 35 -field_to_plot = Attribute.category +item_to_plot = Attribute.category fieldname_order=["Event.id", "Attribute.Tag", "Attribute.category", "Attribute.type", ["Attribute.value", "Attribute.comment"]] char_separator=|| diff --git a/server.py b/server.py index 6c2c0a2..f0ebb99 100755 --- a/server.py +++ b/server.py @@ -136,7 +136,7 @@ def index(): size_dashboard_width=[cfg.getint('Dashboard' ,'size_dashboard_left_width'), 12-cfg.getint('Dashboard', 'size_dashboard_left_width')], itemToPlot=cfg.get('Dashboard', 'item_to_plot'), graph_log_refresh_rate=cfg.getint('Dashboard' ,'graph_log_refresh_rate'), - char_separator=cfg.get('Log', 'char_separator'), + char_separator=cfg.get('Dashboard', 'char_separator'), rotation_wait_time=cfg.getint('Dashboard' ,'rotation_wait_time'), max_img_rotation=cfg.getint('Dashboard' ,'max_img_rotation'), hours_spanned=cfg.getint('Dashboard' ,'hours_spanned'), diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py index 09a21fd..5e3b14c 100755 --- a/zmq_dispatcher.py +++ b/zmq_dispatcher.py @@ -203,7 +203,7 @@ def handler_attribute(zmq_name, jsonobj, hasAlreadyBeenContributed=False): to_join = [] for subField in field: to_join.append(getFields(jsonobj, subField)) - to_add = cfg.get('Log', 'char_separator').join(to_join) + to_add = cfg.get('Dashboard', 'char_separator').join(to_join) else: to_add = getFields(jsonobj, field) to_push.append(to_add)