X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpquery.c;h=d4b995886e88596772ab4b693d0b40bd63e7d4c3;hp=1bda33f9fb9ed99652d32f1a0194800b944975d4;hb=cf0d647d4a642af04013d09f412e8629897187c5;hpb=a14df7391f90790b0db8e4e286e7252e06bf8c38 diff --git a/src/pquery.c b/src/pquery.c index 1bda33f..d4b9958 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) 1995-2013 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)); @@ -314,7 +315,7 @@ Z_Term *z_Term_create(ODR o, int term_type, const char *buf, size_t 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: @@ -323,7 +324,7 @@ Z_Term *z_Term_create(ODR o, int term_type, const char *buf, size_t len) break; case Z_Term_characterString: term->which = Z_Term_characterString; - term->u.characterString = (char*) term_octet->buf; + term->u.characterString = (char*) term_octet->buf; /* null terminated above */ break; case Z_Term_numeric: @@ -454,7 +455,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 +504,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 +578,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) @@ -685,6 +686,12 @@ static Z_RPNQuery *p_query_rpn_mk(ODR o, struct yaz_pqf_parser *li) return zq; } +static void pqf_parser_begin(struct yaz_pqf_parser *li, const char *buf) +{ + li->query_buf = li->query_ptr = buf; + li->lex_buf = 0; +} + Z_RPNQuery *p_query_rpn(ODR o, const char *qbuf) { struct yaz_pqf_parser li; @@ -694,8 +701,8 @@ Z_RPNQuery *p_query_rpn(ODR o, const char *qbuf) li.right_sep = "}\""; li.escape_char = '@'; li.term_type = Z_Term_general; - li.query_buf = li.query_ptr = qbuf; - li.lex_buf = 0; + + pqf_parser_begin(&li, qbuf); return p_query_rpn_mk(o, &li); } @@ -806,8 +813,7 @@ 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; + pqf_parser_begin(p, qbuf); return p_query_rpn_mk(o, p); } @@ -817,8 +823,7 @@ Z_AttributesPlusTerm *yaz_pqf_scan(YAZ_PQF_Parser p, ODR o, { if (!p) return 0; - p->query_buf = p->query_ptr = qbuf; - p->lex_buf = 0; + pqf_parser_begin(p, qbuf); return p_query_scan_mk(p, o, attributeSetP); } @@ -828,25 +833,43 @@ Z_AttributeList *yaz_pqf_scan_attribute_list(YAZ_PQF_Parser p, ODR o, { if (!p) return 0; - p->query_buf = p->query_ptr = qbuf; - p->lex_buf = 0; + pqf_parser_begin(p, qbuf); return p_query_scan_attributes_mk(p, o, attributeSetP); } 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; Z_FacetField *facet_field = 0; - Z_AttributeList *attribute_list = - yaz_pqf_scan_attribute_list(pqf_parser, odr, &attributeSetId, facet); - + Z_AttributeList *attribute_list; + + pqf_parser_begin(pqf_parser, facet); + attribute_list = p_query_scan_attributes_mk(li, odr, &attributeSetId); if (attribute_list) { facet_field = (Z_FacetField *) odr_malloc(odr, sizeof(*facet_field)); facet_field->attributes = attribute_list; facet_field->num_terms = 0; - facet_field->terms = 0; + facet_field->terms = odr_malloc(odr, 10 * sizeof(*facet_field->terms)); + while (li->query_look == 't') + { + if (facet_field->num_terms < 10) + { + char *es_str = odr_malloc(odr, li->lex_len+1); + int es_len = escape_string(es_str, li->lex_buf, li->lex_len); + Z_Term *term = z_Term_create(odr, li->term_type, es_str, es_len); + + 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 = + odr_intdup(odr, 0); + facet_field->num_terms++; + } + lex(li); + } } yaz_pqf_destroy(pqf_parser); return facet_field; @@ -866,7 +889,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