Add test case for relANNIS not 3.3 but with a visibility column

Author: thomaskrause

graphannis/src/annis/db/relannis.rs

@@ -489,8 +489,10 @@ where
     for result in resolver_tab_csv.records() {
         let line = result?;
 
-        let order_col = if is_annis_33 || line.len() == 9 { 7 } else { 6 };
-        let mapping_col = if is_annis_33 || line.len() == 9 { 8 } else { 7 };
+        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 =
@@ -502,10 +504,10 @@ 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 = if line.len() < 7 {
-            "hidden".into()
-        } else {
+        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)?

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

@@ -114,6 +114,31 @@ 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 parse_virtual_tokenization_mapping() {
     let parent = create_temporary_corpus_dir_file(