Improved error reporting and span type checking

marcusklang · Jun 12, 2020 · 9cd2b35 · 9cd2b35
1 parent 6dfbbf8
commit 9cd2b35
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/py/docria/model.py b/py/docria/model.py
@@ -736,7 +736,7 @@ class Text:
     def __init__(self, name, text):
         self.name = name
         self.text = text
-        self.spantype = DataType(DataTypeEnum.SPAN, context=self.name)
+        self.spantype = DataTypeTextspan(DataTypeEnum.SPAN, context=self.name)
 
     def __str__(self):
         """Convert to string"""
@@ -1349,8 +1349,12 @@ def validate(self, node: "Node")->bool:
                                 "field '%s' in layer '%s' for node %s" \
                                 % (fieldtype.options["layer"], field, self.name, repr(node))
                     elif fieldtype.typename == DataTypeEnum.SPAN:
+                        assert isinstance(fieldvalue, TextSpan), \
+                            "The span field '%s' was not set to a TextSpan, but: '%s'" % \
+                            (field, repr(fieldvalue))
+
                         assert fieldvalue.text.name == fieldtype.options["context"], \
-                            "Textspan does not match expceted context %s found %s: " \
+                            "Textspan does not match expected context %s found %s: " \
                             "field '%s' in layer '%s' for node %s" % \
                             (fieldtype.options["context"], fieldvalue.text.name, field, self.name, repr(node))
                     else: