X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=util%2Fpquery.c;h=7977ed6a1bf32ef8ace735b78798a8d1bdb7a969;hp=9aa98e36cfdd68c2fc6de9c9961702cb9ffd797c;hb=79bf9f1b8b224b6b7323b280fca704591ac17324;hpb=6b8dc2364e08641a6c6c83b6ec8a16cb33df9119 diff --git a/util/pquery.c b/util/pquery.c index 9aa98e3..7977ed6 100644 --- a/util/pquery.c +++ b/util/pquery.c @@ -1,10 +1,23 @@ /* - * Copyright (c) 1995-1996, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: pquery.c,v $ - * Revision 1.12 1997-09-01 08:54:13 adam + * Revision 1.16 1997-09-29 13:19:00 adam + * Added function, oid_ent_to_oid, to replace the function + * oid_getoidbyent, which is not thread safe. + * + * Revision 1.15 1997/09/29 07:13:43 adam + * Changed type of a few variables to avoid warnings. + * + * Revision 1.14 1997/09/22 12:33:41 adam + * Fixed bug introduced by previous commit. + * + * Revision 1.13 1997/09/17 12:10:42 adam + * YAZ version 1.4. + * + * Revision 1.12 1997/09/01 08:54:13 adam * New windows NT/95 port using MSV5.0. Made prefix query handling * thread safe. The function options ignores empty arguments when met. * @@ -59,11 +72,12 @@ static oid_value p_query_dfset = VAL_NONE; struct lex_info { const char *query_buf; const char *lex_buf; - int lex_len; + size_t lex_len; int query_look; char *left_sep; char *right_sep; int escape_char; + int term_type; }; static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o, oid_proto, @@ -81,6 +95,15 @@ static int query_oid_getvalbyname (struct lex_info *li) return oid_getvalbyname (buf); } +static int compare_term (struct lex_info *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; +} + static int query_token (struct lex_info *li) { const char *sep_match; @@ -116,20 +139,22 @@ static int query_token (struct lex_info *li) } if (li->lex_len >= 1 && li->lex_buf[0] == li->escape_char) { - if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "and", 3)) - return 'a'; - if (li->lex_len == 3 && !memcmp (li->lex_buf+1, "or", 2)) + if (compare_term (li, "and", 1)) + return 'a'; + if (compare_term (li, "or", 1)) return 'o'; - if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "not", 3)) + if (compare_term (li, "not", 1)) return 'n'; - if (li->lex_len == 5 && !memcmp (li->lex_buf+1, "attr", 4)) + if (compare_term (li, "attr", 1)) return 'l'; - if (li->lex_len == 4 && !memcmp (li->lex_buf+1, "set", 3)) + if (compare_term (li, "set", 1)) return 's'; - if (li->lex_len == 8 && !memcmp (li->lex_buf+1, "attrset", 7)) + if (compare_term (li, "attrset", 1)) return 'r'; - if (li->lex_len == 5 && !memcmp (li->lex_buf+1, "prox", 4)) + if (compare_term (li, "prox", 1)) return 'p'; + if (compare_term (li, "term", 1)) + return 'y'; } return 't'; } @@ -174,13 +199,14 @@ static Z_AttributesPlusTerm *rpn_term (struct lex_info *li, ODR o, 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_getoidbyent (&attrid)); + 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]; @@ -364,7 +390,7 @@ static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o, if (num_attr >= max_attr) return NULL; if (!(cp = strchr (li->lex_buf, '=')) || - (cp-li->lex_buf) > li->lex_len) + (size_t) (cp-li->lex_buf) > li->lex_len) { attr_set[num_attr] = query_oid_getvalbyname (li); lex (li); @@ -386,6 +412,26 @@ static Z_RPNStructure *rpn_structure (struct lex_info *li, ODR o, return rpn_structure (li, o, proto, num_attr, max_attr, attr_list, attr_set); + case 'y': + lex (li); + if (!li->query_look) + return NULL; + if (compare_term (li, "general", 0)) + li->term_type = Z_Term_general; + else if (compare_term (li, "numeric", 0)) + li->term_type = Z_Term_numeric; + else if (compare_term (li, "string", 0)) + li->term_type = Z_Term_characterString; + else if (compare_term (li, "oid", 0)) + li->term_type = Z_Term_oid; + else if (compare_term (li, "datetime", 0)) + li->term_type = Z_Term_dateTime; + else if (compare_term (li, "null", 0)) + li->term_type = Z_Term_null; + lex (li); + return + rpn_structure (li, o, proto, num_attr, max_attr, attr_list, + attr_set); case 0: /* operator/operand expected! */ return NULL; } @@ -400,6 +446,7 @@ Z_RPNQuery *p_query_rpn_mk (ODR o, struct lex_info *li, oid_proto proto, oid_value attr_set[512]; oid_value topSet = VAL_NONE; oident oset; + int oid[OID_SIZE]; zq = odr_malloc (o, sizeof(*zq)); lex (li); @@ -420,7 +467,7 @@ 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_getoidbyent (&oset)); + zq->attributeSetId = odr_oiddup (o, oid_ent_to_oid (&oset, oid)); if (!(zq->RPNStructure = rpn_structure (li, o, proto, 0, 512, attr_array, attr_set))) @@ -436,6 +483,7 @@ Z_RPNQuery *p_query_rpn (ODR o, oid_proto proto, li.left_sep = "{\""; li.right_sep = "}\""; li.escape_char = '@'; + li.term_type = Z_Term_general; li.query_buf = qbuf; return p_query_rpn_mk (o, &li, proto, qbuf); } @@ -452,6 +500,7 @@ Z_AttributesPlusTerm *p_query_scan_mk (struct lex_info *li, const char *cp; oid_value topSet = VAL_NONE; oident oset; + int oid[OID_SIZE]; lex (li); if (li->query_look == 'r') @@ -469,7 +518,7 @@ Z_AttributesPlusTerm *p_query_scan_mk (struct lex_info *li, oset.oclass = CLASS_ATTSET; oset.value = topSet; - *attributeSetP = odr_oiddup (o, oid_getoidbyent (&oset)); + *attributeSetP = odr_oiddup (o, oid_ent_to_oid (&oset, oid)); while (li->query_look == 'l') { @@ -480,7 +529,7 @@ Z_AttributesPlusTerm *p_query_scan_mk (struct lex_info *li, return NULL; if (!(cp = strchr (li->lex_buf, '=')) || - (cp-li->lex_buf) > li->lex_len) + (size_t) (cp-li->lex_buf) > li->lex_len) { attr_set[num_attr] = query_oid_getvalbyname (li); lex (li); @@ -514,6 +563,7 @@ Z_AttributesPlusTerm *p_query_scan (ODR o, oid_proto proto, li.left_sep = "{\""; li.right_sep = "}\""; li.escape_char = '@'; + li.term_type = Z_Term_general; li.query_buf = qbuf; return p_query_scan_mk (&li, o, proto, attributeSetP, qbuf);