X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpquery.c;h=f913a0f135409c1c3451a3c2d19458b885519eb7;hp=a023d96517c2cef91dd14314146b096fac5aff80;hb=01e36a11adc97a240cc595f89280c8a619770251;hpb=73662ac185d4f1151c0b99cde88aecd4c26fc097

diff --git a/src/pquery.c b/src/pquery.c
index a023d96..f913a0f 100644
--- a/src/pquery.c
+++ b/src/pquery.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -33,7 +33,7 @@ struct yaz_pqf_parser {
 };
 
 static Z_RPNStructure *rpn_structure(struct yaz_pqf_parser *li, ODR o,
-                                     int num_attr, int max_attr, 
+                                     int num_attr, int max_attr,
                                      Odr_int *attr_list, char **attr_clist,
                                      Odr_oid **attr_set);
 
@@ -52,7 +52,7 @@ static int compare_term(struct yaz_pqf_parser *li, const char *src,
                         size_t off)
 {
     size_t len=strlen(src);
-    
+
     if (li->lex_len == len+off && !memcmp(li->lex_buf+off, src, len-off))
         return 1;
     return 0;
@@ -75,7 +75,7 @@ static int query_token(struct yaz_pqf_parser *li)
         ++(*qptr);
     }
     li->lex_buf = *qptr;
-   
+
     if (**qptr == li->escape_char && yaz_isdigit((*qptr)[1]))
     {
         ++(li->lex_len);
@@ -84,7 +84,7 @@ static int query_token(struct yaz_pqf_parser *li)
     }
     while (**qptr && **qptr != sep_char)
     {
-        if (**qptr == '\\')
+        if (**qptr == '\\' && (*qptr)[1])
         {
             ++(li->lex_len);
             ++(*qptr);
@@ -122,7 +122,7 @@ static int lex(struct yaz_pqf_parser *li)
     return li->query_look = query_token(li);
 }
 
-int escape_string(char *out_buf, const char *in, int len)
+static int escape_string(char *out_buf, const char *in, int len)
 {
 
     char *out = out_buf;
@@ -166,7 +166,7 @@ int escape_string(char *out_buf, const char *in, int len)
                     char s[4];
                     int n = 0;
                     s[0] = *in;
-                    s[1] = *++in;                   
+                    s[1] = *++in;
                     s[2] = *++in;
                     s[3] = '\0';
                     len = len - 2;
@@ -185,7 +185,7 @@ int escape_string(char *out_buf, const char *in, int len)
     return out - out_buf;
 }
 
-int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
+static int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
                               int num_attr, Odr_int *attr_list,
                               char **attr_clist, Odr_oid **attr_set)
 {
@@ -212,7 +212,7 @@ int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
             return 0;
         }
     }
