From b6822cc84be7dc05a594c6fd494d6a5dcfa89d04 Mon Sep 17 00:00:00 2001
From: Lilian Gasser <gasserli@ethz.ch>
Date: Tue, 29 Jan 2019 12:08:11 +0100
Subject: [PATCH] one more entry to MPs additionalINfo
---
data/politicians/MPs_additionalInfo.csv | 1 +
src/python/run_extract_discussions.py | 4 ++++
src/python/utils_annot.py | 4 ----
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/data/politicians/MPs_additionalInfo.csv b/data/politicians/MPs_additionalInfo.csv
index 791a44e4..50fb1ff1 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 a9df20a6..23747f0f 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 ec0564ef..0c19077e 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'])
--
GitLab