diff --git a/LCU/Maintenance/DBInterface/monitoringdb/models/error_details.py b/LCU/Maintenance/DBInterface/monitoringdb/models/error_details.py index 87068cbf87c1a039ebd88b6f53438991f64e4c32..ed14ff246a8b36a22e2d71ed57a5ac6b1f6b86e3 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/models/error_details.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/models/error_details.py @@ -63,7 +63,7 @@ class ErrorDetails(models.Model): rcu5_0v = models.FloatField(default=None, null=True) lba8_0v = models.FloatField(default=None, null=True) - hba_48v = models.FloatField(default=None, null=True) + hba48v = models.FloatField(default=None, null=True) spu3_3v = models.FloatField(default=None, null=True) v1_2 = models.FloatField(default=None, null=True) diff --git a/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py b/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py index a9ae8251791ce06b7969db15218df0c991f69346..892971720f43a24db5768817a905fec8dc5b7f81 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/station_test_raw_parser.py @@ -22,6 +22,9 @@ def parse_key_value_pairs(content): if re.match('\A\d*\.\d*', key): key = 'v' + key.strip('V') + if re.match('\A\w*-\d*.\d*', key): + key = key.replace('-', '') + key = re.sub('([.-])', '_', key).lower() return {key: value} diff --git a/LCU/Maintenance/DBInterface/monitoringdb/views/station_test_views.py b/LCU/Maintenance/DBInterface/monitoringdb/views/station_test_views.py index 5245388d94163a47b67cfa3d61733c3fcd8f5571..dcb0159162b52fe4a04984ae443b72571ba2e8b5 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/views/station_test_views.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/views/station_test_views.py @@ -108,17 +108,17 @@ def insert_component_error(station_test_entry, component_entry = Component.objects.filter(station=station_entry, **component).first() if component_entry is None: - print('Component entry is not present, inserting ...') + logger.debug('Component entry is not present, inserting ...') component_entry = Component(station=station_entry, **component) - print(component_entry, component_error) + logger.debug(component_entry, component_error) component_entry.save() component_error_entry = ComponentError.objects.filter(component=component_entry, station_test=station_test_entry, **component_error).first() if component_error_entry is None: - print('Component error entry is not present, inserting ...') + logger.debug('Component error entry is not present, inserting ...') if component_error_details: component_error_details_entry = ErrorDetails(**component_error_details) component_error_details_entry.save() @@ -204,13 +204,13 @@ def insert_station_test(station_test): station_entry = Station.objects.filter(**station).first() if station_entry is None: - print('Station is not present, inserting ...') + logger.debug('Station is not present, inserting ...') station_entry = Station(**station) station_entry.save() station_test_entry = StationTest.objects.filter(**station_test).first() if station_test_entry is None: - print('Station test is not present, inserting ...') + logger.debug('Station test is not present, inserting ...') station_test_entry = StationTest(station=station_entry, **station_test) station_test_entry.save()