nearly have resource update of Questions working :-)

Author: barny

elmclient/_rm.py

@@ -1079,34 +1079,37 @@ def _load_type_from_resource_shape(self, el, supershape=None):
             if property_title_x is None:
                 burp
             property_title = property_title_x.text
-#            print( f"Loading {property_title}" )
+            print( f"Loading prop {property_title}" )
 #            propuri = rdfxml.xml_find_element( el, 'oslc:propertyDefinition').get( "{%s}resource" % rdfxml.RDF_DEFAULT_PREFIX["rdf"])
             propuri = rdfxml.xmlrdf_get_resource_uri( el, 'oslc:propertyDefinition')
-#            print( f"{propuri=}" )
+            print( f"{propuri=}" )
             # prefer range over valueType (doesn't nmatter for rm but does for qm which has both in a property definition)
             proptype = rdfxml.xmlrdf_get_resource_uri( el,'oslc:range' )
             if proptype is None:
                 proptype = rdfxml.xmlrdf_get_resource_uri(el,'oslc:valueType' ) 
-#            print( f"{proptype=}" )
+            print( f"{proptype=}" )
             # lookup the codec, if there is one
             propcodec = valueTypeToCodec.get( proptype )
-#            print( f"{propcodec=}" )
+            print( f"{propcodec=}" )
 
-            if self.is_known_property_uri( propuri ):
-                logger.debug( f"ALREADY KNOWN" )
-#                print( f"ALREADY KNOWN" )
-                continue
-                
             # work out if multivalued
             mvtext_x = rdfxml.xmlrdf_get_resource_uri( el, "oslc:occurs" )            
             isMultiValued = mvtext_x=="http://open-services.net/ns/core#Zero-or-many"
 #            print( f"{property_title} {isMultiValued=} {mvtext_x=}" )
+
+            self.register_property( property_title, propuri, isMultiValued=isMultiValued, shape_uri=uri, typeCodec=propcodec )
+
+            if self.is_known_property_uri( propuri ):
+                logger.debug( f"ALREADY KNOWN" )
+                print( f"ALREADY KNOWN" )
+                continue
+                
 
             # get the property definition
             # all links have a Reference oslc:representation
             # true links have         <oslc:range rdf:resource="http://open-services.net/ns/core#Resource"/>
             if rdfxml.xml_find_element( el, "oslc:representation[@rdf:resource='http://open-services.net/ns/core#Reference']") is not None and ( rdfxml.xml_find_element( el, "oslc:range[@rdf:resource='http://open-services.net/ns/core#Resource']" ) is not None or rdfxml.xml_find_element( el, "oslc:valueType[@rdf:resource='http://open-services.net/ns/core#Resource']" ) is not None):
-#                print( f"Ref {propuri=}" )
+                print( f"Ref {propuri=}" )
                 if propuri is not None:
 #                    print( f"Ref1 {propuri=}" )
                     if propcodec is None: # don't override if the codec is already set!
@@ -1127,15 +1130,15 @@ def _load_type_from_resource_shape(self, el, supershape=None):
 #                    print( f"Defining linktype {name}.{property_title} {propuri=} {uri=} +++++++++++++++++++++++++++++++++++++++" )
                     self.register_linktype( property_title, propuri, label, inverselabel=inverselabel, rdfuri=rdfuri, typeCodec=propcodec, isMultiValued=isMultiValued )
             if True:
-                logger.info( f"Defining property {name}.{property_title} {propuri=} +++++++++++++++++++++++++++++++++++++++" )
-#                print( f"Defining property {name}.{property_title} {propuri=} {uri=} +++++++++++++++++++++++++++++++++++++++" )
+                logger.info( f"Defining property {name}.{property_title} {propuri=}  {propcodec=} +++++++++++++++++++++++++++++++++++++++" )
+                print( f"Defining property {name}.{property_title} {propuri=} {uri=} {propcodec=} +++++++++++++++++++++++++++++++++++++++" )
 #            self.register_property(property_title,propuri, shape_uri=uri)
 
 #            if property_title=="Residual POHS":
 #                print( ET.tostring( el ) )
                 # need to work out the codec
 
-                self.register_property( property_title, propuri, isMultiValued=isMultiValued, shape_uri=uri )
+# too late                self.register_property( property_title, propuri, isMultiValued=isMultiValued, shape_uri=uri )
                 # load the attribute definitions
                 n += 1
                 for range_el in rdfxml.xml_find_elements(el, 'oslc:range'):

elmclient/_typesystem.py

@@ -179,6 +179,7 @@ def is_known_linktype_uri( self, uri ):
 
     def register_shape( self, shape_name, shape_uri, *, rdfuri=None, shape_formats=None ):
         logger.info( f"register_shape {shape_name=} {shape_uri=}" )
+        print( f"register_shape {shape_name=} {shape_uri=}" )
         shape_uri = self.normalise_uri( shape_uri)
         if shape_uri in self.shapes:
             raise Exception( f"Shape {shape_uri} already defined!" )
@@ -221,7 +222,7 @@ def is_known_property_uri( self, property_uri, *, raiseifnotfound=True ):
 #    def register_property( self, property_name, property_uri, *, property_value_type=None, shape_uri=None, altname = None, do_not_overwrite=True, property_definition_uri=None, isMultiValued=False, typeCodec=None ):
     def register_property( self, property_name, property_uri, *, shape_uri=None, property_value_type=None, altname = None, do_not_overwrite=True, property_definition_uri=None, isMultiValued=False, typeCodec=None ):
         logger.info( f"register_property {property_name=} {property_uri=} {isMultiValued=} {typeCodec=}" )
-#        print( f"register_property {property_name=} {property_uri=} {isMultiValued=} {typeCodec=}" )
+        print( f"register_property {property_name=} {property_uri=} {isMultiValued=} {typeCodec=}" )
         if property_uri in self.properties:
 #            print( f"Already defined {self.properties[property_uri]=}" )
 #            burp