From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 7 Apr 2011 11:39:08 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.2.0~46^2~7
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=b68bf3d66b984c7dab7d4fe8707d761e7cc8c896;hp=8e4e5fd8b258f7e3db8a5356cfc8ccddddebd150;p=yaz-moved-to-github.git

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

diff --git a/src/rpn2solr.c b/src/rpn2solr.c
index 6390ebb..89b8b91 100644
--- a/src/rpn2solr.c
+++ b/src/rpn2solr.c
@@ -184,7 +184,10 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes)
             	if (truncation <= 3)
                     return ((int) truncation & flag);
             }
-            /* Complex: Shouldn't happen */
+            else if (ae->which == Z_AttributeValue_complex) {
+                //yaz_log(YLOG_DEBUG, "Z_Attribute_complex");
+                /* Complex: Shouldn't happen */
+            }
         }
     }
     /* No truncation or unsupported */
@@ -192,11 +195,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 rpn2solr_simple(solr_transform_t ct,