projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CQL sortby; conversion to XML done.
[yaz-moved-to-github.git]
/
test
/
test_ccl.c
diff --git
a/test/test_ccl.c
b/test/test_ccl.c
index
dada1e0
..
ea8a63d
100644
(file)
--- a/
test/test_ccl.c
+++ b/
test/test_ccl.c
@@
-1,9
+1,10
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
-/* CCL test */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <string.h>
#include <yaz/ccl_xml.h>
#include <string.h>
#include <yaz/ccl_xml.h>
@@
-165,6
+166,11
@@
void tst1(int pass)
}
YAZ_CHECK(tst_ccl_query(bibset, "x1", "@attr 4=2 @attr 1=1016 x1 "));
}
YAZ_CHECK(tst_ccl_query(bibset, "x1", "@attr 4=2 @attr 1=1016 x1 "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "k\xc3\xb8" "benhavn", "@attr 4=2 @attr 1=1016 k\xc3\xb8" "benhavn "));
+
+ YAZ_CHECK(tst_ccl_query(bibset, "k\xf8" "benhavn", "@attr 4=2 @attr 1=1016 ""k\xf8" "benhavn "));
+
YAZ_CHECK(tst_ccl_query(bibset, "(((((x1)))))", "@attr 4=2 @attr 1=1016 x1 "));
YAZ_CHECK(tst_ccl_query(bibset, "x1 and x2",
"@and "
YAZ_CHECK(tst_ccl_query(bibset, "(((((x1)))))", "@attr 4=2 @attr 1=1016 x1 "));
YAZ_CHECK(tst_ccl_query(bibset, "x1 and x2",
"@and "
@@
-241,18
+247,10
@@
void tst1(int pass)
"@or @attr 4=2 @attr 1=1016 a "
"@attr 1=/my/title a "));
"@or @attr 4=2 @attr 1=1016 a "
"@attr 1=/my/title a "));
- /* Bug #2895 */
-#if 1
- YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
- /* incorrect. */
- "@and @attr 4=2 @attr 1=1016 a? "
- "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
-#else
YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
/* correct */
"@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
"@attr 5=1 @attr 4=2 @attr 1=1016 b "));
YAZ_CHECK(tst_ccl_query(bibset, "a? b?",
/* correct */
"@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
"@attr 5=1 @attr 4=2 @attr 1=1016 b "));
-#endif
ccl_qual_rm(&bibset);
}
ccl_qual_rm(&bibset);
}