fix: fix import ontology from salsah-export (DSP-1532)

knora/dsplib/models/helpers.py

@@ -397,7 +397,6 @@ def reduce_iri(self, iristr: str, ontoname: Optional[str] = None) -> str:
         knora_api = self.prefix_from_iri("http://api.knora.org/ontology/knora-api/v2#")
         salsah_gui = self.prefix_from_iri("http://api.knora.org/ontology/salsah-gui/v2#")
 
-        #if self.__is_iri(iristr):
         if IriTest.test(iristr):
             iristr = self.get_prefixed_iri(iristr)
         tmp = iristr.split(':')

knora/dsplib/models/langstring.py

@@ -193,15 +193,16 @@ def toJsonObj(self):
         if self._simplestring is not None:
             return self._simplestring
         else:
-            return list(map(lambda a: {'language': a[0].value, 'value': a[1]}, self._langstrs.items()))
+            return list(map(lambda a: {'language': a[0].value, 'value': a[1] if a[1] else "-"}, self._langstrs.items()))
 
     def toJsonLdObj(self):
         if self.isEmpty():
             return None
         if self._simplestring is not None:
             return self._simplestring
         else:
-            return list(map(lambda a: {'@language': a[0].value, '@value': a[1]}, self._langstrs.items()))
+            return [{'@language': a[0].value, '@value': a[1]} for a in self._langstrs.items()]
+            #return list(map(lambda a: {'@language': a[0].value, '@value': a[1]}, self._langstrs.items()))
 
     @classmethod
     def fromJsonLdObj(cls, obj: Optional[Union[List[Dict[str, str]], str]]) -> 'LangString':

knora/dsplib/models/propertyclass.py

@@ -311,7 +311,8 @@ def resolve_propref(resref: str):
             tmp = resref.split(':')
             if len(tmp) > 1:
                 if tmp[0]:
-                    return {"@id": resref}  # fully qualified name in the form "prefix:name"
+#                    return {"@id": resref}  # fully qualified name in the form "prefix:name"
+                    return {"@id": self._context.get_qualified_iri(resref)}  # fully qualified name in the form "prefix:name"
                 else:
                     return {"@id": self._context.prefix_from_iri(self._ontology_id) + ':' + tmp[1]}  # ":name" in current ontology
             else:

knora/dsplib/utils/knora-schema.json

@@ -329,7 +329,7 @@
             },
             "width": {
               "type": "string",
-              "pattern": "^[0-9]*%$"
+              "pattern": "^[0-9]*%?$"
             },
             "wrap": {
               "type": "string",