fixed weblinks being truncated by oslcquery

Author: barny

elmclient/_project.py

@@ -353,23 +353,15 @@ def resolve_uri_to_name(self, uri, trytouseasid=False):
 #            print( f"2 {uri=} {result=}")
 
             if result is None:
-                if '#' in uri:
-                    result = uri.rsplit( "#",1)[1]
-                elif "/" in uri:
-                    result = uri.rsplit( "/",1)[1]
+                if uri.startswith( self.reluri("/") ) or rdfxml.startswith_known_prefix( uri ):
+                    if '#' in uri:
+                        result = uri.rsplit( "#",1)[1]
+                    elif "/" in uri:
+                        result = uri.rsplit( "/",1)[1]
+                    else:
+                        result = rdfxml.uri_to_default_prefixed_tag( uri )
                 else:
-                    result = rdfxml.uri_to_default_prefixed_tag( uri )
-#            print( f"3 {uri=} {result=}")
-#            # this is tentative code to allow another app to resolve the URI
-#            # the challenge is how to get the config (maybe only do this if GC was specified)
-#            # and how to get a project-like context to provide headers
-#            if result is None:
-#                # try to find another app that might resolve this
-#                otherapp = self.server.find_app_for_uri( uri )
-#                if otherapp is not None:
-#                    # check with the other app to get the name
-#                    result = otherapp.app_resolve_uri_to_name( uri )
-#                    print( f"rutn {result=}" )
+                    result = uri
         logger.debug( f"rutn {uri=} {result=}" )
         return result
 

elmclient/rdfxml.py

@@ -334,3 +334,12 @@ def remove_tag(s):
         s = s[s.find('}') + 1:]
     return s
 
+def startswith_known_prefix( uri, default_map=RDF_DEFAULT_PREFIX):
+    for prefix, prefixurl in default_map.items():
+#        print( f"{uri=} {prefix=} {prefixurl=}" )
+        if uri.startswith( prefixurl ):
+#            print( f"skp {uri=} True" )
+            return True
+#    print( f"skp {uri=} False" )
+    return False
+