Merge pull request #316 from korpling/intermediate-relannis-version

Support "mappings" column in intermediate relANNIS format

Author: thomaskrause

CHANGELOG.md

@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Correctly map the `mappings` column for older `resolver_vis_map.tab` files
+  that do have a `visibility` column.
+
 ## [3.7.0] - 2025-03-18
 
 ### Fixed

graphannis/src/annis/db/corpusstorage.rs

@@ -1232,7 +1232,7 @@ impl CorpusStorage {
     ///
     /// - `corpus_name` - The name of the corpus to write to the ZIP file.
     /// - `use_corpus_subdirectory` - If true, the corpus is written into a sub-directory inside the ZIP file.
-    ///                               This is useful when storing multiple corpora inside the same file.
+    ///   This is useful when storing multiple corpora inside the same file.
     /// - `zip` - A [writer](zip::ZipWriter)  for the already created ZIP file.
     /// - `progress_callback` - A callback function to which the export progress is reported to.
     pub fn export_to_zip<W, F>(

graphannis/src/annis/db/exec/nodesearch.rs

@@ -121,7 +121,7 @@ impl NodeSearchSpec {
             | NodeSearchSpec::NotExactTokenValue { .. }
             | NodeSearchSpec::RegexTokenValue { .. }
             | NodeSearchSpec::NotRegexTokenValue { .. }
-            | NodeSearchSpec::AnyToken { .. } => (
+            | NodeSearchSpec::AnyToken => (
                 Some(TOKEN_KEY.ns.clone().into()),
                 Some(TOKEN_KEY.name.clone().into()),
             ),

graphannis/src/annis/db/relannis.rs

@@ -484,15 +484,16 @@ where
     ));
 
     let mut resolver_tab_csv = postgresql_import_reader(resolver_tab_path.as_path())?;
-
     let mut rules_by_order: Vec<(i64, bool, VisualizerRule)> = DEFAULT_VISUALIZER_RULES.clone();
 
-    let order_col = if is_annis_33 { 7 } else { 6 };
-    let mapping_col = if is_annis_33 { 8 } else { 7 };
-
     for result in resolver_tab_csv.records() {
         let line = result?;
 
+        let has_visibility_column = is_annis_33 || line.len() == 9;
+
+        let order_col = if has_visibility_column { 7 } else { 6 };
+        let mapping_col = if has_visibility_column { 8 } else { 7 };
+
         let layer = get_field(&line, 2, "namespace", &resolver_tab_path)?.map(|l| l.to_string());
         let element =
             get_field(&line, 3, "element", &resolver_tab_path)?.and_then(|e| match e.as_ref() {
@@ -503,7 +504,11 @@ where
         let vis_type = get_field_not_null(&line, 4, "vis_type", &resolver_tab_path)?;
         let display_name = get_field_not_null(&line, 5, "display_name", &resolver_tab_path)?;
 
-        let visibility = get_field_not_null(&line, 6, "visibility", &resolver_tab_path)?;
+        let visibility = if has_visibility_column {
+            get_field_not_null(&line, 6, "visibility", &resolver_tab_path)?
+        } else {
+            "hidden".into()
+        };
 
         let order = get_field(&line, order_col, "order", &resolver_tab_path)?
             .map(|order| order.parse::<i64>().unwrap_or_default())

graphannis/src/annis/db/relannis/tests.rs

@@ -114,6 +114,54 @@ fn trim_resolver_mappings() {
     );
 }
 
+#[test]
+fn missing_visibility_column_in_resolver() {
+    let parent = create_temporary_corpus_dir_file(
+        r#"somecorpus	NULL	syntax	node	tree	syntax (tree)	1	test: true; anothertest:false
+somecorpus	NULL	NULL	NULL	discourse	document (text)	2	NULL"#,
+        "resolver_vis_map.tab",
+    );
+    let mut config = CorpusConfiguration::default();
+    load_resolver_vis_map(parent.path(), &mut config, false, &|_| {}).unwrap();
+
+    assert_eq!(8, config.visualizers.len());
+
+    let syntax_vis = &config.visualizers[1];
+    assert_eq!("syntax (tree)", syntax_vis.display_name);
+    assert_eq!(VisualizerVisibility::Hidden, syntax_vis.visibility);
+    assert_eq!(2, syntax_vis.mappings.len());
+    assert_eq!("true", syntax_vis.mappings.get("test").unwrap());
+    assert_eq!("false", syntax_vis.mappings.get("anothertest").unwrap());
+
+    let doc_vis = &config.visualizers[2];
+    assert_eq!("document (text)", doc_vis.display_name);
+    assert_eq!(VisualizerVisibility::Hidden, doc_vis.visibility);
+    assert_eq!(0, doc_vis.mappings.len());
+}
+
+#[test]
+fn old_resolver_with_visibility_column() {
+    let parent = create_temporary_corpus_dir_file(
+        r#"somecorpus	NULL	NULL	NULL	kwic	kwic	removed	0	NULL
+somecorpus	NULL	inline	node	grid	annos (grid)	visible	1	hide_tok: true; annos: learner, ZH1, ZH1Diff, ZH2, ZH2Diff"#,
+        "resolver_vis_map.tab",
+    );
+    let mut config = CorpusConfiguration::default();
+    load_resolver_vis_map(parent.path(), &mut config, false, &|_| {}).unwrap();
+
+    assert_eq!(6, config.visualizers.len());
+
+    let grid_vis = &config.visualizers[0];
+    assert_eq!("annos (grid)", grid_vis.display_name);
+    assert_eq!(VisualizerVisibility::Visible, grid_vis.visibility);
+    assert_eq!(2, grid_vis.mappings.len());
+    assert_eq!("true", grid_vis.mappings.get("hide_tok").unwrap());
+    assert_eq!(
+        "learner, ZH1, ZH1Diff, ZH2, ZH2Diff",
+        grid_vis.mappings.get("annos").unwrap()
+    );
+}
+
 #[test]
 fn parse_virtual_tokenization_mapping() {
     let parent = create_temporary_corpus_dir_file(