fixes

sparqlunicorn · Oct 7, 2024 · 101243d · 101243d
1 parent 05ae5cc
commit 101243d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tasks/query/data/querylayertask.py b/tasks/query/data/querylayertask.py
@@ -177,7 +177,7 @@ def processResults(self, results, reproject, mandatoryvars, geooptional):
                         item = result["item"]["value"]
                     if var == "rel" and "val" in result:
                         if "datatype" in result["val"]:
-                            properties[SPARQLUtils.labelFromURI(result["val"]["value"])]=LayerUtils.detectDataType(result["val"])
+                            properties[SPARQLUtils.labelFromURI(result[var]["value"])]=LayerUtils.detectDataType(result["val"])
                         elif self.shortenURIs:
                             properties[SPARQLUtils.labelFromURI(result[var]["value"])] = result["val"]["value"]
                         elif self.shortenURIs==1:
@@ -186,16 +186,16 @@ def processResults(self, results, reproject, mandatoryvars, geooptional):
                             properties[result[var]["value"]] = result["val"]["value"]
                     if var=="rel2" in result and "val2"!=self.triplestoreconf["typeproperty"] and "val2" in result:
                         if "datatype" in result["val2"]:
-                            properties[SPARQLUtils.labelFromURI(result["val2"]["value"])]=LayerUtils.detectDataType(result["val2"])
+                            properties[SPARQLUtils.labelFromURI(result[var]["value"])]=LayerUtils.detectDataType(result["val2"])
                         elif self.shortenURIs:
-                            properties["_"+SPARQLUtils.labelFromURI(result["rel2"]["value"])] = result["val2"]["value"]
+                            properties["_"+SPARQLUtils.labelFromURI(result[var]["value"])] = result["val2"]["value"]
                         elif self.shortenURIs==1:
-                            properties[SPARQLUtils.labelFromURI(result[var]["value"])] = SPARQLUtils.labelFromURI(result["val"]["value"])
+                            properties[SPARQLUtils.labelFromURI(result[var]["value"])] = SPARQLUtils.labelFromURI(result["val2"]["value"])
                         else:
                             properties["_"+result[var]["value"]] = result["val2"]["value"]
                     elif var != "val" and var!="val2":
                         if "datatype" in result[var]:
-                            properties[SPARQLUtils.labelFromURI(result[var]["value"])]=LayerUtils.detectDataType(result[var])
+                            properties[SPARQLUtils.labelFromURI(var)]=LayerUtils.detectDataType(result[var])
                         elif self.shortenURIs:
                             properties[SPARQLUtils.labelFromURI(var)] = result[var]["value"]
                         elif self.shortenURIs==1:

diff --git a/util/layerutils.py b/util/layerutils.py
@@ -50,16 +50,16 @@ def addFeatureToCorrectCollection(feature,features,nongeofeatures,crsset):
     def detectDataType(result):
         QgsMessageLog.logMessage('RESULT: ' + str(result)+" - "+str(type(result)),MESSAGE_CATEGORY, Qgis.Info)
         if isinstance(result, Literal):
-            QgsMessageLog.logMessage('RESULT DATATYPE WITH LITERAL: ' + str(result), MESSAGE_CATEGORY,
-                                     Qgis.Info)
+            #QgsMessageLog.logMessage('RESULT DATATYPE WITH LITERAL: ' + str(result), MESSAGE_CATEGORY,
+            #                         Qgis.Info)
             if str(result.datatype) in DocConfig.integertypes:
                 return int(str(result))
             if str(result.datatype) in DocConfig.floattypes:
                 return float(str(result))
             return str(result)
         elif "datatype" in result:
-            QgsMessageLog.logMessage('RESULT DATATYPE WITHOUT LITERAL: ' + str(result), MESSAGE_CATEGORY,
-                                     Qgis.Info)
+            #QgsMessageLog.logMessage('RESULT DATATYPE WITHOUT LITERAL: ' + str(result), MESSAGE_CATEGORY,
+            #                         Qgis.Info)
             if result["datatype"] in DocConfig.integertypes:
                 return int(result["value"])
             if result["datatype"] in DocConfig.floattypes: