fixes

sparqlunicorn · Mar 4, 2024 · e39959a · e39959a
1 parent cac9719
commit e39959a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/tasks/query/enrichment/enrichmentquerytask.py b/tasks/query/enrichment/enrichmentquerytask.py
@@ -151,9 +151,15 @@ def finished(self, result):
         for f in self.layer.getFeatures():
             if rowww >= self.resulttable.rowCount():
                 self.resulttable.insertRow(rowww)
-            if f[self.idfield] in self.resultmap:
-                QgsMessageLog.logMessage(str(f[self.idfield]) + " - " + str(self.resultmap[f[self.idfield]]),
-                                         MESSAGE_CATEGORY, Qgis.Info)
+            QgsMessageLog.logMessage(str(self.resultmap), MESSAGE_CATEGORY,
+                                     Qgis.Info)
+            fields=f.fields().names()
+            counter=0
+            for current, attr in enumerate(f.fields()):
+                value=f.attribute(f.fieldNameIndex(attr.name()))
+                #if f[self.idfield] in self.resultmap:
+                #QgsMessageLog.logMessage(str(f[self.idfield]) + " - " + str(self.resultmap[f[self.idfield]]),
+                #                        MESSAGE_CATEGORY, Qgis.Info)
                 if self.strategy == "Merge":
                     newitem = QTableWidgetItem(str(f[self.item]) + str(self.resultmap[f[self.idfield]]))
                 elif self.strategy == "Keep Local":
@@ -169,10 +175,11 @@ def finished(self, result):
                     else:
                         newitem = QTableWidgetItem(str(self.resultmap[f[self.idfield]]))
                 else:
-                    newitem = QTableWidgetItem(str(self.resultmap[f[self.idfield]]))
+                    newitem = QTableWidgetItem(str(value))
                 QgsMessageLog.logMessage(str(rowww) + " - " + str(self.row) + " - " + str(newitem), MESSAGE_CATEGORY,
                                          Qgis.Info)
-                self.resulttable.setItem(rowww, self.row, newitem)
+                self.resulttable.setItem(rowww, counter, newitem)
+                counter+=1
             rowww += 1
         self.layer.commitChanges()
         self.progress.close()
diff --git a/util/interlinkutils.py b/util/interlinkutils.py
@@ -13,7 +13,7 @@ class InterlinkUtils:
     idfieldnames=["ID","IDENTIFIER"]
     labelfieldnames=["NAME","TITLE","LABEL"]
     descriptorfieldnames = ["DESCRIPTION", "COMMENT", "REMARK", "DEFINITION", "CONTENT","ABSTRACT"]
-    subclassterms=["TYP","TYPE","SUB"]
+    subclassterms=["TYP","TYPE","SUB","CATEGORY"]
 
     @staticmethod
     def readXMLMappingToDict(filename):