X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fquery.c;h=6b3236b7d16e03614f7c5111ad81a455fa198fc0;hb=5c03aa670c7420063f751a66e200987ea4bf40eb;hp=e194430d48a5dc8d9afc4c3c4fd8a72e174a530a;hpb=7d093cf64e6045cf14dbf199f8cdf6b808dd3b65;p=yaz-moved-to-github.git

diff --git a/util/query.c b/util/query.c
index e194430..6b3236b 100644
--- a/util/query.c
+++ b/util/query.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: query.c,v $
- * Revision 1.1  1995-04-10 10:28:47  quinn
+ * Revision 1.3  1996-01-02 11:46:56  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.2  1995/05/16  08:51:14  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.1  1995/04/10  10:28:47  quinn
  * Added copy of CCL and MARC display
  *
  *
@@ -78,19 +84,19 @@ static Z_Complex *makecomplex(ODR o, char **buf)
     char op[100], *b;
 
     r = odr_malloc(o, sizeof(*r));
-    r->operator = odr_malloc(o, sizeof(*r->operator));
+    r->roperator = odr_malloc(o, sizeof(*r->roperator));
 
     b = op;
     while (**buf && !isspace(**buf))
     	*(b++) = *((*buf)++);
     *b = 0;
     if (!strcmp(op, "and"))
-    	r->operator->which = Z_Operator_and;
+    	r->roperator->which = Z_Operator_and;
     else if (!strcmp(op, "or"))
-    	r->operator->which = Z_Operator_or;
+    	r->roperator->which = Z_Operator_or;
     else if (!strcmp(op, "not"))
-    	r->operator->which = Z_Operator_and_not;
-    r->operator->u.and = "";
+    	r->roperator->which = Z_Operator_and_not;
+    r->roperator->u.and = "";
     while (**buf && !isspace(**buf))
     	(*buf)++;
     if (!(r->s1 = makerpn(o, buf)))