Fix 'match in context' export for corpora without any coverage compon…

…ents

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased] - (release date)
 
+### Fixed
+
+- "Match in context" columns are now produced correctly even for corpora without any coverage components.
+
 ## [1.1.0] - 2024-07-13
 
 ### Added

README.md

@@ -97,13 +97,13 @@ The following types of columns are available:
 
    Metadata of the corpus or document containing the match.
 
-   "Corpus" here refers to one of the items selected on the lower left. You can select the desired meta annotation from a dropdown. Special Annis-internal annotations are grouped under a separate "Annis" section at the bottom of the list, the others are specific to the selected corpora.
+   "Corpus" here refers to one of the items selected on the lower left. You can select the desired meta annotation from a dropdown. Annis standard annotations are grouped under a separate "Annis" section at the bottom of the list, the others are specific to the selected corpora.
 
 3. **Match annotation**
 
    An annotation of one of the nodes matched by the query.
 
-   You can select the annotation from a dropdown. Special Annis-internal annotations are grouped under a separate "Annis" section at the bottom of the list, the others are specific to the selected corpora. Note that this contains all available annotations of the selected corpora, even the ones that are also listed as meta annotations for "Corpus metadata" or "Document metadata" columns.
+   You can select the annotation from a dropdown. Annis standard annotations are grouped under a separate "Annis" section at the bottom of the list, the others are specific to the selected corpora. Note that this contains all available annotations of the selected corpora, even the ones that are also listed as meta annotations for "Corpus metadata" or "Document metadata" columns.
 
    You also have to select for which node of the query the annotation should be exported, in case the query refers to multiple nodes.
 

annimate_core/src/query.rs

@@ -806,9 +806,13 @@ impl<'a> GraphHelper<'a> {
         source: NodeID,
         target: NodeID,
     ) -> Result<bool, GraphAnnisCoreError> {
+        if source == target {
+            return Ok(true);
+        }
+
         self.coverage_storages
             .iter()
-            .map(|gs| gs.is_connected(source, target, 0, Bound::Included(1)))
+            .map(|gs| gs.is_connected(source, target, 1, Bound::Included(1)))
             .fold_ok(false, |a, b| a || b)
     }
 

annimate_core/tests/data/README.md

@@ -3,6 +3,9 @@
 - `empty_graphml.zip`
   - Name: empty
   - Source: generated using graphANNIS, consists only of a corpus node
+- `nocoverage.demo_graphml.zip`
+  - Name: nocoverage.demo
+  - Source: generated using graphANNIS, consists of text "There is no coverage." and has no coverage components
 - `pcc2_v7_relANNIS.zip`
   - Name: pcc2 (Potsdam Commentary Corpus 2)
   - Source: <https://corpus-tools.org/corpora/pcc2_v7_relANNIS.zip>

annimate_core/tests/export_matches.rs

@@ -360,6 +360,21 @@ export_matches_test! {
             })),
         ],
     }
+    nocoverage: {
+        corpus_paths: ["nocoverage.demo_graphml.zip"],
+        corpus_names: ["nocoverage.demo"],
+        aql_query: "tok=\"no\"",
+        query_language: AQL,
+        export_columns: [
+            Number,
+            Data(Text(TestExportDataText {
+                left_context: 2,
+                right_context: 2,
+                segmentation: None,
+                primary_node_indices: None,
+            })),
+        ],
+    }
 }
 
 #[test]

annimate_core/tests/snapshots/export_matches__nocoverage.snap

@@ -0,0 +1,20 @@
+---
+source: annimate_core/tests/export_matches.rs
+info:
+  corpus_paths:
+    - nocoverage.demo_graphml.zip
+  corpus_names:
+    - nocoverage.demo
+  aql_query: "tok=\"no\""
+  query_language: AQL
+  export_columns:
+    - Number
+    - Data:
+        Text:
+          left_context: 2
+          right_context: 2
+          segmentation: ~
+          primary_node_indices: ~
+---
+Number,Left context (tokens),Match (tokens),Right context (tokens)
+1,There is,no,coverage .

release.json

@@ -1,3 +1,3 @@
 {
-  "versionBump": "none"
+  "versionBump": "patch"
 }