fixes

Author: situx

src/sparqlunicorn_ontdoc/doc/docutils.py

@@ -192,9 +192,9 @@ def resolveUnitValue(graph,obj,tuppredstr,tupobjstr,foundval,foundunit):
                 elif str(valtup[0]) in DocConfig.valueproperties and isinstance(valtup[1], Literal):
                     foundval = str(valtup[1])
                 elif str(valtup[0]) in DocConfig.strictvalueproperties and isinstance(valtup[1], URIRef):
-                    print("Valtup[1]: " + str(valtup[1]))
+                    #print("Valtup[1]: " + str(valtup[1]))
                     for tup2 in graph.predicate_objects(valtup[1]):
-                        print("Tup2: " + str(tup2))
+                        #print("Tup2: " + str(tup2))
                         if str(tup2[0]) in DocConfig.unitproperties:
                             foundunit = str(tup2[1])
                         elif str(tup2[0]) in DocConfig.valueproperties:

src/sparqlunicorn_ontdoc/export/data/htmlexporter.py

@@ -548,7 +548,9 @@ def searchObjectConnectionsForAggregateData(graph, object, pred, geojsonrep, fou
                 annosource = tupobjstr
                 #print("Found annosource " + tupobjstr + " from " + str(object) + " Imageannos: " + str(len(imageannos)))
             elif tuppredstr in DocConfig.valueproperties:
-                DocUtils.resolveUnitValue(graph,tup[1],tuppredstr,tupobjstr,foundval,foundunit)
+                res=DocUtils.resolveUnitValue(graph,tup[1],tuppredstr,tupobjstr,foundval,foundunit)
+                foundval=res[0]
+                foundunit=res[1]
                 """
                 if tempvalprop is None and tuppredstr == "http://www.w3.org/ns/oa#hasSource":
                     tempvalprop = tuppredstr

src/sparqlunicorn_ontdoc/export/pages/geometryviewpage.py

@@ -96,11 +96,11 @@ def generateCollectionWidget(self,graph,subject,templates,f,uritotreeitem,featur
                         elif isinstance(geoinstance[1],URIRef):
                             foundunit=None
                             foundval=None
-                            print("RESOLVE UNIT FROM: "+str(geoinstance[1]))
+                            #print("RESOLVE UNIT FROM: "+str(geoinstance[1]))
                             res=DocUtils.resolveUnitValue(graph,geoinstance[1],None,str(geoinstance[1]),foundunit,foundval)
                             foundval=res[0]
                             foundunit=res[1]
-                            print("FOUNDVAL: "+str(foundval)+" FOUNDUNIT: "+str(foundunit))
+                            #print("FOUNDVAL: "+str(foundval)+" FOUNDUNIT: "+str(foundunit))
                             if foundval is not None:
                                 properties[str(geoinstance[0])+".value"]=foundval
                             if foundunit is not None: