Merge pull request #774 from OpenKnowledgeMaps/master

Merge master to dev

Author: chreman

server/services/getChartSVG.js

@@ -10,8 +10,8 @@ function timeout(ms) {
     const page = await browser.newPage();
     await page.setViewport({width: 1920, height: 1080})
     await page.goto(process.argv[2], {waitUntil: 'networkidle2'});
-    await timeout(3000)
+    await timeout(1000)
     await page.screenshot({path: process.argv[3], clip: { x: 0, y: 0, width: 1150, height: 1080 }});
     browser.close();
 
-})();
+})();

server/workers/base/requirements.txt

@@ -1,6 +1,7 @@
 asn1crypto==0.24.0
 async-timeout==4.0.2
 cryptography==2.1.4
+dateparser==1.1.3
 idna==2.6
 importlib-metadata==4.8.3
 keyring==10.6.0

server/workers/base/src/base.py

@@ -12,6 +12,7 @@
 from parsers import improved_df_parsing
 
 from datetime import datetime
+import dateparser
 import sys
 
 formatter = logging.Formatter(fmt='%(asctime)s %(levelname)-8s %(message)s',
@@ -382,7 +383,8 @@ def sanitize_year(year_str):
 
     for fmt in date_formats:
         try:
-            date_time_obj = datetime.strptime(year_str, fmt)
+            #date_time_obj = datetime.strptime(year_str, fmt)
+            dateparser.parse(year_str)
             sanitized_year = year_str  # here we keep the original string
             break
         except ValueError: