Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

diff --git a/src/rpn2cql.c b/src/rpn2cql.c
index ea21793..b1063a1 100644 (file)
--- a/src/rpn2cql.c
+++ b/src/rpn2cql.c
@@ -182,11 +182,11 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes)
 };
 
 static int checkForLeftTruncation(Z_AttributeList *attributes) {
-       return checkForTruncation(1, attributes);
+       return checkForTruncation(2, attributes);
 }
 
 static int checkForRightTruncation(Z_AttributeList *attributes) {
-       return checkForTruncation(2, attributes);
+       return checkForTruncation(1, attributes);
 };
 
 static int rpn2cql_simple(cql_transform_t ct,

diff --git a/test/test_rpn2cql.c b/test/test_rpn2cql.c
index 73f5f5f..bdb4972 100644 (file)
--- a/test/test_rpn2cql.c
+++ b/test/test_rpn2cql.c
@@ -90,8 +90,10 @@ static void tst2(void)
     YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=5 1980", "dc.date>1980"));
     YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=2 1980", "dc.date<=1980"));
     YAZ_CHECK(compare(ct, "@attr 1=30 @attr 2=4 1980", "dc.date>=1980"));
-    /* truncation tests */
-    YAZ_CHECK(compare(ct, "@attr 1=1016 @attr 5=r abc", "abc"));
+    /* Truncation */
+    YAZ_CHECK(compare(ct, "@attr 5=1 water", "water*"));
+    YAZ_CHECK(compare(ct, "@attr 5=2 water", "*water"));
+    YAZ_CHECK(compare(ct, "@attr 5=3 water", "*water*"));
     /* Other */
     YAZ_CHECK(compare(ct, "@attr 2=103 @attr 1=_ALLRECORDS 1", "cql.allRecords=1"));
     YAZ_CHECK(compare(ct, "@attr 1=500 abc", 0));

diff --git a/test/test_rpn2solr.c b/test/test_rpn2solr.c
index 2f3f01e..bef27ff 100644 (file)
--- a/test/test_rpn2solr.c
+++ b/test/test_rpn2solr.c
@@ -73,13 +73,12 @@ static void tst1(void)
 
     /* Truncation */
     YAZ_CHECK(compare(ct, "@attr 5=1 water", "water*"));
-    YAZ_CHECK(compare(ct, "@attr t=r 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 t=l water", "*water"));
 
     YAZ_CHECK(compare(ct, "@attr 5=3 water", "*water*"));
-    YAZ_CHECK(compare(ct, "@attr t=b water", "*water*"));
 
     /*
     YAZ_CHECK(compare(ct, "@or @attr 1=1016 water @attr 7=1 @attr 1=4 0", "any:water rank:??");