X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=a559a3d2c9b1a8956fd04f5a3c5891162a711bf7;hb=e92856ea4fecc1a5ea6875ad47797d462fd5fcae;hp=f5da395f7ad3c19ef8b44b0ea9066ebb302eba67;hpb=6ba9698e88c0283e40fa5980a1a6b551fff2d597;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index f5da395..a559a3d 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.214 2006-05-19 13:49:34 adam Exp $ +/* $Id: zrpn.c,v 1.221 2006-06-23 11:21:38 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -66,7 +66,7 @@ static const char **rpn_char_map_handler(void *vp, const char **from, int len) } static void rpn_char_map_prepare(struct zebra_register *reg, int reg_type, - struct rpn_char_map_info *map_info) + struct rpn_char_map_info *map_info) { map_info->zm = reg->zebra_maps; map_info->reg_type = reg_type; @@ -151,19 +151,19 @@ static void add_isam_p(const char *name, const char *info, if (p->termset) { const char *db; - int set, use; char term_tmp[IT_MAX_WORD]; int ord = 0; + const char *index_name; int len = key_SU_decode (&ord, (const unsigned char *) name); zebra_term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); yaz_log(log_level_rpn, "grep: %d %c %s", ord, name[len], term_tmp); - zebraExplain_lookup_ord (p->zh->reg->zei, - ord, 0 /* index_type */, &db, &set, &use, 0); - yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db); + zebraExplain_lookup_ord(p->zh->reg->zei, + ord, 0 /* index_type */, &db, &index_name); + yaz_log(log_level_rpn, "grep: db=%s index=%s", db, index_name); resultSetAddTerm(p->zh, p->termset, name[len], db, - set, use, term_tmp); + index_name, term_tmp); } #endif (p->isam_p_indx)++; @@ -199,7 +199,7 @@ static int term_pre(ZebraMaps zebra_maps, int reg_type, const char **src, } -static void esc_str(char *out_buf, int out_size, +static void esc_str(char *out_buf, size_t out_size, const char *in_buf, int in_size) { int k; @@ -883,7 +883,6 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, break; case 3: case 102: - case 103: case -1: if (!**term_sub) return 1; @@ -895,6 +894,12 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, strcat(term_tmp, term_component); strcat(term_tmp, ")"); break; + case 103: + yaz_log(log_level_rpn, "Relation always matches"); + /* skip to end of term (we don't care what it is) */ + while (**term_sub != '\0') + (*term_sub)++; + break; default: *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; return 0; @@ -979,8 +984,7 @@ static ZEBRA_RES term_trunc(ZebraHandle zh, const char *term_ref_id_str = 0; *rset = 0; - term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, - stream); + term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream); grep_info->isam_p_indx = 0; res = string_term(zh, zapt, term_sub, attributeSet, stream, grep_info, reg_type, complete_flag, num_bases, basenames, @@ -1015,7 +1019,6 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, int j, r, base_no; AttrType truncation; int truncation_value; - oid_value curAttributeSet = attributeSet; const char *termp; struct rpn_char_map_info rcmi; int space_split = complete_flag ? 0 : 1; @@ -1032,20 +1035,13 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, for (base_no = 0; base_no < num_bases; base_no++) { int ord = -1; - int attr_ok = 0; int regex_range = 0; - int init_pos = 0; -#if 0 - attent attp; - data1_local_attribute id_xpath_attr; - data1_local_attribute *local_attr; -#endif int max_pos, prefix_len = 0; int relation_error; char ord_buf[32]; int ord_len, i; - termp = *term_sub; + termp = *term_sub; /* start of term for each database */ if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { @@ -1054,32 +1050,21 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, return ZEBRA_FAIL; } - if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, - curAttributeSet, &ord) - != ZEBRA_OK) - { - break; - } + if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, + attributeSet, &ord) != ZEBRA_OK) + continue; + + bases_ok++; + *ol = ord_list_append(stream, *ol, ord); - - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; - ord_len = key_SU_encode (ord, ord_buf); + + term_dict[prefix_len++] = '('; for (i = 0; i init_pos) - init_pos = ord_len; - - bases_ok++; - if (prefix_len) - attr_ok = 1; - term_dict[prefix_len++] = ')'; term_dict[prefix_len] = '\0'; j = prefix_len; @@ -1087,10 +1072,10 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, { case -1: /* not specified */ case 100: /* do not truncate */ - if (!string_relation (zh, zapt, &termp, term_dict, - attributeSet, - reg_type, space_split, term_dst, - &relation_error)) + if (!string_relation(zh, zapt, &termp, term_dict, + attributeSet, + reg_type, space_split, term_dst, + &relation_error)) { if (relation_error) { @@ -1199,21 +1184,19 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, truncation_value); return ZEBRA_FAIL; } - if (attr_ok) + if (1) { char buf[80]; const char *input = term_dict + prefix_len; esc_str(buf, sizeof(buf), input, strlen(input)); } - if (attr_ok) - { - yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_dict+prefix_len); - r = dict_lookup_grep(zh->reg->dict, term_dict, regex_range, - grep_info, &max_pos, init_pos, - grep_handle); - if (r) - yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r); - } + yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_dict+prefix_len); + r = dict_lookup_grep(zh->reg->dict, term_dict, regex_range, + grep_info, &max_pos, + ord_len /* number of "exact" chars */, + grep_handle); + if (r) + yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r); } if (!bases_ok) return ZEBRA_FAIL; @@ -1403,9 +1386,7 @@ static ZEBRA_RES term_list_trunc(ZebraHandle zh, struct grep_info grep_info; const char *termp = termz; int alloc_sets = 0; - int empty_term = *termz ? 0 : 1; - empty_term = 0; *num_result_sets = 0; *term_dst = 0; if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL) @@ -1444,8 +1425,6 @@ static ZEBRA_RES term_list_trunc(ZebraHandle zh, break; (*num_result_sets)++; - if (empty_term) - break; if (!*termp) break; } @@ -1478,14 +1457,14 @@ static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh, if (res != ZEBRA_OK) return res; if (num_result_sets == 0) - *rset = rsnull_create (rset_nmem, kc, 0); + *rset = rset_create_null(rset_nmem, kc, 0); else if (num_result_sets == 1) *rset = result_sets[0]; else - *rset = rsprox_create(rset_nmem, kc, kc->scope, - num_result_sets, result_sets, - 1 /* ordered */, 0 /* exclusion */, - 3 /* relation */, 1 /* distance */); + *rset = rset_create_prox(rset_nmem, kc, kc->scope, + num_result_sets, result_sets, + 1 /* ordered */, 0 /* exclusion */, + 3 /* relation */, 1 /* distance */); if (!*rset) return ZEBRA_FAIL; return ZEBRA_OK; @@ -1516,12 +1495,12 @@ static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh, if (res != ZEBRA_OK) return res; if (num_result_sets == 0) - *rset = rsnull_create (rset_nmem, kc, 0); + *rset = rset_create_null(rset_nmem, kc, 0); else if (num_result_sets == 1) *rset = result_sets[0]; else - *rset = rsmulti_or_create(rset_nmem, kc, kc->scope, 0 /* termid */, - num_result_sets, result_sets); + *rset = rset_create_or(rset_nmem, kc, kc->scope, 0 /* termid */, + num_result_sets, result_sets); if (!*rset) return ZEBRA_FAIL; return ZEBRA_OK; @@ -1553,12 +1532,12 @@ static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh, if (res != ZEBRA_OK) return res; if (num_result_sets == 0) - *rset = rsnull_create (rset_nmem, kc, 0); + *rset = rset_create_null(rset_nmem, kc, 0); else if (num_result_sets == 1) *rset = result_sets[0]; else - *rset = rsmulti_and_create(rset_nmem, kc, kc->scope, - num_result_sets, result_sets); + *rset = rset_create_and(rset_nmem, kc, kc->scope, + num_result_sets, result_sets); if (!*rset) return ZEBRA_FAIL; return ZEBRA_OK; @@ -1586,33 +1565,54 @@ static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, yaz_log(log_level_rpn, "numeric relation value=%d", relation_value); - if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, - term_dst)) - return 0; - term_value = atoi (term_tmp); switch (relation_value) { case 1: yaz_log(log_level_rpn, "Relation <"); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); gen_regular_rel(term_tmp, term_value-1, 1); break; case 2: yaz_log(log_level_rpn, "Relation <="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); gen_regular_rel(term_tmp, term_value, 1); break; case 4: yaz_log(log_level_rpn, "Relation >="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); gen_regular_rel(term_tmp, term_value, 0); break; case 5: yaz_log(log_level_rpn, "Relation >"); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); gen_regular_rel(term_tmp, term_value+1, 0); break; case -1: case 3: yaz_log(log_level_rpn, "Relation ="); + if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_tmp, 1, + term_dst)) + return 0; + term_value = atoi (term_tmp); sprintf(term_tmp, "(0*%d)", term_value); break; + case 103: + /* term_tmp untouched.. */ + while (**term_sub != '\0') + (*term_sub)++; + break; default: *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; return 0; @@ -1628,22 +1628,23 @@ static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char **term_sub, - oid_value attributeSet, + oid_value attributeSet, NMEM stream, struct grep_info *grep_info, int reg_type, int complete_flag, int num_bases, char **basenames, char *term_dst, const char *xpath_use, - NMEM stream) + struct ord_list **ol) { char term_dict[2*IT_MAX_WORD+2]; int base_no; - oid_value curAttributeSet = attributeSet; const char *termp; struct rpn_char_map_info rcmi; int bases_ok = 0; /* no of databases with OK attribute */ + *ol = ord_list_create(stream); + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); for (base_no = 0; base_no < num_bases; base_no++) @@ -1663,26 +1664,23 @@ static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, - curAttributeSet, &ord) - != ZEBRA_OK) - { - break; - } + attributeSet, &ord) != ZEBRA_OK) + continue; + bases_ok++; + + *ol = ord_list_append(stream, *ol, ord); - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; - ord_len = key_SU_encode (ord, ord_buf); + + term_dict[prefix_len++] = '('; for (i = 0; i < ord_len; i++) { term_dict[prefix_len++] = 1; - term_dict[prefix_len++] = ord_buf[i]; + term_dict[prefix_len++] = ord_buf[i]; } - bases_ok++; term_dict[prefix_len++] = ')'; term_dict[prefix_len] = '\0'; + if (!numeric_relation(zh, zapt, &termp, term_dict, attributeSet, grep_info, &max_pos, reg_type, term_dst, &relation_error)) @@ -1734,6 +1732,7 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh, return ZEBRA_FAIL; while (1) { + struct ord_list *ol; if (alloc_sets == num_result_sets) { int add = 10; @@ -1746,10 +1745,9 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh, } yaz_log(YLOG_DEBUG, "APT_numeric termp=%s", termp); grep_info.isam_p_indx = 0; - res = numeric_term(zh, zapt, &termp, attributeSet, &grep_info, + res = numeric_term(zh, zapt, &termp, attributeSet, stream, &grep_info, reg_type, complete_flag, num_bases, basenames, - term_dst, xpath_use, - stream); + term_dst, xpath_use, &ol); if (res == ZEBRA_FAIL || termp == 0) break; yaz_log(YLOG_DEBUG, "term: %s", term_dst); @@ -1759,30 +1757,28 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh, strlen(term_dst), rank_type, 0 /* preserve position */, zapt->term->which, rset_nmem, - kc, kc->scope, 0, reg_type, + kc, kc->scope, ol, reg_type, hits_limit_value, term_ref_id_str); if (!result_sets[num_result_sets]) break; num_result_sets++; + if (!*termp) + break; } grep_info_delete(&grep_info); - if (termp) - { - int i; - for (i = 0; iscope, - num_result_sets, result_sets); + *rset = rset_create_and(rset_nmem, kc, kc->scope, + num_result_sets, result_sets); if (!*rset) - return ZEBRA_FAIL; + return ZEBRA_FAIL; return ZEBRA_OK; } @@ -1798,8 +1794,8 @@ static ZEBRA_RES rpn_search_APT_local(ZebraHandle zh, RSFD rsfd; struct it_key key; int sys; - *rset = rstemp_create(rset_nmem, kc, kc->scope, - res_get (zh->res, "setTmpDir"),0 ); + *rset = rset_create_temp(rset_nmem, kc, kc->scope, + res_get (zh->res, "setTmpDir"),0 ); rsfd = rset_open(*rset, RSETF_WRITE); sys = atoi(termz); @@ -1886,14 +1882,15 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt, sks->which = Z_SortKeySpec_null; sks->u.null = odr_nullval (); sort_sequence->specs[i] = sks; - *rset = rsnull_create (rset_nmem, kc, 0); + *rset = rset_create_null(rset_nmem, kc, 0); return ZEBRA_OK; } -static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, - struct xpath_location_step *xpath, int max, NMEM mem) +static int rpn_check_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, + struct xpath_location_step *xpath, int max, + NMEM mem) { oid_value curAttributeSet = attributeSet; AttrType use; @@ -1913,7 +1910,7 @@ static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, static RSET xpath_trunc(ZebraHandle zh, NMEM stream, int reg_type, const char *term, const char *xpath_use, - oid_value curAttributeSet, NMEM rset_nmem, + NMEM rset_nmem, struct rset_key_control *kc) { RSET rset; @@ -1921,17 +1918,19 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, char term_dict[2048]; char ord_buf[32]; int prefix_len = 0; - int ord = zebraExplain_lookup_attr_str(zh->reg->zei, reg_type, + int ord = zebraExplain_lookup_attr_str(zh->reg->zei, + zinfo_index_category_index, + reg_type, xpath_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') == ZEBRA_FAIL) - return rsnull_create(rset_nmem, kc, 0); + return rset_create_null(rset_nmem, kc, 0); if (ord < 0) - return rsnull_create(rset_nmem, kc, 0); + return rset_create_null(rset_nmem, kc, 0); if (prefix_len) term_dict[prefix_len++] = '|'; else @@ -1962,7 +1961,6 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, static ZEBRA_RES 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, @@ -1970,9 +1968,9 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh, RSET *rset_out, struct rset_key_control *kc) { - oid_value curAttributeSet = attributeSet; int base_no; int i; + int always_matches = rset ? 0 : 1; if (xpath_len < 0) { @@ -1987,8 +1985,6 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh, } - curAttributeSet = VAL_IDXPATH; - /* //a -> a/.* //a/b -> b/a/.* @@ -2024,42 +2020,33 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh, } while (--level >= 0) { - char xpath_rev[128]; - int i, len; + WRBUF xpath_rev = wrbuf_alloc(); + int i; 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++) + for (; *cp; cp++) + { if (*cp == '*') - { - memcpy (xpath_rev + len, "[^/]*", 5); - len += 5; - } + wrbuf_puts(xpath_rev, "[^/]*"); else if (*cp == ' ') - { - - xpath_rev[len++] = 1; - xpath_rev[len++] = ' '; - } - + wrbuf_puts(xpath_rev, "\001 "); else - xpath_rev[len++] = *cp; - xpath_rev[len++] = '/'; + wrbuf_putc(xpath_rev, *cp); + + /* wrbuf_putc does not null-terminate , but + wrbuf_puts below ensures it does.. so xpath_rev + is OK iff length is > 0 */ + } + wrbuf_puts(xpath_rev, "/"); } else if (i == 1) /* // case */ - { - xpath_rev[len++] = '.'; - xpath_rev[len++] = '*'; - } + wrbuf_puts(xpath_rev, ".*"); } - xpath_rev[len] = 0; - if (xpath[level].predicate && xpath[level].predicate->which == XPATH_PREDICATE_RELATION && xpath[level].predicate->u.relation.name[0]) @@ -2082,33 +2069,40 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh, wrbuf_puts(wbuf, ""); rset_attr = xpath_trunc( zh, stream, '0', wrbuf_buf(wbuf), ZEBRA_XPATH_ATTR_NAME, - curAttributeSet, rset_nmem, kc); + rset_nmem, kc); wrbuf_free(wbuf, 1); } else { if (!first_path) + { + wrbuf_free(xpath_rev, 1); continue; + } } - yaz_log(log_level_rpn, "xpath_rev (%d) = %s", level, xpath_rev); - if (strlen(xpath_rev)) + yaz_log(log_level_rpn, "xpath_rev (%d) = %.*s", level, + wrbuf_len(xpath_rev), wrbuf_buf(xpath_rev)); + if (wrbuf_len(xpath_rev)) { rset_start_tag = xpath_trunc(zh, stream, '0', - xpath_rev, + wrbuf_buf(xpath_rev), ZEBRA_XPATH_ELM_BEGIN, - curAttributeSet, rset_nmem, kc); - - rset_end_tag = xpath_trunc(zh, stream, '0', - xpath_rev, - ZEBRA_XPATH_ELM_END, - curAttributeSet, - rset_nmem, kc); - - rset = rsbetween_create(rset_nmem, kc, kc->scope, - rset_start_tag, rset, - rset_end_tag, rset_attr); + if (always_matches) + rset = rset_start_tag; + else + { + rset_end_tag = xpath_trunc(zh, stream, '0', + wrbuf_buf(xpath_rev), + ZEBRA_XPATH_ELM_END, + rset_nmem, kc); + + rset = rset_create_between(rset_nmem, kc, kc->scope, + rset_start_tag, rset, + rset_end_tag, rset_attr); + } } + wrbuf_free(xpath_rev, 1); first_path = 0; } } @@ -2116,6 +2110,8 @@ ZEBRA_RES rpn_search_xpath(ZebraHandle zh, return ZEBRA_OK; } +#define MAX_XPATH_STEPS 10 + static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, NMEM stream, Z_SortKeySpecList *sort_sequence, @@ -2133,7 +2129,7 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, char termz[IT_MAX_WORD+1]; int xpath_len; const char *xpath_use = 0; - struct xpath_location_step xpath[10]; + struct xpath_location_step xpath[MAX_XPATH_STEPS]; if (!log_level_set) { @@ -2155,13 +2151,31 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, return rpn_sort_spec(zh, zapt, attributeSet, stream, sort_sequence, rank_type, rset_nmem, rset, kc); /* consider if an X-Path query is used */ - xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream); + xpath_len = rpn_check_xpath(zh, zapt, attributeSet, + xpath, MAX_XPATH_STEPS, stream); if (xpath_len >= 0) { if (xpath[xpath_len-1].part[0] == '@') xpath_use = ZEBRA_XPATH_ATTR_CDATA; /* last step is attribute */ else xpath_use = ZEBRA_XPATH_CDATA; /* searching for cdata */ + + if (1) + { + AttrType relation; + int relation_value; + + attr_init_APT(&relation, zapt, 2); + relation_value = attr_find(&relation, NULL); + + if (relation_value == 103) /* alwaysmatches */ + { + *rset = 0; /* signal no "term" set */ + return rpn_search_xpath(zh, num_bases, basenames, + stream, rank_type, *rset, + xpath_len, xpath, rset_nmem, rset, kc); + } + } } /* search using one of the various search type strategies @@ -2209,25 +2223,16 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, num_bases, basenames, rset_nmem, rset, kc); } - else if (!strcmp(search_type, "always")) - { - *termz = '\0'; - res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, - xpath_use, - num_bases, basenames, rset_nmem, - rset, kc); - } else { - zebra_setError(zh, YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE, 0); + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); res = ZEBRA_FAIL; } if (res != ZEBRA_OK) return res; if (!*rset) return ZEBRA_FAIL; - return rpn_search_xpath(zh, attributeSet, num_bases, basenames, + return rpn_search_xpath(zh, num_bases, basenames, stream, rank_type, *rset, xpath_len, xpath, rset_nmem, rset, kc); } @@ -2345,20 +2350,20 @@ ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, switch (zop->which) { case Z_Operator_and: - rset = rsmulti_and_create(rset_nmem, kc, - kc->scope, - *num_result_sets, *result_sets); + rset = rset_create_and(rset_nmem, kc, + kc->scope, + *num_result_sets, *result_sets); break; case Z_Operator_or: - rset = rsmulti_or_create(rset_nmem, kc, - kc->scope, 0, /* termid */ - *num_result_sets, *result_sets); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0, /* termid */ + *num_result_sets, *result_sets); break; case Z_Operator_and_not: - rset = rsbool_create_not(rset_nmem, kc, - kc->scope, - (*result_sets)[0], - (*result_sets)[1]); + rset = rset_create_not(rset_nmem, kc, + kc->scope, + (*result_sets)[0], + (*result_sets)[1]); break; case Z_Operator_prox: if (zop->u.prox->which != Z_ProximityOperator_known) @@ -2377,14 +2382,14 @@ ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, } else { - rset = rsprox_create(rset_nmem, kc, - kc->scope, - *num_result_sets, *result_sets, - *zop->u.prox->ordered, - (!zop->u.prox->exclusion ? - 0 : *zop->u.prox->exclusion), - *zop->u.prox->relationType, - *zop->u.prox->distance ); + rset = rset_create_prox(rset_nmem, kc, + kc->scope, + *num_result_sets, *result_sets, + *zop->u.prox->ordered, + (!zop->u.prox->exclusion ? + 0 : *zop->u.prox->exclusion), + *zop->u.prox->relationType, + *zop->u.prox->distance ); } break; default: @@ -2535,6 +2540,8 @@ static void count_set(ZebraHandle zh, RSET rset, zint *count) *count = rset->hits_count; } +#define RPN_MAX_ORDS 32 + ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, int num_bases, char **basenames, @@ -2548,17 +2555,10 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int after; int base_no; char termz[IT_MAX_WORD+20]; - AttrType use; - int use_value; - const char *use_string = 0; struct scan_info *scan_info_array; ZebraScanEntry *glist; - int ords[32], ord_no = 0; - int ptr[32]; - - int bases_ok = 0; /* no of databases with OK attribute */ - int errCode = 0; /* err code (if any is not OK) */ - char *errString = 0; /* addinfo */ + int ords[RPN_MAX_ORDS], ord_no = 0; + int ptr[RPN_MAX_ORDS]; unsigned index_type; char *search_type = NULL; @@ -2603,9 +2603,6 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d", pos, num, attributeset); - attr_init_APT(&use, zapt, 1); - use_value = attr_find_ex(&use, &attributeset, &use_string); - if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type, rank_type, &complete_flag, &sort_flag)) { @@ -2613,11 +2610,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, zebra_setError(zh, YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE, 0); return ZEBRA_FAIL; } - yaz_log(YLOG_DEBUG, "use_value = %d", use_value); - - if (use_value == -1) - use_value = 1016; - for (base_no = 0; base_no < num_bases && ord_no < 32; base_no++) + for (base_no = 0; base_no < num_bases && ord_no < RPN_MAX_ORDS; base_no++) { int ord; @@ -2628,20 +2621,11 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *num_entries = 0; return ZEBRA_FAIL; } - if (zebra_apt_get_ord(zh, zapt, index_type, 0, attributeset, &ord) != ZEBRA_OK) - { - break; - } + continue; ords[ord_no++] = ord; } - if (!bases_ok && errCode) - { - zebra_setError(zh, errCode, errString); - *num_entries = 0; - return ZEBRA_FAIL; - } if (ord_no == 0) { *num_entries = 0; @@ -2759,9 +2743,9 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, zapt->term->which,rset_nmem, kc, kc->scope, 0, index_type, 0 /* hits_limit */, 0 /* term_ref_id_str */ ); - rset = rsmulti_or_create(rset_nmem, kc, - kc->scope, 0 /* termid */, - 2, rsets); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, + 2, rsets); } ptr[j]++; } @@ -2776,9 +2760,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, rsets[0] = rset; rsets[1] = rset_dup(limit_set); - rset = rsmulti_and_create(rset_nmem, kc, - kc->scope, - 2, rsets); + rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); } /* count it */ count_set(zh, rset, &count); @@ -2853,8 +2835,8 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, zapt->term->which, rset_nmem, kc, kc->scope, 0, index_type, 0 /* hits_limit */, 0 /* term_ref_id_str */); - rset = rsmulti_or_create(rset_nmem, kc, - kc->scope, 0 /* termid */, 2, rsets); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, 2, rsets); ptr[j]++; } @@ -2865,8 +2847,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, rsets[0] = rset; rsets[1] = rset_dup(limit_set); - rset = rsmulti_and_create(rset_nmem, kc, - kc->scope, 2, rsets); + rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); } count_set(zh, rset, &count); glist[lo].occurrences = count;