-    else 
+    else
     {
         if (num_attr > 0)
             attr_set[num_attr] = attr_set[num_attr-1];
@@ -243,8 +243,9 @@ int p_query_parse_attr(struct yaz_pqf_parser *li, ODR o,
     return 1;
 }
 
-Z_AttributeList *get_attributeList(ODR o, int num_attr, Odr_int *attr_list,
-                                   char **attr_clist, Odr_oid **attr_set)
+static Z_AttributeList *get_attributeList(ODR o,
+                                          int num_attr, Odr_int *attr_list,
+                                          char **attr_clist, Odr_oid **attr_set)
 {
     int i, k = 0;
     Odr_int *attr_tmp;
@@ -258,7 +259,7 @@ Z_AttributeList *get_attributeList(ODR o, int num_attr, Odr_int *attr_list,
         return attributes;
     }
     elements = (Z_AttributeElement**)
-        odr_malloc (o, num_attr * sizeof(*elements));
+        odr_malloc(o, num_attr * sizeof(*elements));
 
     attr_tmp = (Odr_int *)odr_malloc(o, num_attr * 2 * sizeof(*attr_tmp));
     memcpy(attr_tmp, attr_list, num_attr * 2 * sizeof(*attr_tmp));
@@ -306,29 +307,35 @@ Z_AttributeList *get_attributeList(ODR o, int num_attr, Odr_int *attr_list,
     return attributes;
 }
 
+Z_AttributeList *zget_AttributeList_use_string(ODR o, const char *name)
+{
+    Odr_int attr_list[2];
+    char *attr_clist[1];
+    Odr_oid *attr_set[1];
+
+    attr_list[0] = 1;
+    attr_list[1] = 0; /* not used */
+    attr_clist[0] = odr_strdup(o, name);
+    attr_set[0] = 0;
+    return get_attributeList(o, 1, attr_list, attr_clist, attr_set);
+}
+
 Z_Term *z_Term_create(ODR o, int term_type, const char *buf, size_t len)
 {
     Z_Term *term = (Z_Term *)odr_malloc(o, sizeof(*term));
-    Odr_oct *term_octet = (Odr_oct *)odr_malloc(o, sizeof(*term_octet));
-    term_octet->buf = (unsigned char *)odr_malloc(o, 1 + len);
-    memcpy(term_octet->buf, buf, len);
-    term_octet->size = term_octet->len = len;
-    term_octet->buf[term_octet->size] = 0;  /* null terminate */
-    
     switch (term_type)
     {
     case Z_Term_general:
         term->which = Z_Term_general;
-        term->u.general = term_octet;
+        term->u.general = odr_create_Odr_oct(o, buf, len);
         break;
     case Z_Term_characterString:
         term->which = Z_Term_characterString;
-        term->u.characterString = (char*) term_octet->buf; 
-        /* null terminated above */
+        term->u.characterString = odr_strdupn(o, buf, len);
         break;
     case Z_Term_numeric:
         term->which = Z_Term_numeric;
-        term->u.numeric = odr_intdup(o, odr_atoi((const char*) term_octet->buf));
+        term->u.numeric = odr_intdup(o, odr_atoi(odr_strdupn(o, buf, len)));
         break;
     case Z_Term_null:
         term->which = Z_Term_null;
@@ -392,9 +399,7 @@ static Z_Operand *rpn_simple(struct yaz_pqf_parser *li, ODR o,
             return 0;
         }
         zo->which = Z_Operand_resultSetId;
-        zo->u.resultSetId = (char *)odr_malloc(o, li->lex_len+1);
-        memcpy(zo->u.resultSetId, li->lex_buf, li->lex_len);
-        zo->u.resultSetId[li->lex_len] = '\0';
+        zo->u.resultSetId = odr_strdupn(o, li->lex_buf, li->lex_len);
         lex(li);
         break;
     default:
@@ -454,7 +459,7 @@ static Z_ProximityOperator *rpn_proximity(struct yaz_pqf_parser *li, ODR o)
         li->error = YAZ_PQF_ERROR_PROXIMITY;
         return NULL;
     }
-    
+
     if (!lex (li))
     {
         li->error = YAZ_PQF_ERROR_MISSING;
@@ -503,7 +508,7 @@ static Z_ProximityOperator *rpn_proximity(struct yaz_pqf_parser *li, ODR o)
 }
 
 static Z_Complex *rpn_complex(struct yaz_pqf_parser *li, ODR o,
-                              int num_attr, int max_attr, 
+                              int num_attr, int max_attr,
                               Odr_int *attr_list, char **attr_clist,
                               Odr_oid **attr_set)
 {
@@ -577,9 +582,9 @@ static void rpn_term_type(struct yaz_pqf_parser *li)
 #endif
     lex(li);
 }
-                           
+
 static Z_RPNStructure *rpn_structure(struct yaz_pqf_parser *li, ODR o,
-                                     int num_attr, int max_attr, 
+                                     int num_attr, int max_attr,
                                      Odr_int *attr_list,
                                      char **attr_clist,
                                      Odr_oid **attr_set)
@@ -840,7 +845,7 @@ static Z_FacetField* parse_facet(ODR odr, const char *facet)
 {
     YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
     struct yaz_pqf_parser *li = pqf_parser;
-    Odr_oid *attributeSetId;
+    Odr_oid *attributeSetId = 0;
     Z_FacetField *facet_field = 0;
     Z_AttributeList *attribute_list;
 
@@ -863,7 +868,7 @@ static Z_FacetField* parse_facet(ODR odr, const char *facet)
                 facet_field->terms[facet_field->num_terms] =
                     (Z_FacetTerm *) odr_malloc(odr, sizeof(Z_FacetTerm));
                 facet_field->terms[facet_field->num_terms]->term = term;
-                facet_field->terms[facet_field->num_terms]->count = 
+                facet_field->terms[facet_field->num_terms]->count =
                     odr_intdup(odr, 0);
                 facet_field->num_terms++;
             }
@@ -888,7 +893,11 @@ Z_FacetList *yaz_pqf_parse_facet_list(ODR o, const char *qbuf)
         fl->elements = (Z_FacetField **)
             odr_malloc(o, num * sizeof(*fl->elements));
         for (i = 0; i < num; i++)
+        {
             fl->elements[i] = parse_facet(o, darray[i]);
+            if (!fl->elements[i])
+                return 0;
+        }
         return fl;
     }
     else