--- a/tests/langparser1/langparser1.txt
+++ b/tests/langparser1/langparser1.txt
@@ -1,27 +1,27 @@
- Query: A -> Recoll query: (a:(wqf=11))
- Query: A B -> Recoll query: ((a:(wqf=11) AND b:(wqf=11)))
- Query: A AND B -> Recoll query: ((a:(wqf=11) AND b:(wqf=11)))
- Query: A OR B -> Recoll query: ((a:(wqf=11) OR b:(wqf=11)))
- Query: A OR B AND C -> Recoll query: (((a:(wqf=11) OR b:(wqf=11)) AND c:(wqf=11)))
- Query: A AND B OR C -> Recoll query: ((a:(wqf=11) AND (b:(wqf=11) OR c:(wqf=11))))
- Query: (A AND B) OR (C AND D) -> Recoll query: (((a:(wqf=11) AND b:(wqf=11)) OR (c:(wqf=11) AND d:(wqf=11))))
- Query: (A OR B) AND (C OR D) -> Recoll query: (((a:(wqf=11) OR b:(wqf=11)) AND (c:(wqf=11) OR d:(wqf=11))))
- Query: -the B -> Recoll query: (((<alldocuments> AND_NOT the:(wqf=11)) AND b:(wqf=11)))
- Query: A -B -> Recoll query: ((a:(wqf=11) AND (<alldocuments> AND_NOT b:(wqf=11))))
- Query: mime:text/plain -> Recoll query: ((<alldocuments> FILTER Ttext/plain))
- Query: size>10k -> Recoll query: ((<alldocuments> FILTER VALUE_GE 2 000000010000))
- Query: date:3000-01-01 -> Recoll query: ((<alldocuments> FILTER D30000101))
- Query: mime:text/plain A OR B mime:text/html -> Recoll query: (((a:(wqf=11) OR b:(wqf=11)) FILTER (Ttext/html OR Ttext/plain)))
- Query: mime:text/plain A AND B mime:text/html -> Recoll query: (((a:(wqf=11) AND b:(wqf=11)) FILTER (Ttext/html OR Ttext/plain)))
- Query: mime:text/plain mime:text/html (A B) -> Recoll query: (((a:(wqf=11) AND b:(wqf=11)) FILTER (Ttext/html OR Ttext/plain)))
- Query: mime:text/plain OR mime:text/html OR (A B) -> Recoll query: (((a:(wqf=11) AND b:(wqf=11)) FILTER (Ttext/html OR Ttext/plain)))
- Query: rclcat:media A -> Recoll query: ((a:(wqf=11) FILTER (Tapplication/ogg OR Tapplication/x-flac OR Taudio/mpeg OR Taudio/x-karaoke OR Timage/bmp OR Timage/gif OR Timage/jpeg OR Timage/png OR Timage/svg+xml OR Timage/tiff OR Timage/vnd.djvu OR Timage/x-icon OR Timage/x-xcf OR Timage/x-xpmi OR Tvideo/*)))
- Query: rclcat:media rclcat:message A -> Recoll query: ((a:(wqf=11) FILTER (Tapplication/ogg OR Tapplication/x-flac OR Taudio/mpeg OR Taudio/x-karaoke OR Timage/bmp OR Timage/gif OR Timage/jpeg OR Timage/png OR Timage/svg+xml OR Timage/tiff OR Timage/vnd.djvu OR Timage/x-icon OR Timage/x-xcf OR Timage/x-xpmi OR Tmessage/rfc822 OR Ttext/x-gaim-log OR Ttext/x-mail OR Ttext/x-purple-html-log OR Ttext/x-purple-log OR Tvideo/*)))
- Query: A size>10k -> Recoll query: ((a:(wqf=11) FILTER VALUE_GE 2 000000010000))
- Query: size>10k A -> Recoll query: ((a:(wqf=11) FILTER VALUE_GE 2 000000010000))
- Query: date:3000-01-01 A -> Recoll query: ((a:(wqf=11) FILTER D30000101))
- Query: A OR B date:3000-01-01 -> Recoll query: (((a:(wqf=11) OR b:(wqf=11)) FILTER D30000101))
- Query: A OR B AND date:3000-01-01 -> Recoll query: (((a:(wqf=11) OR b:(wqf=11)) FILTER D30000101))
- Query: title:A B -> Recoll query: ((Sa:(wqf=11) AND b:(wqf=11)))
- Query: title:A -B -> Recoll query: ((Sa:(wqf=11) AND (<alldocuments> AND_NOT b:(wqf=11))))
- Query: A -title:B -> Recoll query: ((a:(wqf=11) AND (<alldocuments> AND_NOT Sb:(wqf=11))))
+ Query: A -> Recoll query: Query((a OR a#10))
+ Query: A B -> Recoll query: Query(((a OR a#10) AND (b OR b#10)))
+ Query: A AND B -> Recoll query: Query(((a OR a#10) AND (b OR b#10)))
+ Query: A OR B -> Recoll query: Query(((a OR a#10) OR (b OR b#10)))
+ Query: A OR B AND C -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) AND (c OR c#10)))
+ Query: A AND B OR C -> Recoll query: Query(((a OR a#10) AND ((b OR b#10) OR (c OR c#10))))
+ Query: (A AND B) OR (C AND D) -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) OR ((c OR c#10) AND (d OR d#10))))
+ Query: (A OR B) AND (C OR D) -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) AND ((c OR c#10) OR (d OR d#10))))
+ Query: -the B -> Recoll query: Query(((<alldocuments> AND_NOT (the OR the#10)) AND (b OR b#10)))
+ Query: A -B -> Recoll query: Query(((a OR a#10) AND (<alldocuments> AND_NOT (b OR b#10))))
+ Query: mime:text/plain -> Recoll query: Query((<alldocuments> FILTER Ttext/plain))
+ Query: size>10k -> Recoll query: Query((<alldocuments> FILTER VALUE_GE 2 000000010000))
+ Query: date:3000-01-01 -> Recoll query: Query((<alldocuments> FILTER D30000101))
+ Query: mime:text/plain A OR B mime:text/html -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
+ Query: mime:text/plain A AND B mime:text/html -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
+ Query: mime:text/plain mime:text/html (A B) -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
+ Query: mime:text/plain OR mime:text/html OR (A B) -> Recoll query: Query((((a OR a#10) AND (b OR b#10)) FILTER (Ttext/html OR Ttext/plain)))
+ Query: rclcat:media A -> Recoll query: Query(((a OR a#10) FILTER ((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tvideo/*)))
+ Query: rclcat:media rclcat:message A -> Recoll query: Query(((a OR a#10) FILTER (((((((((((((((((((Tapplication/ogg OR Tapplication/x-flac) OR Taudio/mpeg) OR Taudio/x-karaoke) OR Timage/bmp) OR Timage/gif) OR Timage/jpeg) OR Timage/png) OR Timage/svg+xml) OR Timage/tiff) OR Timage/vnd.djvu) OR Timage/x-icon) OR Timage/x-xcf) OR Timage/x-xpmi) OR Tmessage/rfc822) OR Ttext/x-gaim-log) OR Ttext/x-mail) OR Ttext/x-purple-html-log) OR Ttext/x-purple-log) OR Tvideo/*)))
+ Query: A size>10k -> Recoll query: Query(((a OR a#10) FILTER VALUE_GE 2 000000010000))
+ Query: size>10k A -> Recoll query: Query(((a OR a#10) FILTER VALUE_GE 2 000000010000))
+ Query: date:3000-01-01 A -> Recoll query: Query(((a OR a#10) FILTER D30000101))
+ Query: A OR B date:3000-01-01 -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER D30000101))
+ Query: A OR B AND date:3000-01-01 -> Recoll query: Query((((a OR a#10) OR (b OR b#10)) FILTER D30000101))
+ Query: title:A B -> Recoll query: Query(((Sa OR Sa#10) AND (b OR b#10)))
+ Query: title:A -B -> Recoll query: Query(((Sa OR Sa#10) AND (<alldocuments> AND_NOT (b OR b#10))))
+ Query: A -title:B -> Recoll query: Query(((a OR a#10) AND (<alldocuments> AND_NOT (Sb OR Sb#10))))