X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpquery.c;h=23d7b64e03e1a2cdbd000bed86849420a5ac1fc1;hp=9ee358481ee9b94552ab06f35bbf898be5bb56a9;hb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;hpb=4580363540605bea68d5b63de38b480d3d44ca81

diff --git a/src/pquery.c b/src/pquery.c
index 9ee3584..23d7b64 100644
--- a/src/pquery.c
+++ b/src/pquery.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: pquery.c,v 1.7 2006-02-19 18:34:13 adam Exp $
  */
 /**
  * \file pquery.c
@@ -14,11 +12,9 @@
 #include <ctype.h>
 
 #include <yaz/proto.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
 #include <yaz/pquery.h>
 
-static oid_value p_query_dfset = VAL_NONE;
-
 struct yaz_pqf_parser {
     const char *query_buf;
     const char *query_ptr;
@@ -33,27 +29,24 @@ struct yaz_pqf_parser {
     int error;
 };
 
-static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
-                                      oid_proto, 
-                                      int num_attr, int max_attr, 
-                                      int *attr_list, char **attr_clist,
-                                      oid_value *attr_set);
+static Z_RPNStructure *rpn_structure(struct yaz_pqf_parser *li, ODR o,
+                                     int num_attr, int max_attr, 
+                                     int *attr_list, char **attr_clist,
+                                     Odr_oid **attr_set);
 
-static enum oid_value query_oid_getvalbyname (struct yaz_pqf_parser *li)
+static Odr_oid *query_oid_getvalbyname(struct yaz_pqf_parser *li, ODR o)
 {
-    enum oid_value value;
     char buf[32];
 
-    if (li->lex_len > 31)
-        return VAL_NONE;
+    if (li->lex_len >= sizeof(buf)-1)
+        return 0;
     memcpy (buf, li->lex_buf, li->lex_len);
     buf[li->lex_len] = '\0';
-    value = oid_getvalbyname (buf);
-    return value;
+    return yaz_string_to_oid_odr(yaz_oid_std(), CLASS_ATTSET, buf, o);
 }
 
-static int compare_term (struct yaz_pqf_parser *li, const char *src,
-                         size_t off)
+static int compare_term(struct yaz_pqf_parser *li, const char *src,
+                        size_t off)
 {
     size_t len=strlen(src);
     
@@ -62,7 +55,7 @@ static int compare_term (struct yaz_pqf_parser *li, const char *src,
     return 0;
 }
 
-static int query_token (struct yaz_pqf_parser *li)
+static int query_token(struct yaz_pqf_parser *li)
 {
     int sep_char = ' ';
     const char *sep_match;
@@ -121,9 +114,9 @@ static int query_token (struct yaz_pqf_parser *li)
     return 't';
 }
 
-static int lex (struct yaz_pqf_parser *li)
+static int lex(struct yaz_pqf_parser *li)
 {
-    return li->query_look = query_token (li);
+    return li->query_look = query_token(li);
 }
 
 static int escape_string(char *out_buf, const char *in, int len)
@@ -191,14 +184,15 @@ static int escape_string(char *out_buf, const char *in, int len)
 
 static int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
                               int num_attr, int *attr_list,
-                              char **attr_clist, oid_value *attr_set)
+                              char **attr_clist, Odr_oid **attr_set)
 {
     const char *cp;
+
     if (!(cp = strchr (li->lex_buf, '=')) ||
         (size_t) (cp-li->lex_buf) > li->lex_len)
     {
-        attr_set[num_attr] = query_oid_getvalbyname (li);
-        if (attr_set[num_attr] == VAL_NONE)
+        attr_set[num_attr] = query_oid_getvalbyname (li, o);
+        if (attr_set[num_attr] == 0)
         {
             li->error = YAZ_PQF_ERROR_ATTSET;
             return 0;
@@ -219,10 +213,15 @@ static int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
         if (num_attr > 0)
             attr_set[num_attr] = attr_set[num_attr-1];
         else
-            attr_set[num_attr] = VAL_NONE;
+            attr_set[num_attr] = 0;
+    }
+    if (*li->lex_buf < '0' || *li->lex_buf > '9')
+    {
+        li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+        return 0;
     }
     attr_list[2*num_attr] = atoi(li->lex_buf);
-        cp++;
+    cp++;
     if (*cp >= '0' && *cp <= '9')
     {
         attr_list[2*num_attr+1] = atoi (cp);
@@ -239,10 +238,9 @@ static int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
     return 1;
 }
 
-static Z_AttributesPlusTerm *rpn_term (struct yaz_pqf_parser *li, ODR o,
-                                       oid_proto proto, 
-                                       int num_attr, int *attr_list,
-                                       char **attr_clist, oid_value *attr_set)
+static Z_AttributesPlusTerm *rpn_term(struct yaz_pqf_parser *li, ODR o,
+                                      int num_attr, int *attr_list,
+                                      char **attr_clist, Odr_oid **attr_set)
 {
     Z_AttributesPlusTerm *zapt;
     Odr_oct *term_octet;
@@ -276,8 +274,7 @@ static Z_AttributesPlusTerm *rpn_term (struct yaz_pqf_parser *li, ODR o,
             elements[k] =
                 (Z_AttributeElement*)odr_malloc (o,sizeof(**elements));
             elements[k]->attributeType = &attr_tmp[2*i];
-            elements[k]->attributeSet =
-                yaz_oidval_to_z3950oid(o, CLASS_ATTSET, attr_set[i]);
+            elements[k]->attributeSet = attr_set[i];
 
             if (attr_clist[i])
             {
@@ -351,9 +348,9 @@ static Z_AttributesPlusTerm *rpn_term (struct yaz_pqf_parser *li, ODR o,
     return zapt;
 }
 
-static Z_Operand *rpn_simple (struct yaz_pqf_parser *li, ODR o, oid_proto proto,
-                              int num_attr, int *attr_list, char **attr_clist,
-                              oid_value *attr_set)
+static Z_Operand *rpn_simple(struct yaz_pqf_parser *li, ODR o,
+                             int num_attr, int *attr_list, char **attr_clist,
+                             Odr_oid **attr_set)
 {
     Z_Operand *zo;
 
@@ -363,8 +360,7 @@ static Z_Operand *rpn_simple (struct yaz_pqf_parser *li, ODR o, oid_proto proto,
     case 't':
         zo->which = Z_Operand_APT;
         if (!(zo->u.attributesPlusTerm =
-              rpn_term (li, o, proto, num_attr, attr_list, attr_clist,
-                        attr_set)))
+              rpn_term(li, o, num_attr, attr_list, attr_clist, attr_set)))
             return 0;
         lex (li);
         break;
@@ -403,29 +399,54 @@ static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
         p->exclusion = odr_intdup (o, 1);
     else if (*li->lex_buf == '0')
         p->exclusion = odr_intdup (o, 0);
-    else
+    else if (*li->lex_buf == 'v' || *li->lex_buf == 'n')
         p->exclusion = NULL;
+    else
+    {
+        li->error = YAZ_PQF_ERROR_PROXIMITY;
+        return NULL;
+    }
 
     if (!lex (li))
     {
         li->error = YAZ_PQF_ERROR_MISSING;
         return NULL;
     }
-    p->distance = odr_intdup (o, atoi(li->lex_buf));
+    if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+        p->distance = odr_intdup (o, atoi (li->lex_buf));
+    else
+    {
+        li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+        return NULL;
+    }
 
     if (!lex (li))
     {
         li->error = YAZ_PQF_ERROR_MISSING;
         return NULL;
     }
-    p->ordered = odr_intdup (o, atoi (li->lex_buf));
+    if (*li->lex_buf == '1')
+        p->ordered = odr_intdup (o, 1);
+    else if (*li->lex_buf == '0')
+        p->ordered = odr_intdup (o, 0);
+    else
+    {
+        li->error = YAZ_PQF_ERROR_PROXIMITY;
+        return NULL;
+    }
     
     if (!lex (li))
     {
         li->error = YAZ_PQF_ERROR_MISSING;
         return NULL;
     }
-    p->relationType = odr_intdup (o, atoi (li->lex_buf));
+    if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+        p->relationType = odr_intdup (o, atoi (li->lex_buf));
+    else
+    {
+        li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+        return NULL;
+    }
 
     if (!lex (li))
     {
@@ -439,19 +460,32 @@ static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o)
     else
         p->which = atoi (li->lex_buf);
 
+    if (p->which != Z_ProximityOperator_known
+        && p->which != Z_ProximityOperator_private)
+    {
+        li->error = YAZ_PQF_ERROR_PROXIMITY;
+        return NULL;
+    }
+
     if (!lex (li))
     {
         li->error = YAZ_PQF_ERROR_MISSING;
         return NULL;
     }
-    p->u.known = odr_intdup (o, atoi(li->lex_buf));
+    if (*li->lex_buf >= '0' && *li->lex_buf <= '9')
+        p->u.known = odr_intdup (o, atoi(li->lex_buf));
+    else
+    {
+        li->error = YAZ_PQF_ERROR_BAD_INTEGER;
+        return NULL;
+    }
     return p;
 }
 
-static Z_Complex *rpn_complex (struct yaz_pqf_parser *li, ODR o, oid_proto proto,
-                               int num_attr, int max_attr, 
-                               int *attr_list, char **attr_clist,
-                               oid_value *attr_set)
+static Z_Complex *rpn_complex(struct yaz_pqf_parser *li, ODR o,
+                              int num_attr, int max_attr, 
+                              int *attr_list, char **attr_clist,
+                              Odr_oid **attr_set)
 {
     Z_Complex *zc;
     Z_Operator *zo;
@@ -487,17 +521,17 @@ static Z_Complex *rpn_complex (struct yaz_pqf_parser *li, ODR o, oid_proto proto
     }
     lex (li);
     if (!(zc->s1 =
-          rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
-                         attr_clist, attr_set)))
+          rpn_structure(li, o, num_attr, max_attr, attr_list,
+                        attr_clist, attr_set)))
         return NULL;
     if (!(zc->s2 =
-          rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
-                         attr_clist, attr_set)))
+          rpn_structure(li, o, num_attr, max_attr, attr_list,
+                        attr_clist, attr_set)))
         return NULL;
     return zc;
 }
 
-static void rpn_term_type (struct yaz_pqf_parser *li, ODR o)
+static void rpn_term_type(struct yaz_pqf_parser *li, ODR o)
 {
     if (!li->query_look)
         return ;
@@ -513,21 +547,22 @@ static void rpn_term_type (struct yaz_pqf_parser *li, ODR o)
         li->term_type = Z_Term_dateTime;
     else if (compare_term (li, "null", 0))
         li->term_type = Z_Term_null;
+#if 0
     else if (compare_term(li, "range", 0))
     {
         /* prepare for external: range search .. */
         li->term_type = Z_Term_external;
         li->external_type = VAL_MULTISRCH2;
     }
