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

diff --git a/util/pquery.c b/util/pquery.c
index f2b0d4f..eccf10b 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.3  1995-06-14 11:06:35  adam
+ * 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
  * Bug fix: Attributes wasn't interpreted correctly!
  *
  * Revision 1.2  1995/05/26  08:56:11  adam
@@ -115,7 +130,13 @@ static Z_AttributesPlusTerm *rpn_term (ODR o, int num_attr, int *attr_list)
             zapt->attributeList[i] =
                 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.numeric = &attr_tmp[2*i+1];
+#else
             zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1];
+#endif
         }
     }
     else
@@ -166,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':