From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 9 Oct 2015 14:15:42 +0000 (+0200)
Subject: Fix RPN to CQL rejects local Bib-1 attribute set YAZ-861
X-Git-Tag: v5.14.11~2
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=e8001c3381e00a846e96fab5a1c6f7ca00df4f55;p=yaz-moved-to-github.git

Fix RPN to CQL rejects local Bib-1 attribute set YAZ-861
---

diff --git a/src/cqltransform.c b/src/cqltransform.c
index b5fe140..1118dc2 100644
--- a/src/cqltransform.c
+++ b/src/cqltransform.c
@@ -339,9 +339,11 @@ const char *cql_lookup_reverse(cql_transform_t ct,
                 for (j = 0; j < attributes->num_attributes; j++)
                 {
                     /* actual attribute */
-                    Z_AttributeElement *a_ae = attributes->attributes[j];
-                    int r = compare_attr(e_ae, a_ae);
-                    if (r == 0)
+                    Z_AttributeElement a_ae = *attributes->attributes[j];
+                    if (a_ae.attributeSet && &e_ae->attributeSet &&
+                        !oid_oidcmp(a_ae.attributeSet, yaz_oid_attset_bib_1))
+                        a_ae.attributeSet = 0;
+                    if (!compare_attr(e_ae, &a_ae))
                         break;
                 }
                 if (j == attributes->num_attributes)