+#endif
     lex (li);
 }
                            
-static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
-                                      oid_proto proto, 
-                                      int num_attr, int max_attr, 
-                                      int *attr_list,
-                                      char **attr_clist,
-                                      oid_value *attr_set)
+static Z_RPNStructure *rpn_structure(struct yaz_pqf_parser *li, ODR o,
+                                     int num_attr, int max_attr, 
+                                     int *attr_list,
+                                     char **attr_clist,
+                                     Odr_oid **attr_set)
 {
     Z_RPNStructure *sz;
 
@@ -540,7 +575,7 @@ static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
     case 'p':
         sz->which = Z_RPNStructure_complex;
         if (!(sz->u.complex =
-              rpn_complex (li, o, proto, num_attr, max_attr, attr_list,
+              rpn_complex (li, o, num_attr, max_attr, attr_list,
                            attr_clist, attr_set)))
             return NULL;
         break;
@@ -548,7 +583,7 @@ static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
     case 's':
         sz->which = Z_RPNStructure_simple;
         if (!(sz->u.simple =
-              rpn_simple (li, o, proto, num_attr, attr_list,
+              rpn_simple (li, o, num_attr, attr_list,
                           attr_clist, attr_set)))
             return NULL;
         break;
@@ -570,13 +605,13 @@ static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
         num_attr++;
         lex (li);
         return
-            rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
+            rpn_structure (li, o, num_attr, max_attr, attr_list,
                            attr_clist,  attr_set);
     case 'y':
         lex (li);
         rpn_term_type (li, o);
         return
-            rpn_structure (li, o, proto, num_attr, max_attr, attr_list,
+            rpn_structure (li, o, num_attr, max_attr, attr_list,
                            attr_clist, attr_set);
     case 0:                /* operator/operand expected! */
         li->error = YAZ_PQF_ERROR_MISSING;
@@ -585,35 +620,33 @@ static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o,
     return sz;
 }
 
-Z_RPNQuery *p_query_rpn_mk (ODR o, struct yaz_pqf_parser *li, oid_proto proto,
-                            const char *qbuf)
+Z_RPNQuery *p_query_rpn_mk(ODR o, struct yaz_pqf_parser *li, const char *qbuf)
 {
     Z_RPNQuery *zq;
     int attr_array[1024];
     char *attr_clist[512];
-    oid_value attr_set[512];
-    oid_value topSet = VAL_NONE;
+    Odr_oid *attr_set[512];
+    Odr_oid *top_set = 0;
 
     zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
     lex (li);
     if (li->query_look == 'r')
     {
         lex (li);
-        topSet = query_oid_getvalbyname (li);
-        if (topSet == VAL_NONE)
+        top_set = query_oid_getvalbyname(li, o);
+        if (!top_set)
         {
             li->error = YAZ_PQF_ERROR_ATTSET;
             return NULL;
         }
-
         lex (li);
     }
-    if (topSet == VAL_NONE)
-        topSet = p_query_dfset;
-    if (topSet == VAL_NONE)
-        topSet = VAL_BIB1;
+    if (!top_set)
+    {
+        top_set = odr_oiddup(o, yaz_oid_attset_bib_1);
+    }
 
-    zq->attributeSetId = yaz_oidval_to_z3950oid(o, CLASS_ATTSET, topSet);
+    zq->attributeSetId = top_set;
 
     if (!zq->attributeSetId)
     {
@@ -621,8 +654,8 @@ Z_RPNQuery *p_query_rpn_mk (ODR o, struct yaz_pqf_parser *li, oid_proto proto,
         return 0;
     }
 
-    if (!(zq->RPNStructure = rpn_structure (li, o, proto, 0, 512,
-                                            attr_array, attr_clist, attr_set)))
+    if (!(zq->RPNStructure = rpn_structure(li, o, 0, 512,
+                                           attr_array, attr_clist, attr_set)))
         return 0;
     if (li->query_look)
     {
@@ -632,7 +665,7 @@ Z_RPNQuery *p_query_rpn_mk (ODR o, struct yaz_pqf_parser *li, oid_proto proto,
     return zq;
 }
 
-Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf)
+Z_RPNQuery *p_query_rpn(ODR o, const char *qbuf)
 {
     struct yaz_pqf_parser li;
 
@@ -643,37 +676,40 @@ Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, const char *qbuf)
     li.term_type = Z_Term_general;
     li.query_buf = li.query_ptr = qbuf;
     li.lex_buf = 0;
-    return p_query_rpn_mk (o, &li, proto, qbuf);
+    return p_query_rpn_mk(o, &li, qbuf);
 }
 
 
-Z_AttributesPlusTerm *p_query_scan_mk (struct yaz_pqf_parser *li,
-                                       ODR o, oid_proto proto,
-                                       Odr_oid **attributeSetP,
-                                       const char *qbuf)
+Z_AttributesPlusTerm *p_query_scan_mk(struct yaz_pqf_parser *li,
+                                      ODR o, oid_proto proto,
+                                      Odr_oid **attributeSetP,
+                                      const char *qbuf)
 {
     int attr_list[1024];
     char *attr_clist[512];
-    oid_value attr_set[512];
+    Odr_oid *attr_set[512];
     int num_attr = 0;
     int max_attr = 512;
-    oid_value topSet = VAL_NONE;
+    Odr_oid *top_set = 0;
     Z_AttributesPlusTerm *apt;
 
     lex (li);
     if (li->query_look == 'r')
     {
         lex (li);
-        topSet = query_oid_getvalbyname (li);
-
+        top_set = query_oid_getvalbyname(li, o);
+        if (!top_set)
+        {
+            li->error = YAZ_PQF_ERROR_ATTSET;
+            return NULL;
+        }
         lex (li);
     }
-    if (topSet == VAL_NONE)
-        topSet = p_query_dfset;
-    if (topSet == VAL_NONE)
-        topSet = VAL_BIB1;
-
-    *attributeSetP = yaz_oidval_to_z3950oid (o, CLASS_ATTSET, topSet);
+    if (!top_set)
+    {
+        top_set = odr_oiddup(o, yaz_oid_attset_bib_1);
+    }
+    *attributeSetP = top_set;
 
     while (1)
     {
@@ -709,7 +745,7 @@ Z_AttributesPlusTerm *p_query_scan_mk (struct yaz_pqf_parser *li,
         li->error = YAZ_PQF_ERROR_MISSING;
         return 0;
     }
-    apt = rpn_term (li, o, proto, num_attr, attr_list, attr_clist, attr_set);
+    apt = rpn_term(li, o, num_attr, attr_list, attr_clist, attr_set);
 
     lex (li);
 
@@ -738,12 +774,6 @@ Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto,
     return p_query_scan_mk (&li, o, proto, attributeSetP, qbuf);
 }
 
-int p_query_attset (const char *arg)
-{
-    p_query_dfset = oid_getvalbyname (arg);
-    return (p_query_dfset == VAL_NONE) ? -1 : 0;
-}
-
 YAZ_PQF_Parser yaz_pqf_create (void)
 {
     YAZ_PQF_Parser p = (YAZ_PQF_Parser) xmalloc (sizeof(*p));
@@ -757,23 +787,23 @@ YAZ_PQF_Parser yaz_pqf_create (void)
     return p;
 }
 
-void yaz_pqf_destroy (YAZ_PQF_Parser p)
+void yaz_pqf_destroy(YAZ_PQF_Parser p)
 {
     xfree (p);
 }
 
-Z_RPNQuery *yaz_pqf_parse (YAZ_PQF_Parser p, ODR o, const char *qbuf)
+Z_RPNQuery *yaz_pqf_parse(YAZ_PQF_Parser p, ODR o, const char *qbuf)
 {
     if (!p)
         return 0;
     p->query_buf = p->query_ptr = qbuf;
     p->lex_buf = 0;
-    return p_query_rpn_mk (o, p, PROTO_Z3950, qbuf);
+    return p_query_rpn_mk (o, p, qbuf);
 }
 
-Z_AttributesPlusTerm *yaz_pqf_scan (YAZ_PQF_Parser p, ODR o,
-                                    Odr_oid **attributeSetP,
-                                    const char *qbuf)
+Z_AttributesPlusTerm *yaz_pqf_scan(YAZ_PQF_Parser p, ODR o,
+                                   Odr_oid **attributeSetP,
+                                   const char *qbuf)
 {
     if (!p)
         return 0;
@@ -800,6 +830,10 @@ int yaz_pqf_error (YAZ_PQF_Parser p, const char **msg, size_t *off)
         *msg = "bad attribute specification"; break;
     case YAZ_PQF_ERROR_INTERNAL:
         *msg = "internal error"; break;
+    case YAZ_PQF_ERROR_PROXIMITY:
+        *msg = "proximity error"; break;
+    case YAZ_PQF_ERROR_BAD_INTEGER:
+        *msg = "bad integer"; break;
     default:
         *msg = "unknown error"; break;
     }