Fix/anno mapper

CHANGELOG.md

@@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- mapping annotations now correctly extracts the id of the node to apply a new annotation to
+
 ## [0.3.1] - 2023-08-04
 
 ### Fixed

src/manipulator/map_annos.rs

@@ -19,36 +19,36 @@
 
 pub const MODULE_NAME: &str = "map_annotations";
 
 #[derive(Deserialize)]
 pub struct MapAnnos {
     rule_file: PathBuf,
 }
 
 impl Module for MapAnnos {
     fn module_name(&self) -> &str {
         MODULE_NAME
     }
 }
 
 impl Manipulator for MapAnnos {
     fn manipulate_corpus(
         &self,
         graph: &mut graphannis::AnnotationGraph,
         workflow_directory: &std::path::Path,
         tx: Option<crate::workflow::StatusSender>,
     ) -> Result<(), Box<dyn std::error::Error>> {
         let read_from_path = {
             let p = Path::new(&self.rule_file).to_path_buf();
             if p.is_relative() {
                 workflow_directory.join(p)
             } else {
                 p
             }
         };
         let mapping = read_config(read_from_path.as_path())?;
         self.run(graph, mapping, &tx)?;
         Ok(())
     }
 }
 
 impl MapAnnos {
@@ -77,7 +77,10 @@
                 graphannis::corpusstorage::ResultOrder::NotSorted,
             )?;
             for m in search_results {
-                let matching_nodes = m.split(' ').map(|s| s.to_string()).collect_vec();
+                let matching_nodes = m
+                    .split(' ')
+                    .filter_map(|s| s.rsplit("::").last())
+                    .collect_vec();
                 let target = rule.target - 1;
                 if let Some(node_name) = matching_nodes.get(target) {
                     update.add_event(UpdateEvent::AddNodeLabel {
@@ -86,7 +89,7 @@
                         anno_name: rule.name.to_string(),
                         anno_value: rule.value.to_string(),
                     })?;
                 }
             }
         }
         graph.apply_update(&mut update, |_| {})?;
@@ -94,11 +97,11 @@
     }
 }
 
 fn read_config(path: &Path) -> Result<Mapping, Box<dyn std::error::Error>> {
     let config_string = fs::read_to_string(path)?;
     let m: Mapping = toml::from_str(config_string.as_str())?;
     Ok(m)
 }
 
 #[derive(Deserialize)]
 struct Mapping {
@@ -235,14 +238,14 @@
         for (e_qname, g_qname) in e_name_iter.zip(g_name_iter) {
             assert_eq!(
                 e_qname, g_qname,
                 "Differing annotation keys between expected and generated graph: `{:?}` vs. `{:?}`",
                 e_qname, g_qname
             );
         }
         assert_eq!(
             e_anno_names.len(),
             g_anno_names.len(),
             "Expected graph and generated graph do not contain the same number of annotation keys."
         );
         let e_c_list = e_g
             .get_all_components(None, None)
@@ -257,9 +260,9 @@
         assert_eq!(
             e_c_list.len(),
             g_c_list.len(),
             "components expected:\n{:?};\ncomponents are:\n{:?}",
             &e_c_list,
             &g_c_list
         );
         for c in e_c_list {
             let candidates = g.get_all_components(Some(c.get_type()), Some(c.name.as_str()));