diff --git a/data/politicians/MPs_additionalInfo.csv b/data/politicians/MPs_additionalInfo.csv index 791a44e4efeca2801912e77d1a1026476f19dd15..50fb1ff184558b0a603d19c11fee0fe407618d86 100644 --- a/data/politicians/MPs_additionalInfo.csv +++ b/data/politicians/MPs_additionalInfo.csv @@ -16,3 +16,4 @@ Weber,Rolf,,Arbon Zweifel,Esaja,,Landammann Zweifel,Peter,,Regierungsrath Bühler,Peter Theophil,,Bünden +Welti,Franz,,Basel diff --git a/src/python/run_extract_discussions.py b/src/python/run_extract_discussions.py index a9df20a6ed84accfe02f2f56a084523936fb0b55..23747f0fbb6a806184581477f67ae316b98665c7 100644 --- a/src/python/run_extract_discussions.py +++ b/src/python/run_extract_discussions.py @@ -100,6 +100,10 @@ for file_tarpath in files_to_process: print(id_doc + '\n') file_doc.df_lastnames = df_lastnames file_doc.list_notnames = list_notnames + # TODO: add this to next deeper level + (str_council, str_date) = file_doc.get_council_date() + file_doc.str_council = str_council + file_doc.str_date = str_date file_doc.annotate_xml() # Commands to get the compressed version of the file diff --git a/src/python/utils_annot.py b/src/python/utils_annot.py index ec0564efd3123b2ddda2cff43194b03967727672..0c19077eedca544c6b616c4cf2c01612dfcefc0e 100644 --- a/src/python/utils_annot.py +++ b/src/python/utils_annot.py @@ -801,10 +801,6 @@ def get_list_cantons(df_names, str_name, str_council = ''): # list of cantons list_cantonname = list(df_temp['CantonName']) - # TODO this will lead to an error! - for canton in ['Basel-Stadt', 'Basel-Landschaft']: - if canton in list_cantonname: - list_cantonname.extend(['Basel']) # list of canton abbreviations list_cantonabbr = list(df_temp['CantonAbbreviation'])