Merge branch 'testing' into prod-dev

parsing/FileParsers/FileParser.py

@@ -36,13 +36,13 @@ class FileParser:
         # First, check the split dates...
         date_to_parse = hyperdata.get('publication_date_to_parse', None)
         if date_to_parse is not None:
-            date_string = re.sub('\/+', '', date_to_parse)
+            date_string = re.sub(r'\/\/+', '', date_to_parse)
             hyperdata['publication' + "_date"] = dateutil.parser.parse(
                 date_string,
                 default=DEFAULT_DATE
             ).strftime("%Y-%m-%d %H:%M:%S")
 
-        else:
+        elif hyperdata.get('publication_year', None) is not None:
             prefixes = [key[:-5] for key in hyperdata.keys() if key[-5:] == "_year"]
             for prefix in prefixes:
                 date_string = hyperdata[prefix + "_year"]
@@ -65,6 +65,8 @@ class FileParser:
                     hyperdata[prefix + "_date"] = dateutil.parser.parse(date_string).strftime("%Y-%m-%d %H:%M:%S")
                 except:
                     pass
+        else:
+            hyperdata['publication_date'] = datetime.datetime.now()
 
         # ...then parse all the "date" fields, to parse it into separate elements
         prefixes = [key[:-5] for key in hyperdata.keys() if key[-5:] == "_date"]
@@ -81,6 +83,7 @@ class FileParser:
 
         # finally, return the transformed result!
         return hyperdata
+        print(hyperdata['publication_date'])
 
     def format_hyperdata_languages(self, hyperdata):
         """format the languages found in the hyperdata."""