From b35cb6a8bff4ab143dd433533c76d12eb97565a4 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 18 Feb 2021 00:19:04 +0100
Subject: [PATCH] ### 0.0.18 Release
---
.../blueprints/rki_landkreise/rki_service_download.py | 6 +++---
.../blueprints/rki_landkreise/rki_service_import.py | 7 +------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_download.py b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
index 19747816..515559bd 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_download.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
@@ -29,17 +29,17 @@ class RkiLandkreiseServiceDownload:
app.logger.info(" " + data_file + " ")
except RuntimeError as runtimeError:
app.logger.error("############################################################")
- app.logger.error(" " + runtimeError + " ")
+ app.logger.error(" runtimeError " + runtimeError + " ")
app.logger.error("############################################################")
flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error')
except AttributeError as attributeError:
app.logger.error("############################################################")
- app.logger.error(attributeError)
+ app.logger.error(" attributeError " + attributeError + " ")
app.logger.error("############################################################")
flash(message="error after downloading: " + self.cfg.cvsfile_path, category='error')
except Exception as exception:
app.logger.error("############################################################")
- app.logger.error(exception)
+ app.logger.error(" exception " + exception + " ")
app.logger.error("############################################################")
flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error')
finally:
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_import.py b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
index 815982e8..e749624c 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_import.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
@@ -24,17 +24,12 @@ class RkiLandkreiseServiceImport:
app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
- if sys.platform == 'linux':
- keyDate_reported ='\ufeffDate_reported'
- else:
- keyDate_reported = 'Date_reported'
try:
RkiLandkreiseImport.remove_all()
- with open(self.cfg.cvsfile_name, newline='\n') as csv_file:
+ with open(self.cfg.cvsfile_path, newline='\n') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter=',', quotechar='"')
k = 0
for row in file_reader:
- # TODO: #140 move WhoImport to RKI in: rk_service_import.py
o = RkiLandkreiseImport(
OBJECTID=row['OBJECTID'],
ADE=row['ADE'],
--
GitLab