Only add IRI with mapping to AdditionalConceptFeatures

completes work on #241
nfdi4cat · Jan 25, 2025 · 60ddd87 · 60ddd87
1 parent 371e5e7
commit 60ddd87
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 40 deletions.
diff --git a/src/voc4cat/convert.py b/src/voc4cat/convert.py
@@ -173,7 +173,7 @@ def rdf_to_excel(
     file_to_convert_path: Path,
     output_file_path: Path | None = None,
     template_file_path: Path | None = None,
-) -> None:
+) -> Path:
     if not file_to_convert_path.name.endswith(tuple(RDF_FILE_ENDINGS.keys())):
         msg = "Files for conversion to Excel must end with one of the RDF file formats: '{}'".format(
             "', '".join(RDF_FILE_ENDINGS.keys())
@@ -254,7 +254,7 @@ def rdf_to_excel(
     for s, o in g.subject_objects(SKOS.broader):
         g.add((o, SKOS.narrower, s))
 
-    row_no_features, row_no_concepts = 3, 3
+    row_no_concepts, row_no_features = 3, 3
     for s in g.subjects(RDF.type, SKOS.Concept):
         holder = {
             "uri": str(s),
@@ -319,8 +319,19 @@ def rdf_to_excel(
             narrow_match=holder["narrow_match"],
             broad_match=holder["broad_match"],
             vocab_name=vocab_name,
-        ).to_excel(wb, row_no_features, row_no_concepts)
-        row_no_features += 1
+        ).to_excel(wb, row_no_concepts, row_no_features)
+        row_no_concepts += 1
+        # only go to next row in "Additional Concepts Features" if there are any mappings
+        if any(
+            [
+                holder["related_match"],
+                holder["close_match"],
+                holder["exact_match"],
+                holder["narrow_match"],
+                holder["broad_match"],
+            ]
+            ):
+            row_no_features += 1
 
     row_no = 3
 

diff --git a/src/voc4cat/models.py b/src/voc4cat/models.py
@@ -375,7 +375,7 @@ def to_graph(self):
 
         return g
 
-    def to_excel(self, wb: Workbook, row_no_features: int, row_no_concepts: int):
+    def to_excel(self, wb: Workbook, row_no_concepts: int, row_no_features: int) -> int:
         """ "
         Export Concept to Excel using one row per language
 
@@ -433,41 +433,42 @@ def to_excel(self, wb: Workbook, row_no_features: int, row_no_concepts: int):
             )
             row_no_concepts += 1
 
-        ws = wb["Additional Concept Features"]
-
-        ws[f"A{row_no_features}"] = config.curies_converter.compress(
-            self.uri, passthrough=True
-        )
-        ws[f"B{row_no_features}"] = ",\n".join(
-            [
-                config.curies_converter.compress(uri, passthrough=True)
-                for uri in self.related_match
-            ]
-        )
-        ws[f"C{row_no_features}"] = ",\n".join(
-            [
-                config.curies_converter.compress(uri, passthrough=True)
-                for uri in self.close_match
-            ]
-        )
-        ws[f"D{row_no_features}"] = ",\n".join(
-            [
-                config.curies_converter.compress(uri, passthrough=True)
-                for uri in self.exact_match
-            ]
-        )
-        ws[f"E{row_no_features}"] = ",\n".join(
-            [
-                config.curies_converter.compress(uri, passthrough=True)
-                for uri in self.narrow_match
-            ]
-        )
-        ws[f"F{row_no_features}"] = ",\n".join(
-            [
-                config.curies_converter.compress(uri, passthrough=True)
-                for uri in self.broad_match
-            ]
-        )
+        # Fill Additional Concept Features sheet
+        if any([self.related_match, self.close_match, self.exact_match, self.narrow_match, self.broad_match]):
+            ws = wb["Additional Concept Features"]
+            ws[f"A{row_no_features}"] = config.curies_converter.compress(
+                self.uri, passthrough=True
+            )
+            ws[f"B{row_no_features}"] = ",\n".join(
+                [
+                    config.curies_converter.compress(uri, passthrough=True)
+                    for uri in self.related_match
+                ]
+            )
+            ws[f"C{row_no_features}"] = ",\n".join(
+                [
+                    config.curies_converter.compress(uri, passthrough=True)
+                    for uri in self.close_match
+                ]
+            )
+            ws[f"D{row_no_features}"] = ",\n".join(
+                [
+                    config.curies_converter.compress(uri, passthrough=True)
+                    for uri in self.exact_match
+                ]
+            )
+            ws[f"E{row_no_features}"] = ",\n".join(
+                [
+                    config.curies_converter.compress(uri, passthrough=True)
+                    for uri in self.narrow_match
+                ]
+            )
+            ws[f"F{row_no_features}"] = ",\n".join(
+                [
+                    config.curies_converter.compress(uri, passthrough=True)
+                    for uri in self.broad_match
+                ]
+            )
 
         return row_no_concepts