X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fpquery.c;h=5fedcf1b9b51da67906babc29862a8800b921f16;hp=2a2a126df649cf1a40cf6149e3f2239916aa958f;hb=a49837cbe6fcbeeb9ce857b0eeb942619ba80b5e;hpb=044d170f0a963555486df54653cd2fdc5815928b

diff --git a/util/pquery.c b/util/pquery.c
index 2a2a126..5fedcf1 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.18  1998-02-11 11:53:36  adam
+ * Revision 1.21  1998-10-13 16:03:37  adam
+ * Better checking for invalid OID's in p_query_rpn.
+ *
+ * Revision 1.20  1998/03/31 15:13:20  adam
+ * Development towards compiled ASN.1.
+ *
+ * Revision 1.19  1998/03/05 08:09:03  adam
+ * Minor change to make C++ happy.
+ *
+ * Revision 1.18  1998/02/11 11:53:36  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.17  1997/11/24 11:33:57  adam
@@ -91,15 +100,17 @@ static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o, oid_proto,
                                       int num_attr, int max_attr, 
                                       int *attr_list, oid_value *attr_set);
 
-static int query_oid_getvalbyname (struct lex_info *li)
+static enum oid_value query_oid_getvalbyname (struct lex_info *li)
 {
+    enum oid_value value;
     char buf[32];
 
     if (li->lex_len > 31)
         return VAL_NONE;
     memcpy (buf, li->lex_buf, li->lex_len);
     buf[li->lex_len] = '\0';
-    return oid_getvalbyname (buf);
+    value = oid_getvalbyname (buf);
+    return value;
 }
 
 static int compare_term (struct lex_info *li, const char *src, size_t off)
@@ -179,51 +190,61 @@ static Z_AttributesPlusTerm *rpn_term (struct lex_info *li, ODR o,
     Z_AttributesPlusTerm *zapt;
     Odr_oct *term_octet;
     Z_Term *term;
+    Z_AttributeElement **elements;
 
     zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
     term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
     term = (Z_Term *)odr_malloc (o, sizeof(*term));
 
-    zapt->num_attributes = num_attr;
-    if (num_attr)
+    if (!num_attr)
+        elements = (Z_AttributeElement**)odr_nullval();
+    else
     {
         int i;
         int *attr_tmp;
 
-        zapt->attributeList = (Z_AttributeElement**)odr_malloc (o, num_attr * 
-                                          sizeof(*zapt->attributeList));
+        elements = (Z_AttributeElement**)
+	    odr_malloc (o, num_attr * sizeof(*elements));
 
         attr_tmp = (int *)odr_malloc (o, num_attr * 2 * sizeof(int));
         memcpy (attr_tmp, attr_list, num_attr * 2 * sizeof(int));
         for (i = 0; i < num_attr; i++)
         {
-            zapt->attributeList[i] =
-                (Z_AttributeElement*)odr_malloc (o,sizeof(**zapt->attributeList));
-            zapt->attributeList[i]->attributeType = &attr_tmp[2*i];
+            elements[i] =
+                (Z_AttributeElement*)odr_malloc (o,sizeof(**elements));
+            elements[i]->attributeType = &attr_tmp[2*i];
 #ifdef Z_95
             if (attr_set[i] == VAL_NONE)
-                zapt->attributeList[i]->attributeSet = 0;
+                elements[i]->attributeSet = 0;
             else
             {
                 oident attrid;
                 int oid[OID_SIZE];
-
+		
                 attrid.proto = PROTO_Z3950;
                 attrid.oclass = CLASS_ATTSET;
                 attrid.value = attr_set[i];
                    
-                zapt->attributeList[i]->attributeSet = 
-                    odr_oiddup (o, oid_ent_to_oid (&attrid, oid));
+                elements[i]->attributeSet =
+		    odr_oiddup (o, oid_ent_to_oid (&attrid, oid));
             }
-	    zapt->attributeList[i]->which = Z_AttributeValue_numeric;
-	    zapt->attributeList[i]->value.numeric = &attr_tmp[2*i+1];
+	    elements[i]->which = Z_AttributeValue_numeric;
+	    elements[i]->value.numeric = &attr_tmp[2*i+1];
 #else
-            zapt->attributeList[i]->attributeValue = &attr_tmp[2*i+1];
+            elements[i]->attributeValue = &attr_tmp[2*i+1];
 #endif
         }
     }
-    else
-        zapt->attributeList = (Z_AttributeElement**)odr_nullval();
+#ifdef ASN_COMPILED
+    zapt->attributes = (Z_AttributeList *)
+	odr_malloc (o, sizeof(*zapt->attributes));
+    zapt->attributes->num_attributes = num_attr;
+    zapt->attributes->attributes = elements;
+#else
+    zapt->num_attributes = num_attr;
+    zapt->attributeList = elements;
+#endif    
+
     zapt->term = term;
     term->which = Z_Term_general;
     term->u.general = term_octet;
@@ -310,9 +331,14 @@ static Z_ProximityOperator *rpn_proximity (struct lex_info *li, ODR o)
 
     if (!lex (li))
         return NULL;
+#ifdef ASN_COMPILED
+    p->which = Z_ProximityOperator_known;
+    p->u.known = (int *)odr_malloc (o, sizeof(*p->u.known));
+    *p->u.known = atoi (li->lex_buf);
+#else
     p->proximityUnitCode = (int *)odr_malloc (o, sizeof(*p->proximityUnitCode));
     *p->proximityUnitCode = atoi (li->lex_buf);
-
+#endif
     return p;
 }
 
@@ -400,6 +426,8 @@ static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o,
             (size_t) (cp-li->lex_buf) > li->lex_len)
         {
             attr_set[num_attr] = query_oid_getvalbyname (li);
+	    if (attr_set[num_attr] == VAL_NONE)
+		return NULL;
             lex (li);
 
             if (!(cp = strchr (li->lex_buf, '=')))
@@ -474,7 +502,9 @@ Z_RPNQuery *p_query_rpn_mk (ODR o, struct lex_info *li, oid_proto proto,
     oset.oclass = CLASS_ATTSET;
     oset.value = topSet;
 
-    zq->attributeSetId = odr_oiddup (o, oid_ent_to_oid (&oset, oid));
+    if (!oid_ent_to_oid (&oset, oid))
+	return NULL;
+    zq->attributeSetId = odr_oiddup (o, oid);
 
     if (!(zq->RPNStructure = rpn_structure (li, o, proto, 0, 512,
                                             attr_array, attr_set)))