X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=badb91e801d330e89c78b0c738c6cbc481e75c0f;hb=32140b47f685f9aadf7117442470e07609184463;hp=06f42599cbe57bf97b6199f75a93e0d303e76ce3;hpb=85728191a4dc93d31e3d1bd0ddc2ae60381ae6ba;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 06f4259..badb91e 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,10 +1,26 @@ -/* - * Copyright (C) 1995-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: zrpn.c,v 1.113 2002-04-12 14:40:42 adam Exp $ - */ +/* $Id: zrpn.c,v 1.121 2002-08-23 14:30:51 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #ifdef WIN32 @@ -85,17 +101,17 @@ static int attr_find_ex (AttrType *src, oid_value *attributeSetP, case Z_AttributeValue_complex: if (src->minor >= element->value.complex->num_list) break; + if (element->attributeSet && attributeSetP) + { + oident *attrset; + + attrset = oid_getentbyoid (element->attributeSet); + *attributeSetP = attrset->value; + } if (element->value.complex->list[src->minor]->which == Z_StringOrNumeric_numeric) { ++(src->minor); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid (element->attributeSet); - *attributeSetP = attrset->value; - } return *element->value.complex->list[src->minor-1]->u.numeric; } @@ -250,6 +266,8 @@ static int term_pre (ZebraMaps zebra_maps, int reg_type, const char **src, return *s0; } +#define REGEX_CHARS "[]()|.*+!" + /* term_100: handle term, where trunc=none (no operators at all) */ static int term_100 (ZebraMaps zebra_maps, int reg_type, const char **src, char *dst, int space_split, @@ -287,7 +305,7 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, { /* reload last space */ while (space_start < space_end) { - if (!isalnum (*space_start) && *space_start != '-') + if (strchr (REGEX_CHARS, *space_start)) dst[i++] = '\\'; dst_term[j++] = *space_start; dst[i++] = *space_start++; @@ -299,7 +317,7 @@ static int term_100 (ZebraMaps zebra_maps, int reg_type, /* add non-space char */ while (s1 < s0) { - if (!isalnum (*s1) && *s1 != '-') + if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; dst_term[j++] = *s1; dst[i++] = *s1++; @@ -340,7 +358,7 @@ static int term_101 (ZebraMaps zebra_maps, int reg_type, break; while (s1 < s0) { - if (!isalnum (*s1)) + if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; dst_term[j++] = *s1; dst[i++] = *s1++; @@ -389,7 +407,7 @@ static int term_103 (ZebraMaps zebra_maps, int reg_type, const char **src, break; while (s1 < s0) { - if (!isalnum (*s1)) + if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; dst_term[j++] = *s1; dst[i++] = *s1++; @@ -444,7 +462,7 @@ static int term_104 (ZebraMaps zebra_maps, int reg_type, break; while (s1 < s0) { - if (!isalnum (*s1)) + if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; dst_term[j++] = *s1; dst[i++] = *s1++; @@ -490,7 +508,7 @@ static int term_105 (ZebraMaps zebra_maps, int reg_type, break; while (s1 < s0) { - if (!isalnum (*s1)) + if (strchr(REGEX_CHARS, *s1)) dst[i++] = '\\'; dst_term[j++] = *s1; dst[i++] = *s1++; @@ -803,7 +821,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct grep_info *grep_info, int reg_type, int complete_flag, int num_bases, char **basenames, - char *term_dst); + char *term_dst, int xpath_use); static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char **term_sub, @@ -812,19 +830,20 @@ static RSET term_trunc (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int reg_type, int complete_flag, int num_bases, char **basenames, char *term_dst, - const char *rank_type) + const char *rank_type, int xpath_use) { int r; grep_info->isam_p_indx = 0; r = string_term (zh, zapt, term_sub, attributeSet, stream, grep_info, reg_type, complete_flag, num_bases, basenames, - term_dst); + term_dst, xpath_use); if (r < 1) return 0; logf (LOG_DEBUG, "term: %s", term_dst); return rset_trunc (zh, grep_info->isam_p_buf, grep_info->isam_p_indx, term_dst, - strlen(term_dst), rank_type, 1 /* preserve pos */); + strlen(term_dst), rank_type, 1 /* preserve pos */, + zapt->term->which); } @@ -834,7 +853,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct grep_info *grep_info, int reg_type, int complete_flag, int num_bases, char **basenames, - char *term_dst) + char *term_dst, int xpath_use) { char term_dict[2*IT_MAX_WORD+4000]; int j, r, base_no; @@ -856,11 +875,8 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, truncation_value = attr_find (&truncation, NULL); logf (LOG_DEBUG, "truncation value %d", truncation_value); - if (use_value == -1) + if (use_value == -1) /* no attribute - assumy "any" */ use_value = 1016; - if (use_value == -2) - use_value = 1016; - for (base_no = 0; base_no < num_bases; base_no++) { attent attp; @@ -876,10 +892,18 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, zh->errString = basenames[base_no]; return -1; } - if (curAttributeSet == VAL_IDXPATH) + if (use_value == -2) /* string attribute (assume IDXPATH/any) */ + { + use_value = xpath_use; + attp.local_attributes = &id_xpath_attr; + attp.attset_ordinal = VAL_IDXPATH; + id_xpath_attr.next = 0; + id_xpath_attr.local = use_value; + } + else if (curAttributeSet == VAL_IDXPATH) { attp.local_attributes = &id_xpath_attr; - attp.attset_ordinal = curAttributeSet; + attp.attset_ordinal = VAL_IDXPATH; id_xpath_attr.next = 0; id_xpath_attr.local = use_value; } @@ -891,8 +915,9 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, curAttributeSet, use_value, r); if (r == -1) { + /* set was found, but value wasn't defined */ char val_str[32]; - sprintf (val_str, "%d", use_value); + sprintf (val_str, "%d (1)", use_value); zh->errCode = 114; zh->errString = nmem_strdup (stream, val_str); } @@ -938,7 +963,7 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!prefix_len) { char val_str[32]; - sprintf (val_str, "%d", use_value); + sprintf (val_str, "%d (2)", use_value); zh->errCode = 114; zh->errString = nmem_strdup (stream, val_str); return -1; @@ -1070,17 +1095,55 @@ static int string_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return 1; } -static void trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - char *termz) + +static int trans_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, + char *termz) { size_t sizez; Z_Term *term = zapt->term; - sizez = term->u.general->len; - if (sizez > IT_MAX_WORD-1) - sizez = IT_MAX_WORD-1; - memcpy (termz, term->u.general->buf, sizez); - termz[sizez] = '\0'; + switch (term->which) + { + case Z_Term_general: +#if HAVE_ICONV_H + if (zh->iconv_to_utf8 != (iconv_t)(-1)) + { + char *inbuf = term->u.general->buf; + size_t inleft = term->u.general->len; + char *outbuf = termz; + size_t outleft = IT_MAX_WORD-1; + size_t ret; + + yaz_log (LOG_DEBUG, "converting general from ISO-8859-1"); + ret = iconv(zh->iconv_to_utf8, &inbuf, &inleft, + &outbuf, &outleft); + if (ret == (size_t)(-1)) + { + ret = iconv(zh->iconv_to_utf8, 0, 0, 0, 0); + zh->errCode = 125; + return -1; + } + *outbuf = 0; + return 0; + } +#endif + sizez = term->u.general->len; + if (sizez > IT_MAX_WORD-1) + sizez = IT_MAX_WORD-1; + memcpy (termz, term->u.general->buf, sizez); + termz[sizez] = '\0'; + break; + case Z_Term_characterString: + sizez = strlen(term->u.characterString); + if (sizez > IT_MAX_WORD-1) + sizez = IT_MAX_WORD-1; + memcpy (termz, term->u.characterString, sizez); + termz[sizez] = '\0'; + break; + default: + zh->errCode = 124; + } + return 0; } static void trans_scan_term (ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -1125,6 +1188,7 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, int length_prox_term = 0; int min_nn = 10000000; int term_index; + int term_type = Z_Term_characterString; const char *flags = NULL; rsfd = (RSFD *) xmalloc (sizeof(*rsfd)*rset_no); @@ -1150,6 +1214,12 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, if (min_nn > rset[i]->rset_terms[j]->nn) min_nn = rset[i]->rset_terms[j]->nn; flags = nflags; + term_type = rset[i]->rset_terms[j]->type; + + /* only if all term types are of type characterString .. */ + /* the resulting term is of that type */ + if (term_type != Z_Term_characterString) + term_type = Z_Term_general; } } for (i = 0; inn = 0; result = rset_create (rset_kind_null, &parms); } @@ -1181,7 +1251,7 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, RSFD rsfd_result; parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags); + flags, term_type); parms.rset_term->nn = min_nn; parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); @@ -1240,7 +1310,7 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, logf (LOG_LOG, "generic prox, dist = %d, relation = %d, ordered =%d, exclusion=%d", distance, relation, ordered, exclusion); parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags); + flags, term_type); parms.rset_term->nn = min_nn; parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); @@ -1320,7 +1390,7 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no, rset_null_parms parms; parms.rset_term = rset_term_create (prox_term, length_prox_term, - flags); + flags, term_type); parms.rset_term->nn = 0; result = rset_create (rset_kind_null, &parms); } @@ -1408,6 +1478,8 @@ static int grep_info_prepare (ZebraHandle zh, grep_info->reg_type = reg_type; grep_info->termset = 0; + if (!zapt) + return 0; attr_init (&termset, zapt, 8); termset_value_numeric = attr_find_ex (&termset, NULL, &termset_value_string); @@ -1442,7 +1514,7 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, oid_value attributeSet, NMEM stream, int reg_type, int complete_flag, - const char *rank_type, + const char *rank_type, int xpath_use, int num_bases, char **basenames) { char term_dst[IT_MAX_WORD+1]; @@ -1462,7 +1534,8 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, - term_dst, rank_type); + term_dst, rank_type, + xpath_use); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1473,7 +1546,8 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, { rset_null_parms parms; - parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type, + zapt->term->which); return rset_create (rset_kind_null, &parms); } else if (rset_no == 1) @@ -1491,6 +1565,7 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, NMEM stream, int reg_type, int complete_flag, const char *rank_type, + int xpath_use, int num_bases, char **basenames) { char term_dst[IT_MAX_WORD+1]; @@ -1509,7 +1584,8 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, - term_dst, rank_type); + term_dst, rank_type, + xpath_use); if (!rset[rset_no]) break; if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) @@ -1520,7 +1596,8 @@ static RSET rpn_search_APT_or_list (ZebraHandle zh, { rset_null_parms parms; - parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type, + zapt->term->which); return rset_create (rset_kind_null, &parms); } result = rset[0]; @@ -1543,7 +1620,8 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, oid_value attributeSet, NMEM stream, int reg_type, int complete_flag, - const char *rank_type, + const char *rank_type, + int xpath_use, int num_bases, char **basenames) { char term_dst[IT_MAX_WORD+1]; @@ -1562,7 +1640,8 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, - term_dst, rank_type); + term_dst, rank_type, + xpath_use); if (!rset[rset_no]) break; assert (rset[rset_no]); @@ -1574,7 +1653,8 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, { rset_null_parms parms; - parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type, + zapt->term->which); return rset_create (rset_kind_null, &parms); } result = rset[0]; @@ -1766,7 +1846,8 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, rset[rset_no] = rset_trunc (zh, grep_info.isam_p_buf, grep_info.isam_p_indx, term_dst, strlen(term_dst), rank_type, - 0 /* preserve position */); + 0 /* preserve position */, + zapt->term->which); assert (rset[rset_no]); if (++rset_no >= (int) (sizeof(rset)/sizeof(*rset))) break; @@ -1776,7 +1857,8 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, { rset_null_parms parms; - parms.rset_term = rset_term_create (term_dst, -1, rank_type); + parms.rset_term = rset_term_create (term_dst, -1, rank_type, + zapt->term->which); return rset_create (rset_kind_null, &parms); } result = rset[0]; @@ -1804,7 +1886,8 @@ static RSET rpn_search_APT_local (ZebraHandle zh, Z_AttributesPlusTerm *zapt, struct it_key key; rset_temp_parms parms; - parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type, + zapt->term->which); parms.cmp = key_compare_it; parms.key_size = sizeof (struct it_key); parms.temp_path = res_get (zh->res, "setTmpDir"); @@ -1917,127 +2000,329 @@ static RSET rpn_sort_spec (ZebraHandle zh, Z_AttributesPlusTerm *zapt, sort_sequence->specs[i] = sks; - parms.rset_term = rset_term_create (termz, -1, rank_type); + parms.rset_term = rset_term_create (termz, -1, rank_type, + zapt->term->which); return rset_create (rset_kind_null, &parms); } -static RSET rpn_search_xpath (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, - int num_bases, char **basenames, - NMEM stream, const char *rank_type, RSET rset) +struct xpath_predicate { + int which; + union { +#define XPATH_PREDICATE_RELATION 1 + struct { + char *name; + char *op; + char *value; + } relation; +#define XPATH_PREDICATE_BOOLEAN 2 + struct { + const char *op; + struct xpath_predicate *left; + struct xpath_predicate *right; + } boolean; + } u; +}; + +struct xpath_location_step { + char *part; + struct xpath_predicate *predicate; +}; + +static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, + struct xpath_location_step *xpath, NMEM mem) { + oid_value curAttributeSet = attributeSet; AttrType use; const char *use_string = 0; - oid_value curAttributeSet = attributeSet; - char term_dict[2048]; - int base_no; - struct grep_info grep_info; - struct rpn_char_map_info rcmi; - - yaz_log (LOG_LOG, "rpn_search_xpath 1"); + const char *cp; + int no = 0; + attr_init (&use, zapt, 1); attr_find_ex (&use, &curAttributeSet, &use_string); - if (curAttributeSet != VAL_IDXPATH) + if (!use_string || *use_string != '/') + return -1; + cp = use_string; + while (*cp) { - yaz_log (LOG_LOG, "rpn_search_xpath - not 1"); - return rset; + int i = 0; + while (*cp && !strchr("/[",*cp)) + { + i++; + cp++; + } + xpath[no].predicate = 0; + xpath[no].part = nmem_malloc (mem, i+1); + memcpy (xpath[no].part, cp - i, i); + xpath[no].part[i] = 0; + + if (*cp == '[') + { + struct xpath_predicate *p = xpath[no].predicate = + nmem_malloc (mem, sizeof(struct xpath_predicate)); + + p->which = XPATH_PREDICATE_RELATION; + cp++; + while (*cp == ' ') + cp++; + + for (i = 0; *cp && !strchr("><=] ", *cp); i++) + cp++; + p->u.relation.name = nmem_malloc (mem, i+1); + memcpy (p->u.relation.name, cp - i, i); + p->u.relation.name[i] = 0; + while (*cp == ' ') + cp++; + if (*cp != ']') + { + for (i = 0; *cp && strchr(">=u.relation.op = nmem_malloc (mem, i+1); + if (i) + memcpy (p->u.relation.op, cp - i, i); + p->u.relation.op[i] = 0; + + while (*cp == ' ') + cp++; + + if (strchr("\"'", *cp)) + { + cp++; + for (i = 0; *cp && !strchr("\"'", *cp); i++) + cp++; + + p->u.relation.value = nmem_malloc (mem, i+1); + if (i) + memcpy (p->u.relation.value, cp - i, i); + p->u.relation.value[i] = 0; + yaz_log (LOG_LOG, "value=%s", p->u.relation.value); + + cp++; + } + else + { + for (i = 0; *cp && !strchr(" ]", *cp); i++) + cp++; + p->u.relation.value = nmem_malloc (mem, i+1); + if (i) + memcpy (p->u.relation.value, cp - i, i); + p->u.relation.value[i] = 0; + } + while (*cp == ' ') + cp++; + } + if (*cp == ']') + cp++; + } /* end of ] predicate */ + no++; + if (*cp != '/') + break; + cp++; + } + return no; +} + + +static RSET xpath_trunc(ZebraHandle zh, NMEM stream, + int reg_type, const char *term, int use, + oid_value curAttributeSet) +{ + RSET rset; + struct grep_info grep_info; + char term_dict[2048]; + char ord_buf[32]; + int prefix_len = 0; + int ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, use); + int ord_len, i, r, max_pos; + int term_type = Z_Term_characterString; + const char *flags = "void"; + + if (grep_info_prepare (zh, 0 /* zapt */, &grep_info, '0', stream)) + { + rset_null_parms parms; + + parms.rset_term = rset_term_create (term, strlen(term), + flags, term_type); + parms.rset_term->nn = 0; + return rset_create (rset_kind_null, &parms); } - if (!use_string) + + if (ord < 0) { - yaz_log (LOG_LOG, "rpn_search_xpath - not 2"); + rset_null_parms parms; + + parms.rset_term = rset_term_create (term, strlen(term), + flags, term_type); + parms.rset_term->nn = 0; + return rset_create (rset_kind_null, &parms); + } + if (prefix_len) + term_dict[prefix_len++] = '|'; + else + term_dict[prefix_len++] = '('; + + ord_len = key_SU_encode (ord, ord_buf); + for (i = 0; ireg->dict, term_dict, 0, + &grep_info, &max_pos, 0, grep_handle); + yaz_log (LOG_LOG, "%s %d positions", term, + grep_info.isam_p_indx); + rset = rset_trunc (zh, grep_info.isam_p_buf, + grep_info.isam_p_indx, term, strlen(term), + flags, 1, term_type); + grep_info_delete (&grep_info); + return rset; +} + +static RSET rpn_search_xpath (ZebraHandle zh, + oid_value attributeSet, + int num_bases, char **basenames, + NMEM stream, const char *rank_type, RSET rset, + int xpath_len, struct xpath_location_step *xpath) +{ + oid_value curAttributeSet = attributeSet; + int base_no; + int i; + + if (xpath_len < 0) return rset; + + yaz_log (LOG_LOG, "len=%d", xpath_len); + for (i = 0; ireg, '0', &rcmi); + curAttributeSet = VAL_IDXPATH; - if (grep_info_prepare (zh, zapt, &grep_info, '0', stream)) - return 0; + /* + //a -> a/.* + //a/b -> b/a/.* + /a -> a/ + /a/b -> b/a/ + + / -> none + + a[@attr=value]/b[@other=othervalue] + + /e/@a val range(e/,range(@a,freetext(w,1015,val),@a),e/) + /a/b val range(b/a/,freetext(w,1016,val),b/a/) + /a/b/@c val range(b/a/,range(@c,freetext(w,1016,val),@c),b/a/) + /a/b[@c=y] val range(b/a/,freetext(w,1016,val),b/a/,@c=y) + /a[@c=y]/b val range(a/,range(b/a/,freetext(w,1016,val),b/a/),a/,@c=y) + /a[@c=x]/b[@c=y] range(a/,range(b/a/,freetext(w,1016,val),b/a/,@c=y),a/,@c=x) + + */ + + dict_grep_cmap (zh->reg->dict, 0, 0); - yaz_log (LOG_LOG, "rpn_search_xpath 2"); for (base_no = 0; base_no < num_bases; base_no++) { - rset_between_parms parms; - RSET rset_start_tag, rset_end_tag; - int ord, ord_len, i, r, max_pos; - int prefix_len ; - char ord_buf[32]; + int level = xpath_len; + int first_path = 1; + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { zh->errCode = 109; /* Database unavailable */ zh->errString = basenames[base_no]; return rset; } - - prefix_len = 0; - ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, 1); - if (ord < 0) - continue; - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; - - ord_len = key_SU_encode (ord, ord_buf); - for (i = 0; ireg->dict, term_dict, 0, - &grep_info, &max_pos, 0, grep_handle); - yaz_log (LOG_LOG, "%s %d positions", use_string, - grep_info.isam_p_indx); - rset_start_tag = - rset_trunc (zh, grep_info.isam_p_buf, - grep_info.isam_p_indx, use_string, strlen(use_string), - rank_type, 1); - - prefix_len = 0; - ord = zebraExplain_lookupSU (zh->reg->zei, curAttributeSet, 2); - if (ord < 0) - continue; - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; - - ord_len = key_SU_encode (ord, ord_buf); - for (i = 0; i= 0) { - term_dict[prefix_len++] = 1; - term_dict[prefix_len++] = ord_buf[i]; + char xpath_rev[128]; + int i, len; + rset_between_parms parms; + RSET rset_start_tag = 0, rset_end_tag = 0, rset_attr = 0; + + *xpath_rev = 0; + len = 0; + for (i = level; i >= 1; --i) + { + const char *cp = xpath[i].part; + if (*cp) + { + for (;*cp; cp++) + if (*cp == '*') + { + memcpy (xpath_rev + len, "[^/]*", 5); + len += 5; + } + else if (*cp == ' ') + { + + xpath_rev[len++] = 1; + xpath_rev[len++] = ' '; + } + + else + xpath_rev[len++] = *cp; + xpath_rev[len++] = '/'; + } + else if (i == 1) /* // case */ + { + xpath_rev[len++] = '.'; + xpath_rev[len++] = '*'; + } + } + xpath_rev[len] = 0; + + if (xpath[level].predicate && + xpath[level].predicate->which == XPATH_PREDICATE_RELATION && + xpath[level].predicate->u.relation.name[0]) + { + char predicate_str[128]; + + strcpy (predicate_str, + xpath[level].predicate->u.relation.name+1); + if (xpath[level].predicate->u.relation.value) + { + strcat (predicate_str, "="); + strcat (predicate_str, + xpath[level].predicate->u.relation.value); + } + rset_attr = xpath_trunc ( + zh, stream, '0', predicate_str, 3, curAttributeSet); + } + else + { + if (!first_path) + continue; + } + yaz_log (LOG_LOG, "xpath_rev (%d) = %s", level, xpath_rev); + if (strlen(xpath_rev)) + { + rset_start_tag = xpath_trunc(zh, stream, + '0', xpath_rev, 1, curAttributeSet); + + rset_end_tag = xpath_trunc(zh, stream, + '0', xpath_rev, 2, curAttributeSet); + + parms.key_size = sizeof(struct it_key); + parms.cmp = key_compare_it; + parms.rset_l = rset_start_tag; + parms.rset_m = rset; + parms.rset_r = rset_end_tag; + parms.rset_attr = rset_attr; + parms.printer = key_print_it; + rset = rset_create (rset_kind_between, &parms); + } + first_path = 0; } - term_dict[prefix_len++] = ')'; - term_dict[prefix_len++] = 1; - term_dict[prefix_len++] = '0'; - strcpy (term_dict+prefix_len, use_string); - grep_info.isam_p_indx = 0; - r = dict_lookup_grep (zh->reg->dict, term_dict, 0, - &grep_info, &max_pos, 0, grep_handle); - - yaz_log (LOG_LOG, "%s %d positions", use_string, - grep_info.isam_p_indx); - rset_end_tag = - rset_trunc (zh, grep_info.isam_p_buf, - grep_info.isam_p_indx, use_string, strlen(use_string), - rank_type, 1); - - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.rset_l = rset_start_tag; - parms.rset_m = rset; - parms.rset_r = rset_end_tag; - yaz_log (LOG_LOG, "rpn_search_xpath 4"); - rset = rset_create (rset_kind_between, &parms); } - grep_info_delete (&grep_info); return rset; } @@ -2056,6 +2341,9 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int sort_flag; char termz[IT_MAX_WORD+1]; RSET rset = 0; + int xpath_len; + int xpath_use = 0; + struct xpath_location_step xpath[10]; zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, rank_type, &complete_flag, &sort_flag); @@ -2065,33 +2353,39 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, logf (LOG_DEBUG, "search_type=%s", search_type); logf (LOG_DEBUG, "rank_type=%s", rank_type); - if (zapt->term->which != Z_Term_general) - { - zh->errCode = 124; - return NULL; - } - trans_term (zh, zapt, termz); + if (trans_term (zh, zapt, termz)) + return 0; if (sort_flag) return rpn_sort_spec (zh, zapt, attributeSet, stream, sort_sequence, rank_type); + xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, stream); + if (xpath_len >= 0) + { + xpath_use = 1016; + if (xpath[xpath_len-1].part[0] == '@') + xpath_use = 1015; + } if (!strcmp (search_type, "phrase")) { rset = rpn_search_APT_phrase (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, + xpath_use, num_bases, basenames); } else if (!strcmp (search_type, "and-list")) { rset = rpn_search_APT_and_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, + xpath_use, num_bases, basenames); } else if (!strcmp (search_type, "or-list")) { rset = rpn_search_APT_or_list (zh, zapt, termz, attributeSet, stream, reg_id, complete_flag, rank_type, + xpath_use, num_bases, basenames); } else if (!strcmp (search_type, "local")) @@ -2105,10 +2399,14 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, reg_id, complete_flag, rank_type, num_bases, basenames); } + else if (!strcmp (search_type, "always")) + { + rset = 0; + } else zh->errCode = 118; - return rpn_search_xpath (zh, zapt, attributeSet, num_bases, basenames, - stream, rank_type, rset); + return rpn_search_xpath (zh, attributeSet, num_bases, basenames, + stream, rank_type, rset, xpath_len, xpath); } static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, @@ -2515,7 +2813,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, &glist[i+before].term, mterm); rset = rset_trunc (zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, glist[i+before].term, strlen(glist[i+before].term), - NULL, 0); + NULL, 0, zapt->term->which); ptr[j0]++; for (j = j0+1; jterm->which); bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it; @@ -2581,7 +2880,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, rset = rset_trunc (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1, glist[before-1-i].term, strlen(glist[before-1-i].term), - NULL, 0); + NULL, 0, zapt->term->which); ptr[j0]++; @@ -2597,7 +2896,8 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, rset2 = rset_trunc (zh, &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1, glist[before-1-i].term, - strlen(glist[before-1-i].term), NULL, 0); + strlen(glist[before-1-i].term), NULL, 0, + zapt->term->which); bool_parms.key_size = sizeof(struct it_key); bool_parms.cmp = key_compare_it;