fix #321 (negated metadata queries don't work any longer)

korpling · May 14, 2014 · 6e6c130 · 6e6c130
1 parent acee1e4
commit 6e6c130
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/annis-service/src/main/antlr4/annis/ql/AqlParser.g4 b/annis-service/src/main/antlr4/annis/ql/AqlParser.g4
@@ -142,7 +142,7 @@ expr
   | variableExpr # VariableTermExpr
 	|	unary_linguistic_term # UnaryTermExpr
 	|	n_ary_linguistic_term #  BinaryTermExpr
-  | META DOUBLECOLON id=qName op=EQ txt=textSpec # MetaTermExpr 
+  | META DOUBLECOLON id=qName op=(EQ|NEQ) txt=textSpec # MetaTermExpr 
   ;
 
 andTopExpr

diff --git a/annis-service/src/main/java/annis/ql/parser/QueryNodeListener.java b/annis-service/src/main/java/annis/ql/parser/QueryNodeListener.java
@@ -162,7 +162,7 @@ public void enterMetaTermExpr(AqlParser.MetaTermExprContext ctx)
       null : ctx.id.namespace.getText();
     String name = ctx.id.name.getText();
     String value = textFromSpec(ctx.txt);
-    QueryNode.TextMatching textMatching = textMatchingFromSpec(ctx.txt, false);
+    QueryNode.TextMatching textMatching = textMatchingFromSpec(ctx.txt, ctx.NEQ() != null);
 
     QueryAnnotation anno = new QueryAnnotation(namespace,
       name, value, textMatching);

diff --git a/annis-service/src/test/java/annis/CountTest.java b/annis-service/src/test/java/annis/CountTest.java
@@ -131,6 +131,8 @@ public void testAQLTestSuitePcc2()
     assertEquals(2, countPcc2("cat=\"CS\" >[func=\"CJ\"] cat=\"S\" > \"was\""));
     assertEquals(1, countPcc2("cat=\"CS\" >[func=\"CJ\"] cat=\"S\" >secedge \"was\""));
     assertEquals(1, countPcc2("pos=/V.FIN/ ->dep[func=\"sbj\"] \"Jugendliche\" & cat=\"S\" & #3 >secedge #2 | \"ja\""));
+    assertEquals(187, countPcc2("tok & meta::Titel=\"Steilpass\""));
+    assertEquals(212, countPcc2("tok & meta::Titel!=\"Steilpass\""));
 
   }
 

diff --git a/annis-service/src/test/java/annis/ql/parser/TestAnnisParser-examples.xml b/annis-service/src/test/java/annis/ql/parser/TestAnnisParser-examples.xml
@@ -100,6 +100,7 @@
     <value><![CDATA[pos!=//]]></value>
     <value><![CDATA[tok !=""]]></value>
     <value><![CDATA[tok!=//]]></value>
+    <value><![CDATA[tok & meta::Titel!="Steilpass"]]></value>
 	</util:list>
 
 	<util:list id="bad">