diff --git a/api/GetAverageData.py b/api/GetAverageData.py index bebb4fcc9d7c09eed5fff513c4e0b50cbdab7627..b46546516d4b92d21aabada2b6269727e1db915c 100644 --- a/api/GetAverageData.py +++ b/api/GetAverageData.py @@ -4,7 +4,7 @@ import psycopg2 from psycopg2 import sql cfg = configparser.ConfigParser() -cfg.read('config.ini') +cfg.read('../config.ini') assert "POSTGRES" in cfg, "missing POSTGRES in config.ini" assert "INTERPOLATION" in cfg, "missing INTERPOLATION in config.ini" param_postgres = cfg["POSTGRES"] diff --git a/api/api.py b/api/api.py index 350becc2fa110636f8e33feee46b8fc9cf0f87b5..0f0fa09246d0bae0f8936e8bdfaa2e447bf4fe9c 100644 --- a/api/api.py +++ b/api/api.py @@ -5,7 +5,7 @@ import configparser from GetAverageData import get_interpolation_data_for_point cfg = configparser.ConfigParser() -cfg.read('config.ini') +cfg.read('../config.ini') assert "POSTGRES" in cfg, "missing POSTGRES in config.ini" param_postgres = cfg["POSTGRES"] diff --git a/dataacquisition/ExportToDatabase.py b/dataacquisition/ExportToDatabase.py index 3b1be20fbfe58bbd9f4b4c0e8ab995bfd0e17a45..b1746e225e67257e93c56b511e7336c8200dd0a6 100644 --- a/dataacquisition/ExportToDatabase.py +++ b/dataacquisition/ExportToDatabase.py @@ -16,7 +16,7 @@ import configparser from api.GetAverageData import get_interpolation_data_for_point cfg = configparser.ConfigParser() -cfg.read('config.ini') +cfg.read('../config.ini') assert "POSTGRES" in cfg, "missing POSTGRES in config.ini" param_postgres = cfg["POSTGRES"] param_interpol = cfg["INTERPOLATION"] diff --git a/dataacquisition/config.ini b/dataacquisition/config.ini deleted file mode 100644 index 6f7d770cc774e3c78e94a9d8b5f3d1851801a158..0000000000000000000000000000000000000000 --- a/dataacquisition/config.ini +++ /dev/null @@ -1,12 +0,0 @@ -[POSTGRES] -host = localhost -port = 5432 -user = postgres -password = postgres -dbName = temperatures_berteld_morstein - -[INTERPOLATION] -; neighbouring measurements used for interpolation -amount_neighbours = 5 -; in km. 25km or 10km possible -matrix_density = 25 \ No newline at end of file diff --git a/dataacquisition/test_ExportToDatabase.py b/dataacquisition/test_ExportToDatabase.py index 5b9b02f8e159ae46987c976c582a9266d2308f42..2c04bd32bb368c29aeb974acc219d3abc3f39af8 100644 --- a/dataacquisition/test_ExportToDatabase.py +++ b/dataacquisition/test_ExportToDatabase.py @@ -14,7 +14,7 @@ import psycopg2 import time cfg = configparser.ConfigParser() -cfg.read('config.ini') +cfg.read('../config.ini') assert "POSTGRES" in cfg, "missing POSTGRES in config.ini"