Merge pull request #308 from matthias-stemmler/bugfix/meta-query-multiple-alternatives

Fix regression parsing legacy meta queries with multiple alternatives

Author: thomaskrause

graphannis/src/annis/db/aql/mod.rs

@@ -499,7 +499,7 @@ pub fn parse(query_as_aql: &str, quirks_mode: bool) -> Result<Disjunction> {
 
                 if quirks_mode {
                     // apply the meta constraints to first node of all conjunctions
-                    let first_node_var = mapped.get_variable_by_node_nr(0);
+                    let first_node_var = mapped.get_variable_by_node_nr(var_idx_offset);
                     add_legacy_metadata_constraints(
                         &mut mapped,
                         legacy_meta_search.clone(),

graphannis/tests/searchtest.rs

@@ -388,3 +388,21 @@ fn no_error_on_large_token_distance() {
 
     assert_eq!(0, result.len());
 }
+
+#[ignore]
+#[test]
+fn legacy_meta_query_with_multiple_alternatives() {
+    let cs = CORPUS_STORAGE.as_ref().unwrap();
+
+    // "buy" and "favorite" each appear exactly once in type="interview" and once in type="news"
+    let query = SearchQuery {
+        corpus_names: &["GUM"],
+        query: "\"buy\" | \"favorite\" & meta::type=\"interview\"",
+        query_language: QueryLanguage::AQLQuirksV3,
+        timeout: None,
+    };
+
+    let count = cs.count(query).unwrap();
+
+    assert_eq!(count, 2);
+}