diff --git a/compendium_v2/background_task/parse_excel_data.py b/compendium_v2/background_task/parse_excel_data.py index 879a20edd24b496e9d4bebcb4a5149c647e0d64e..076c9c4eccdc4c3161db2519e8b1e8dbca2d6e20 100644 --- a/compendium_v2/background_task/parse_excel_data.py +++ b/compendium_v2/background_task/parse_excel_data.py @@ -8,24 +8,13 @@ import logging setup_logging() -logger = logging.getLogger('xlsx_to_csv_sheet_parsing_task') +logger = logging.getLogger(__name__) EXCEL_FILE = os.path.join( os.path.dirname(__file__), "xlsx", "2021_Organisation_DataSeries.xlsx") -def import_countries(): - with db.session_scope() as session: - with open('csv/BudgetCsvFile.csv') as csvfile: - reader = csv.DictReader(csvfile) - for row in reader: - data = model.BudgetEntry( - nren=row[0], budget=row[1], year=row[2]) - data.save() - session.add(data) - - def fetch_budget_excel_data(): # load the xlsx file diff --git a/compendium_v2/publishers/survey_publisher_v1.py b/compendium_v2/publishers/survey_publisher_v1.py index 8338b83cdec239ec86007dc47573ee19f07f93bf..859e2461d58cd2cd92d4a4656a62c78b991bf849 100644 --- a/compendium_v2/publishers/survey_publisher_v1.py +++ b/compendium_v2/publishers/survey_publisher_v1.py @@ -11,7 +11,7 @@ from compendium_v2.survey_db import model as survey_model setup_logging() -logger = logging.getLogger('survey_publisher_v1') +logger = logging.getLogger('survey-publisher-v1') def init_db(config):