/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
#if HAVE_CONFIG_H
{
yaz_log(YLOG_LOG, "%s -> %s", pqf, wrbuf_cstr(w));
if (solr && !strcmp(wrbuf_cstr(w), solr))
- {
ret = 1;
+ else
+ {
+ yaz_log(YLOG_WARN, " expected: %s", solr ? solr : "null");
+ yaz_log(YLOG_WARN, " got: %s", wrbuf_cstr(w));
}
}
}
{
solr_transform_t ct = solr_transform_create();
+ YAZ_CHECK(compare(ct, "@or a @and b c", "a OR (b AND c)"));
YAZ_CHECK(compare(ct, "abc", "abc"));
YAZ_CHECK(compare(ct, "\"a b c\"", "\"a b c\""));
-#if 0
-/* Invalid PQF, so this will never work */
- YAZ_CHECK(compare(ct, "a b", "a b"));
-#endif
+ YAZ_CHECK(compare(ct, "\"\"", "\"\""));
YAZ_CHECK(compare(ct, "@not a b", "a AND NOT b"));
YAZ_CHECK(compare(ct, "@and @or a b c", "(a OR b) AND c"));
YAZ_CHECK(compare(ct, "@and a b", "a AND b"));
YAZ_CHECK(compare(ct, "@or a b", "a OR b"));
+ YAZ_CHECK(compare(ct, "@or a @and b c", "a OR (b AND c)"));
+ YAZ_CHECK(compare(ct, "@or @and a b @and c d", "(a AND b) OR (c AND d)"));
+ YAZ_CHECK(compare(ct, "@or @or a b @or c d", "(a OR b) OR (c OR d)"));
+ YAZ_CHECK(compare(ct, "@or @or @or a b @or c d @or e f", "((a OR b) OR (c OR d)) OR (e OR f)"));
+ YAZ_CHECK(compare(ct, "@and @and a b @and c d", "(a AND b) AND (c AND d)"));
YAZ_CHECK(compare(ct, "@attr 1=field abc", "field:abc"));
YAZ_CHECK(compare(ct, "@attr 1=field \"a b c\"", "field:\"a b c\""));
YAZ_CHECK(compare(ct, "@attr 1=4 abc", 0)); /* should fail */
/* Truncation */
YAZ_CHECK(compare(ct, "@attr 5=1 water", "water*"));
- YAZ_CHECK(compare(ct, "@attr 5=r water", "water*"));
-/* YAZ_CHECK(compare(ct, "@attr t=r water", "water*")); */
-
YAZ_CHECK(compare(ct, "@attr 5=2 water", "*water"));
-
YAZ_CHECK(compare(ct, "@attr 5=3 water", "*water*"));
-
- /*
- YAZ_CHECK(compare(ct, "@or @attr 1=1016 water @attr 7=1 @attr 1=4 0", "any:water rank:??");
- */
+ YAZ_CHECK(compare(ct, "@attr 5=100 water", "water"));
+ YAZ_CHECK(compare(ct, "@attr 5=101 water", 0));
+ YAZ_CHECK(compare(ct, "@attr 5=104 w#ter", "w?ter"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 w#t?r", "w?t*r"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 w#te?", "w?te*"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 w\\#te?", "w?te*")); /* PQF eats # */
+ YAZ_CHECK(compare(ct, "@attr 5=104 w\\\\#te?", "w#te*"));
+
+ /* reserved characters */
+ YAZ_CHECK(compare(ct, "@attr 5=104 \\\"\\\\\\\\",
+ "\\\"" "\\\\"));
+ YAZ_CHECK(compare(ct, "@attr 5=104 \\\"\\\\\\\\\\\"",
+ "\\\"" "\\\\" "\\\""));
+ YAZ_CHECK(compare(ct, "@attr 5=104 \\\"\\\\", "\\\"\\\\"));
+
+ YAZ_CHECK(compare(ct, "@attr 5=104 \\{:\\}", "\\{\\:\\}"));
+
+ YAZ_CHECK(compare(ct, "@attr 5=104 \\\"\\\\\\\\\\\"",
+ "\\\"" "\\\\" "\\\""));
+
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=1 1980", "date:[* TO 1980}"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=2 1980", "date:[* TO 1980]"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=3 1980", "date:1980"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=4 1980", "date:[1980 TO *]"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=5 1980", "date:{1980 TO *]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=2 234 @attr 1=date @attr 2=4 1990", "date:[1990 TO 234]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=2 345 @attr 1=date @attr 2=4 234", "date:[234 TO 345]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=5 234 @attr 1=titl @attr 2=2 1990", "date:{234 TO *] AND titl:[* TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=5 234 @attr 1=date @attr 2=2 1990", "date:{234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=4 234 @attr 1=date @attr 2=2 1990", "date:[234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=5 234 @attr 1=date @attr 2=1 1990", "date:{234 TO 1990}"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=4 234 @attr 1=date @attr 2=2 1990", "date:[234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@or @attr 1=date @attr 2=4 234 @attr 1=date @attr 2=2 1990", "date:[234 TO *] OR date:[* TO 1990]"));
+ YAZ_CHECK(compare(ct, "@or @attr 1=date @attr 2=2 234 @attr 1=date @attr 2=4 1990", "date:[* TO 234] OR date:[1990 TO *]"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=1 1980", "date:[* TO 1980}"));
+ YAZ_CHECK(compare(ct, "@attr 1=date @attr 2=2 1980", "date:[* TO 1980]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=date @attr 2=2 234 @attr 1=date @attr 2=4 1990", "date:[1990 TO 234]"));
solr_transform_close(ct);
}
wrbuf_puts(w, "/");
}
wrbuf_puts(w, "../etc/pqf.properties");
-
+
ct = solr_transform_open_fname(wrbuf_cstr(w));
YAZ_CHECK(compare(ct, "@attr 1=4 abc", "dc.title:abc"));
#if 0
YAZ_CHECK(compare(ct, "@attr 1=4 @attr 3=1 @attr 6=1 abc", "dc.title:abc"));
YAZ_CHECK(compare(ct, "@attr 1=4 @attr 4=1 @attr 6=1 abc", "dc.title:abc"));
-#if 0
+
YAZ_CHECK(compare(ct, "@attr 1=1016 abc", "abc"));
- YAZ_CHECK(compare(ct, "@attr 2=1 @attr 1=30 1980", "dc.date:[* to 1980]"));
+ /* Date check */
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=1 1980", "dc.date:[* TO 1980}"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=2 1980", "dc.date:[* TO 1980]"));
YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=3 1980", "dc.date:1980"));
- YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 1980", "dc.date:[* to 1980]"));
- YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=2 1980", "dc.date:[* to 1980]"));
- YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=4 1980", "dc.date:[1980 to *]"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=4 1980", "dc.date:[1980 TO *]"));
+ YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 1980", "dc.date:{1980 TO *]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=2 234 @attr 1=30 @attr 2=4 1990", "dc.date:[1990 TO 234]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=2 345 @attr 1=30 @attr 2=4 234", "dc.date:[234 TO 345]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=5 234 @attr 1=4 @attr 2=2 1990", "dc.date:{234 TO *] AND dc.title:[* TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=5 234 @attr 1=30 @attr 2=2 1990", "dc.date:{234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=4 234 @attr 1=30 @attr 2=2 1990", "dc.date:[234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=5 234 @attr 1=30 @attr 2=1 1990", "dc.date:{234 TO 1990}"));
+ YAZ_CHECK(compare(ct, "@and @attr 1=30 @attr 2=4 234 @attr 1=30 @attr 2=2 1990", "dc.date:[234 TO 1990]"));
+ YAZ_CHECK(compare(ct, "@or @attr 1=30 @attr 2=4 234 @attr 1=30 @attr 2=2 1990", "dc.date:[234 TO *] OR dc.date:[* TO 1990]"));
+ YAZ_CHECK(compare(ct, "@or @attr 1=30 @attr 2=2 234 @attr 1=30 @attr 2=4 1990", "dc.date:[* TO 234] OR dc.date:[1990 TO *]"));
+#if 0
YAZ_CHECK(compare(ct, "@attr 2=103 @attr 1=_ALLRECORDS 1", "solr.allRecords=1"));
#endif
YAZ_CHECK(compare(ct, "@attr 1=500 abc", 0));