X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fpquery.c;h=eccf10b0e33592a937dfb4330b5fffeb53337d21;hb=ab66367f19b935a874d190bbe5b5d8f20dbf3592;hp=c5fe651ec145eb67be19ec0b90c819c0a672d220;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c;p=yaz-moved-to-github.git

diff --git a/util/pquery.c b/util/pquery.c
index c5fe651..eccf10b 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.4  1995-06-15 07:45:19  quinn
+ * Revision 1.8  1996-01-02 11:46:56  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.7  1995/09/29  17:12:36  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:03:03  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.5  1995/06/15  12:31:02  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.4  1995/06/15  07:45:19  quinn
  * Moving to v3.
  *
  * Revision 1.3  1995/06/14  11:06:35  adam
@@ -119,8 +131,9 @@ static Z_AttributesPlusTerm *rpn_term (ODR o, int num_attr, int *attr_list)
                 odr_malloc (o,sizeof(**zapt->attributeList));
             zapt->attributeList[i]->attributeType = &attr_tmp[2*i];
 #ifdef Z_95
+	    zapt->attributeList[i]->attributeSet = 0;
 	    zapt->attributeList[i]->which = Z_AttributeValue_numeric;
-	    zapt->attributeList[i]->value = &attr_tmp[2*i+1];
+	    zapt->attributeList[i]->value.numeric = &attr_tmp[2*i+1];
 #else
             zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1];
 #endif
@@ -174,7 +187,7 @@ static Z_Complex *rpn_complex (ODR o, int num_attr, int max_attr,
 
     zc = odr_malloc (o, sizeof(*zc));
     zo = odr_malloc (o, sizeof(*zo));
-    zc->operator = zo;
+    zc->roperator = zo;
     switch (query_look)
     {
     case 'a':