diff --git a/src/covid19/blueprints/ecdc/ecdc_service_config.py b/src/covid19/blueprints/ecdc/ecdc_service_config.py
index cff65b0f57dc935f32c94ae0ccaba88cd28fbd5e..8727f9ef548bf85376d8d9fea42362e2180d17ad 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_config.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_config.py
@@ -1,10 +1,15 @@
import os
+from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+
class EcdcServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'ECDC'
+ self.sub_category = 'European Centre for Disease Prevention and Control'
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.tablename = EcdcImport.__tablename__
self.cvsfile_name = "ecdc_europa_data.csv"
self.url_src = "https://opendata.ecdc.europa.eu/covid19/casedistribution/csv/"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_download.py b/src/covid19/blueprints/ecdc/ecdc_service_download.py
index 289dc59549488b05c9969fc2f3ce3ee13e313547..29e74d361eec0182e1e2363d7fd47b2bc2b852a7 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_download.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_download.py
@@ -19,7 +19,7 @@ class EcdcServiceDownload:
app.logger.info("------------------------------------------------------------")
app.logger.info(" download ECDC [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
index 16f7a3073659acff5a4d680c9e26c9fd46b21cfc..a9ed2ea1f1b96062587fe2627c11502d0fb5b5a9 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -1,4 +1,3 @@
-import os
import csv
import psycopg2
@@ -20,12 +19,12 @@ class EcdcServiceImport:
def import_file(self):
app.logger.info(" import ECDC [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" TABLE: ecdc_data_import <-- " + self.cfg.cvsfile_name)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
k = 0
try:
EcdcImport.remove_all()
- with open(self.cfg.cvsfile_name, newline='') as csv_file:
+ with open(self.cfg.cvsfile_path, newline='') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter=',', quotechar='"')
for row in file_reader:
o = EcdcImport(
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
index 1e4070489de72305d6f5dcab9001aa345f7a6047..83035db82e59991b47a4d79f113fbc898b8a0e53 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
@@ -1,11 +1,15 @@
from datetime import date
import os
+from covid19.blueprints.rki_bundeslaender.rki_model_import import RkiBundeslaenderImport
class RkiBundeslaenderServiceConfig:
def __init__(self):
self.limit_nr = 20
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.category = 'RKI'
+ self.sub_category = 'Bundeslaender'
+ self.tablename = RkiBundeslaenderImport.__tablename__
self.url_src = "https://opendata.arcgis.com/datasets/ef4b445a53c1406892257fe63129a8ea_0.csv"
self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__bundeslaender.csv"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
index bc4cc08d5209fe34dcfd88197bfd5fa01b78dc7c..d62586784a58790d03d19c261ed161bb05ce0f38 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
@@ -19,7 +19,7 @@ class RkiBundeslaenderServiceDownload:
def download_file(self):
app.logger.info(" download - RKI [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
@@ -43,6 +43,9 @@ class RkiBundeslaenderServiceDownload:
app.logger.error("############################################################")
flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error')
finally:
+ app.logger.info("")
+ app.logger.info("------------------------------------------------------------")
+ app.logger.info(" downloaded FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
app.logger.info(" download - RKI [done] ")
msg = "downloaded: " + self.cfg.cvsfile_path+" from "+self.cfg.url_src
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
index 26dafb508c93f04502a48497334fd3eebbb07342..c8c5d793c4e4e0236339908a37f0cb94b6b3518f 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
@@ -21,8 +21,7 @@ class RkiBundeslaenderServiceImport:
def import_file(self):
app.logger.info(" import RKI [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: " + self.cfg.cvsfile_name)
- app.logger.info(" TABLE: " + RkiBundeslaenderImport.__tablename__)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
try:
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_config.py b/src/covid19/blueprints/rki_landkreise/rki_service_config.py
index 1ad53a741747abddab5f40f192e5d97f267196ed..abed9c74e1e1a2ad3066b81ca4a4d4007001f197 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_config.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_config.py
@@ -1,11 +1,16 @@
from datetime import date
import os
+from covid19.blueprints.rki_landkreise.rki_model_import import RkiLandkreiseImport
+
class RkiLandkreiseServiceConfig:
def __init__(self):
self.limit_nr = 20
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.category = 'RKI'
+ self.sub_category = 'Landkreise'
+ self.tablename = RkiLandkreiseImport.__tablename__
self.url_src = "https://opendata.arcgis.com/datasets/917fc37a709542548cc3be077a786c17_0.csv"
self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__landkreise.csv"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_download.py b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
index 7ed74cdd53b7cad783901ed39a475c4782a46962..964f617eae30a9f02dbf1d24d4dae2984b849146 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_download.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
@@ -19,7 +19,7 @@ class RkiLandkreiseServiceDownload:
def download_file(self):
app.logger.info(" RKI Landkreise Service Download - download_file begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_path+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_import.py b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
index 639dd17611af998be8e8c613e1f3e09d51eaffcf..70025cfc204ec066daab7413008f0fd29ef3a128 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_import.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
@@ -21,8 +21,7 @@ class RkiLandkreiseServiceImport:
def import_file(self):
app.logger.info(" RKI Landkreise Service Import - import_file [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name)
- app.logger.info(" TABLE: who_global_data_import")
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
if sys.platform == 'linux':
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
index cce5bbab3fd53a7f9fc120e32d92efb9a8ad5839..9de53f6865463404698d34fe4fa6c17ce97da672 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
@@ -1,9 +1,14 @@
import os
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+
class RkiVaccinationServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'RKI'
+ self.sub_category = 'Vaccination'
+ self.tablename = RkiVaccinationImport.__tablename__
self.url_src = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv"
self.cvsfile_name = "germany_vaccinations_timeseries_v2.tsv"
self.data_path = ".."+os.sep+".."+os.sep+"data"
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
index c580c9f874747f805db035c085a03087e2fb9013..7b037368d54ef06d068c9c0a217539c5fd90bc81 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
@@ -18,7 +18,7 @@ class RkiVaccinationServiceDownload:
def download_file(self):
app.logger.info(" download - Vaccination [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index daf77af24186f75fb2a88571195043023f65755f..6bf3c175b7f8fb22329a0296d863a6a5596973db 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -27,8 +27,7 @@ class RkiVaccinationServiceImport:
src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name
app.logger.info(" import Vaccination [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ")
- app.logger.info(" TABLE: who_global_data_import")
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
try:
RkiVaccinationImport.remove_all()
diff --git a/src/covid19/blueprints/who/who_service_config.py b/src/covid19/blueprints/who/who_service_config.py
index d29be34ed924cb314f9be94c01ed4d9b56a97d65..dc4132412157089683391438b363f229cc9e2d23 100644
--- a/src/covid19/blueprints/who/who_service_config.py
+++ b/src/covid19/blueprints/who/who_service_config.py
@@ -1,9 +1,14 @@
import os
+from covid19.blueprints.who.who_model_import import WhoImport
+
class WhoServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'WHO'
+ self.sub_category = 'Cases and Deaths'
+ self.tablename = WhoImport.__tablename__
self.url_src = "https://covid19.who.int/" + self.cvsfile_name
self.cvsfile_name = "WHO-COVID-19-global-data.csv"
self.data_path = ".."+os.sep+".."+os.sep+"data"
diff --git a/src/covid19/blueprints/who/who_service_download.py b/src/covid19/blueprints/who/who_service_download.py
index cc9a87eb6569d1796d46485c5c8cd59452533f27..8696bfa24dc87819aee84142b157e5a76ba929fb 100644
--- a/src/covid19/blueprints/who/who_service_download.py
+++ b/src/covid19/blueprints/who/who_service_download.py
@@ -18,7 +18,7 @@ class WhoServiceDownload:
def download_file(self):
app.logger.info(" download - [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index fda94e9fc350943066fcd5e64d69323d4c4a0193..1c48bdec1ba19ac4d458e2a114b6b6789e5e801b 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -19,8 +19,7 @@ class WhoServiceImport:
def import_file(self):
app.logger.info(" import WHO [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_path)
- app.logger.info(" TABLE: "+WhoImport.__tablename__)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
if sys.platform == 'linux':
@@ -62,6 +61,7 @@ class WhoServiceImport:
app.logger.warning("WARN: import WHO [end]")
finally:
app.logger.info("")
+ app.logger.info(" imported into TABLE: " + self.cfg.tablename + " from " + self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
app.logger.info(" import WHO [done]")
return self