diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_download.py b/src/covid19/blueprints/rki_landkreise/rki_service_download.py index 197478163ab64df3566b6b12829e768319c20eed..515559bd98cfe0c2b3a4e4f4a12da9bc4ccfc6eb 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 815982e8e89275b84ebc66da902069a06ef260ae..e749624c5863417d6766b830cef4440a8bbd6850 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'],