Detect invalid timemap constructs

Author: mhucka

eprints2archives/services/timemap.py

@@ -9,6 +9,9 @@
 The license for OTMT at the time timemap.py was copied was the MIT license,
 https://github.com/oduwsdl/off-topic-memento-toolkit/blob/master/LICENSE.txt
 
+Since copying the original, I've made some alterations to this source code.
+The git history can be consulted to find out what the changes have been.
+
 Authors (original)
 ------------------
 
@@ -20,11 +23,9 @@
 Michael Hucka <mhucka@caltech.edu> -- Caltech Library
 '''
 
-from   copy import deepcopy
-from   datetime import datetime
-import requests
+from datetime import datetime
 
-from   ..exceptions import *
+from ..exceptions import CorruptedContent
 
 
 def timemap_as_dict(timemap_text, skip_errors = False):
@@ -45,6 +46,9 @@ def process_local_dict(local_dict, working_dict):
 
         for uri in local_dict:
 
+            if "rel" not in local_dict[uri]:
+                raise ValueError("Missing 'rel' element in timemap")
+
             relation = local_dict[uri]["rel"]
 
             if relation == "original":
@@ -94,7 +98,6 @@ def process_local_dict(local_dict, working_dict):
 
         return working_dict
 
-
     dict_timemap = {}
 
     # current_char = ""
@@ -160,9 +163,7 @@ def process_local_dict(local_dict, working_dict):
                 state = 3
             elif character == ',':
                 state = 0
-
                 process_local_dict(local_dict, dict_timemap)
-
             elif character == '"':
                 state = 5
             elif character.isspace():
@@ -193,7 +194,14 @@ def process_local_dict(local_dict, working_dict):
                 raise CorruptedContent(
                     "discovered unknown state while processing TimeMap")
 
-    process_local_dict(local_dict, dict_timemap)
+    try:
+        process_local_dict(local_dict, dict_timemap)
+    except Exception as ex:
+        if not skip_errors:
+            raise CorruptedContent(
+                "unexpected construction in timemap: " + str(ex))
+        else:
+            return dict()
 
     return dict_timemap