X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fpquery.c;h=23d7b64e03e1a2cdbd000bed86849420a5ac1fc1;hp=f85e8373b4dc15263916357bb157f0ca4b57f50e;hb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;hpb=05c274ef315384faafcc5900c17468f0ea2474e6 diff --git a/src/pquery.c b/src/pquery.c index f85e837..23d7b64 100644 --- a/src/pquery.c +++ b/src/pquery.c @@ -1,8 +1,6 @@ -/* - * Copyright (c) 1995-2004, Index Data. +/* 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.2 2004-10-15 00:19:00 adam Exp $ */ /** * \file pquery.c @@ -14,11 +12,9 @@ #include #include -#include +#include #include -static oid_value p_query_dfset = VAL_NONE; - struct yaz_pqf_parser { const char *query_buf; const char *query_ptr; @@ -33,36 +29,33 @@ 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); if (li->lex_len == len+off && !memcmp (li->lex_buf+off, src, len-off)) - return 1; + return 1; 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; @@ -75,34 +68,34 @@ static int query_token (struct yaz_pqf_parser *li) li->lex_len = 0; if ((sep_match = strchr (li->left_sep, **qptr))) { - sep_char = li->right_sep[sep_match - li->left_sep]; + sep_char = li->right_sep[sep_match - li->left_sep]; ++(*qptr); } li->lex_buf = *qptr; - if (**qptr == li->escape_char && isdigit ((*qptr)[1])) + if (**qptr == li->escape_char && isdigit (((const unsigned char *) *qptr)[1])) { - ++(li->lex_len); - ++(*qptr); - return 'l'; + ++(li->lex_len); + ++(*qptr); + return 'l'; } while (**qptr && **qptr != sep_char) { - if (**qptr == '\\') - { - ++(li->lex_len); - ++(*qptr); - } - ++(li->lex_len); - ++(*qptr); + if (**qptr == '\\') + { + ++(li->lex_len); + ++(*qptr); + } + ++(li->lex_len); + ++(*qptr); } if (**qptr) - ++(*qptr); + ++(*qptr); if (sep_char == ' ' && li->lex_len >= 1 && li->lex_buf[0] == li->escape_char) { - if (compare_term (li, "and", 1)) - return 'a'; + if (compare_term (li, "and", 1)) + return 'a'; if (compare_term (li, "or", 1)) return 'o'; if (compare_term (li, "not", 1)) @@ -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) @@ -131,118 +124,123 @@ static int escape_string(char *out_buf, const char *in, int len) char *out = out_buf; while (--len >= 0) - if (*in == '\\' && len > 0) - { - --len; - switch (*++in) - { - case 't': - *out++ = '\t'; - break; - case 'n': - *out++ = '\n'; - break; - case 'r': - *out++ = '\r'; - break; - case 'f': - *out++ = '\f'; - break; - case 'x': - if (len > 1) - { - char s[4]; - int n = 0; - s[0] = *++in; - s[1] = *++in; - s[2] = '\0'; - len = len - 2; - sscanf (s, "%x", &n); - *out++ = n; - } - break; - case '0': - case '1': - case '2': - case '3': - if (len > 1) - { - char s[4]; - int n = 0; - s[0] = *in; - s[1] = *++in; - s[2] = *++in; - s[3] = '\0'; - len = len - 2; - sscanf (s, "%o", &n); - *out++ = n; - } - break; - default: - *out++ = *in; - break; - } - in++; - } - else - *out++ = *in++; + if (*in == '\\' && len > 0) + { + --len; + switch (*++in) + { + case 't': + *out++ = '\t'; + break; + case 'n': + *out++ = '\n'; + break; + case 'r': + *out++ = '\r'; + break; + case 'f': + *out++ = '\f'; + break; + case 'x': + if (len > 1) + { + char s[4]; + int n = 0; + s[0] = *++in; + s[1] = *++in; + s[2] = '\0'; + len = len - 2; + sscanf (s, "%x", &n); + *out++ = n; + } + break; + case '0': + case '1': + case '2': + case '3': + if (len > 1) + { + char s[4]; + int n = 0; + s[0] = *in; + s[1] = *++in; + s[2] = *++in; + s[3] = '\0'; + len = len - 2; + sscanf (s, "%o", &n); + *out++ = n; + } + break; + default: + *out++ = *in; + break; + } + in++; + } + else + *out++ = *in++; return out - out_buf; } 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) + int num_attr, int *attr_list, + 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) + (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; + return 0; } - if (!lex (li)) + if (!lex (li)) { li->error = YAZ_PQF_ERROR_MISSING; return 0; } - if (!(cp = strchr (li->lex_buf, '='))) + if (!(cp = strchr (li->lex_buf, '='))) { li->error = YAZ_PQF_ERROR_BADATTR; - return 0; + return 0; } } else { - if (num_attr > 0) - attr_set[num_attr] = attr_set[num_attr-1]; - else - attr_set[num_attr] = VAL_NONE; + if (num_attr > 0) + attr_set[num_attr] = attr_set[num_attr-1]; + else + 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); - attr_clist[num_attr] = 0; + attr_list[2*num_attr+1] = atoi (cp); + attr_clist[num_attr] = 0; } else { - int len = li->lex_len - (cp - li->lex_buf); - attr_list[2*num_attr+1] = 0; - attr_clist[num_attr] = (char *) odr_malloc (o, len+1); - len = escape_string(attr_clist[num_attr], cp, len); - attr_clist[num_attr][len] = '\0'; + int len = li->lex_len - (cp - li->lex_buf); + attr_list[2*num_attr+1] = 0; + attr_clist[num_attr] = (char *) odr_malloc (o, len+1); + len = escape_string(attr_clist[num_attr], cp, len); + attr_clist[num_attr][len] = '\0'; } 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; @@ -261,7 +259,7 @@ static Z_AttributesPlusTerm *rpn_term (struct yaz_pqf_parser *li, ODR o, int *attr_tmp; elements = (Z_AttributeElement**) - odr_malloc (o, num_attr * sizeof(*elements)); + 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)); @@ -276,40 +274,39 @@ 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]); - - if (attr_clist[i]) - { - elements[k]->which = Z_AttributeValue_complex; - elements[k]->value.complex = (Z_ComplexAttribute *) - odr_malloc (o, sizeof(Z_ComplexAttribute)); - elements[k]->value.complex->num_list = 1; - elements[k]->value.complex->list = - (Z_StringOrNumeric **) - odr_malloc (o, 1 * sizeof(Z_StringOrNumeric *)); - elements[k]->value.complex->list[0] = - (Z_StringOrNumeric *) - odr_malloc (o, sizeof(Z_StringOrNumeric)); - elements[k]->value.complex->list[0]->which = - Z_StringOrNumeric_string; - elements[k]->value.complex->list[0]->u.string = - attr_clist[i]; - elements[k]->value.complex->semanticAction = (int **) - odr_nullval(); - elements[k]->value.complex->num_semanticAction = 0; - } - else - { - elements[k]->which = Z_AttributeValue_numeric; - elements[k]->value.numeric = &attr_tmp[2*i+1]; - } + elements[k]->attributeSet = attr_set[i]; + + if (attr_clist[i]) + { + elements[k]->which = Z_AttributeValue_complex; + elements[k]->value.complex = (Z_ComplexAttribute *) + odr_malloc (o, sizeof(Z_ComplexAttribute)); + elements[k]->value.complex->num_list = 1; + elements[k]->value.complex->list = + (Z_StringOrNumeric **) + odr_malloc (o, 1 * sizeof(Z_StringOrNumeric *)); + elements[k]->value.complex->list[0] = + (Z_StringOrNumeric *) + odr_malloc (o, sizeof(Z_StringOrNumeric)); + elements[k]->value.complex->list[0]->which = + Z_StringOrNumeric_string; + elements[k]->value.complex->list[0]->u.string = + attr_clist[i]; + elements[k]->value.complex->semanticAction = (int **) + odr_nullval(); + elements[k]->value.complex->num_semanticAction = 0; + } + else + { + elements[k]->which = Z_AttributeValue_numeric; + elements[k]->value.numeric = &attr_tmp[2*i+1]; + } k++; } num_attr = k; } zapt->attributes = (Z_AttributeList *) - odr_malloc (o, sizeof(*zapt->attributes)); + odr_malloc (o, sizeof(*zapt->attributes)); zapt->attributes->num_attributes = num_attr; zapt->attributes->attributes = elements; @@ -341,8 +338,8 @@ static Z_AttributesPlusTerm *rpn_term (struct yaz_pqf_parser *li, ODR o, break; case Z_Term_external: term->which = Z_Term_external; - term->u.external = 0; - break; + term->u.external = 0; + break; default: term->which = Z_Term_null; term->u.null = odr_nullval(); @@ -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; @@ -400,41 +396,57 @@ static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o) return NULL; } if (*li->lex_buf == '1') - { - p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion)); - *p->exclusion = 1; - } + p->exclusion = odr_intdup (o, 1); else if (*li->lex_buf == '0') + p->exclusion = odr_intdup (o, 0); + else if (*li->lex_buf == 'v' || *li->lex_buf == 'n') + p->exclusion = NULL; + else { - p->exclusion = (int *)odr_malloc (o, sizeof(*p->exclusion)); - *p->exclusion = 0; + li->error = YAZ_PQF_ERROR_PROXIMITY; + return NULL; } - else - p->exclusion = NULL; if (!lex (li)) { li->error = YAZ_PQF_ERROR_MISSING; return NULL; } - p->distance = (int *)odr_malloc (o, sizeof(*p->distance)); - *p->distance = 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 = (int *)odr_malloc (o, sizeof(*p->ordered)); - *p->ordered = 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 = (int *)odr_malloc (o, sizeof(*p->relationType)); - *p->relationType = 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)) { @@ -442,27 +454,38 @@ static Z_ProximityOperator *rpn_proximity (struct yaz_pqf_parser *li, ODR o) return NULL; } if (*li->lex_buf == 'k') - p->which = 0; + p->which = Z_ProximityOperator_known; else if (*li->lex_buf == 'p') - p->which = 1; + p->which = Z_ProximityOperator_private; 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->which = Z_ProximityOperator_known; - p->u.known = (int *)odr_malloc (o, sizeof(*p->u.known)); - *p->u.known = 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; @@ -474,11 +497,11 @@ static Z_Complex *rpn_complex (struct yaz_pqf_parser *li, ODR o, oid_proto proto { case 'a': zo->which = Z_Operator_and; - zo->u.and_not = odr_nullval(); + zo->u.op_and = odr_nullval(); break; case 'o': zo->which = Z_Operator_or; - zo->u.and_not = odr_nullval(); + zo->u.op_or = odr_nullval(); break; case 'n': zo->which = Z_Operator_and_not; @@ -498,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 ; @@ -524,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 .. */ + /* prepare for external: range search .. */ li->term_type = Z_Term_external; - li->external_type = VAL_MULTISRCH2; + 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; @@ -551,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; @@ -559,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; @@ -575,20 +599,20 @@ static Z_RPNStructure *rpn_structure (struct yaz_pqf_parser *li, ODR o, li->error = YAZ_PQF_ERROR_TOOMANY; return 0; } - if (!p_query_parse_attr(li, o, num_attr, attr_list, + if (!p_query_parse_attr(li, o, num_attr, attr_list, attr_clist, attr_set)) return 0; - num_attr++; + num_attr++; lex (li); return - 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); case 'y': - lex (li); + lex (li); rpn_term_type (li, o); return - 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); case 0: /* operator/operand expected! */ li->error = YAZ_PQF_ERROR_MISSING; return 0; @@ -596,44 +620,42 @@ 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) { li->error = YAZ_PQF_ERROR_ATTSET; - return 0; + 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) { @@ -643,8 +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; @@ -655,37 +676,40 @@ Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, 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) { @@ -721,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); @@ -750,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)); @@ -769,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; @@ -812,9 +830,21 @@ 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; } *off = p->query_ptr - p->query_buf; return p->error; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +