X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzrpn.c;h=4ae09373ace747026fa3adbcc9b9278e11a594be;hp=d7d2416d225132d3ba37de40914402db9bbb744c;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hpb=2ca7b6bfd7e8d9a2cb9c36bf2520b46511a594eb diff --git a/index/zrpn.c b/index/zrpn.c index d7d2416..4ae0937 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,5 +1,5 @@ -/* $Id: zrpn.c,v 1.189 2005-05-04 10:48:39 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zrpn.c,v 1.228 2006-09-08 14:40:53 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,16 +15,17 @@ 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. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -32,7 +33,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include "index.h" #include - +#include #include #include @@ -42,18 +43,11 @@ struct rpn_char_map_info int reg_type; }; -typedef struct -{ - int type; - int major; - int minor; - Z_AttributesPlusTerm *zapt; -} AttrType; - - static int log_level_set = 0; static int log_level_rpn = 0; +#define TERMSET_DISABLE 1 + static const char **rpn_char_map_handler(void *vp, const char **from, int len) { struct rpn_char_map_info *p = (struct rpn_char_map_info *) vp; @@ -74,91 +68,13 @@ 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; dict_grep_cmap(reg->dict, map_info, rpn_char_map_handler); } -static int attr_find_ex(AttrType *src, oid_value *attributeSetP, - const char **string_value) -{ - int num_attributes; - - num_attributes = src->zapt->attributes->num_attributes; - while (src->major < num_attributes) - { - Z_AttributeElement *element; - - element = src->zapt->attributes->attributes[src->major]; - if (src->type == *element->attributeType) - { - switch (element->which) - { - case Z_AttributeValue_numeric: - ++(src->major); - if (element->attributeSet && attributeSetP) - { - oident *attrset; - - attrset = oid_getentbyoid(element->attributeSet); - *attributeSetP = attrset->value; - } - return *element->value.numeric; - break; - 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); - return - *element->value.complex->list[src->minor-1]->u.numeric; - } - else if (element->value.complex->list[src->minor]->which == - Z_StringOrNumeric_string) - { - if (!string_value) - break; - ++(src->minor); - *string_value = - element->value.complex->list[src->minor-1]->u.string; - return -2; - } - else - break; - default: - assert(0); - } - } - ++(src->major); - } - return -1; -} - -static int attr_find(AttrType *src, oid_value *attributeSetP) -{ - return attr_find_ex(src, attributeSetP, 0); -} - -static void attr_init(AttrType *src, Z_AttributesPlusTerm *zapt, - int type) -{ - src->zapt = zapt; - src->type = type; - src->major = 0; - src->minor = 0; -} - #define TERM_COUNT struct grep_info { @@ -173,16 +89,20 @@ struct grep_info { ZebraSet termset; }; -static void term_untrans(ZebraHandle zh, int reg_type, - char *dst, const char *src) +void zebra_term_untrans(ZebraHandle zh, int reg_type, + char *dst, const char *src) { int len = 0; while (*src) { const char *cp = zebra_maps_output(zh->reg->zebra_maps, reg_type, &src); - if (!cp && len < IT_MAX_WORD-1) - dst[len++] = *src++; + if (!cp) + { + if (len < IT_MAX_WORD-1) + dst[len++] = *src; + src++; + } else while (*cp && len < IT_MAX_WORD-1) dst[len++] = *cp++; @@ -229,25 +149,23 @@ static void add_isam_p(const char *name, const char *info, assert(*info == sizeof(*p->isam_p_buf)); memcpy(p->isam_p_buf + p->isam_p_indx, info+1, sizeof(*p->isam_p_buf)); -#if 1 if (p->termset) { const char *db; - int set, use; char term_tmp[IT_MAX_WORD]; - int su_code = 0; - int len = key_SU_decode (&su_code, name); + int ord = 0; + const char *index_name; + int len = key_SU_decode (&ord, (const unsigned char *) name); - term_untrans (p->zh, p->reg_type, term_tmp, name+len+1); - yaz_log(log_level_rpn, "grep: %d %c %s", su_code, name[len], term_tmp); - zebraExplain_lookup_ord (p->zh->reg->zei, - su_code, &db, &set, &use); - yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db); + zebra_term_untrans (p->zh, p->reg_type, term_tmp, name+len); + 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, &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)++; } @@ -281,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; @@ -816,7 +734,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, char *term_tmp = term_dict + strlen(term_dict); char term_component[2*IT_MAX_WORD+20]; - attr_init(&relation, zapt, 2); + attr_init_APT(&relation, zapt, 2); relation_value = attr_find(&relation, NULL); *error_code = 0; @@ -966,6 +884,8 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, case 3: case 102: case -1: + if (!**term_sub) + return 1; yaz_log(log_level_rpn, "Relation ="); if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) @@ -974,8 +894,14 @@ 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 = 117; + *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; return 0; } return 1; @@ -987,7 +913,56 @@ static ZEBRA_RES 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, int xpath_use); + char *term_dst, + const char *xpath_use, + struct ord_list **ol); + +static ZEBRA_RES term_limits_APT(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + zint *hits_limit_value, + const char **term_ref_id_str, + NMEM nmem) +{ + AttrType term_ref_id_attr; + AttrType hits_limit_attr; + int term_ref_id_int; + + attr_init_APT(&hits_limit_attr, zapt, 11); + *hits_limit_value = attr_find(&hits_limit_attr, NULL); + + attr_init_APT(&term_ref_id_attr, zapt, 10); + term_ref_id_int = attr_find_ex(&term_ref_id_attr, NULL, term_ref_id_str); + if (term_ref_id_int >= 0) + { + char *res = nmem_malloc(nmem, 20); + sprintf(res, "%d", term_ref_id_int); + *term_ref_id_str = res; + } + + /* no limit given ? */ + if (*hits_limit_value == -1) + { + if (*term_ref_id_str) + { + /* use global if term_ref is present */ + *hits_limit_value = zh->approx_limit; + } + else + { + /* no counting if term_ref is not present */ + *hits_limit_value = 0; + } + } + else if (*hits_limit_value == 0) + { + /* 0 is the same as global limit */ + *hits_limit_value = zh->approx_limit; + } + yaz_log(YLOG_DEBUG, "term_limits_APT ref_id=%s limit=" ZINT_FORMAT, + *term_ref_id_str ? *term_ref_id_str : "none", + *hits_limit_value); + return ZEBRA_OK; +} static ZEBRA_RES term_trunc(ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -997,17 +972,23 @@ static ZEBRA_RES term_trunc(ZebraHandle zh, int reg_type, int complete_flag, int num_bases, char **basenames, char *term_dst, - const char *rank_type, int xpath_use, + const char *rank_type, + const char *xpath_use, NMEM rset_nmem, RSET *rset, struct rset_key_control *kc) { ZEBRA_RES res; + struct ord_list *ol; + zint hits_limit_value; + const char *term_ref_id_str = 0; *rset = 0; + + 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, - term_dst, xpath_use); + term_dst, xpath_use, &ol); if (res != ZEBRA_OK) return res; if (!*term_sub) /* no more terms ? */ @@ -1017,190 +998,88 @@ static ZEBRA_RES term_trunc(ZebraHandle zh, grep_info->isam_p_indx, term_dst, strlen(term_dst), rank_type, 1 /* preserve pos */, zapt->term->which, rset_nmem, - kc, kc->scope); + kc, kc->scope, ol, reg_type, hits_limit_value, + term_ref_id_str); if (!*rset) return ZEBRA_FAIL; return ZEBRA_OK; } -static char *nmem_strdup_i(NMEM nmem, int v) -{ - char val_str[64]; - sprintf(val_str, "%d", v); - return nmem_strdup(nmem, val_str); -} - static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char **term_sub, oid_value attributeSet, NMEM stream, struct grep_info *grep_info, int reg_type, int complete_flag, int num_bases, char **basenames, - char *term_dst, int xpath_use) + char *term_dst, + const char *xpath_use, + struct ord_list **ol) { char term_dict[2*IT_MAX_WORD+4000]; int j, r, base_no; AttrType truncation; int truncation_value; - AttrType use; - int use_value; - const char *use_string = 0; - oid_value curAttributeSet = attributeSet; const char *termp; struct rpn_char_map_info rcmi; int space_split = complete_flag ? 0 : 1; int bases_ok = 0; /* no of databases with OK attribute */ - int errCode = 0; /* err code (if any is not OK) */ - char *errString = 0; /* addinfo */ + + *ol = ord_list_create(stream); rpn_char_map_prepare (zh->reg, reg_type, &rcmi); - attr_init(&use, zapt, 1); - use_value = attr_find_ex(&use, &curAttributeSet, &use_string); - yaz_log(log_level_rpn, "string_term, use value %d", use_value); - attr_init(&truncation, zapt, 5); + attr_init_APT(&truncation, zapt, 5); truncation_value = attr_find(&truncation, NULL); yaz_log(log_level_rpn, "truncation value %d", truncation_value); - if (use_value == -1) /* no attribute - assumy "any" */ - use_value = 1016; 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; - attent attp; - data1_local_attribute id_xpath_attr; - data1_local_attribute *local_attr; 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])) { - zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; - zh->errString = basenames[base_no]; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); return ZEBRA_FAIL; } - if (xpath_use > 0 && use_value == -2) - { - /* xpath mode and we have a string attribute */ - attp.local_attributes = &id_xpath_attr; - attp.attset_ordinal = VAL_IDXPATH; - id_xpath_attr.next = 0; + + if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use, + attributeSet, &ord) != ZEBRA_OK) + continue; - use_value = xpath_use; /* xpath_use as use-attribute now */ - id_xpath_attr.local = use_value; - } - else if (curAttributeSet == VAL_IDXPATH && use_value >= 0) - { - /* X-Path attribute, use numeric value directly */ - attp.local_attributes = &id_xpath_attr; - attp.attset_ordinal = VAL_IDXPATH; - id_xpath_attr.next = 0; - id_xpath_attr.local = use_value; - } - else if (use_string && - (ord = zebraExplain_lookup_attr_str(zh->reg->zei, - use_string)) >= 0) - { - /* we have a match for a raw string attribute */ - char ord_buf[32]; - int i, ord_len; + bases_ok++; - if (prefix_len) - term_dict[prefix_len++] = '|'; - else - term_dict[prefix_len++] = '('; - - ord_len = key_SU_encode (ord, ord_buf); - for (i = 0; inext) - { - char ord_buf[32]; - int i, ord_len; - - ord = zebraExplain_lookup_attr_su(zh->reg->zei, - attp.attset_ordinal, - local_attr->local); - 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; ierrCode = relation_error; + zebra_setError(zh, relation_error, 0); return ZEBRA_FAIL; } *term_sub = 0; @@ -1260,7 +1139,6 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, case 103: /* Regexp-2 */ regex_range = 1; term_dict[j++] = '('; - init_pos = 2; if (!term_103(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, ®ex_range, space_split, term_dst)) @@ -1301,32 +1179,27 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, strcat(term_dict, ")"); break; default: - zh->errCode = YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; - zh->errString = nmem_strdup_i(stream, truncation_value); + zebra_setError_zint(zh, + YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, + 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) - { - zh->errCode = errCode; - zh->errString = errString; return ZEBRA_FAIL; - } *term_sub = termp; yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); return ZEBRA_OK; @@ -1345,7 +1218,7 @@ static ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, case Z_Term_general: if (zh->iconv_to_utf8 != 0) { - char *inbuf = term->u.general->buf; + char *inbuf = (char *) term->u.general->buf; size_t inleft = term->u.general->len; char *outbuf = termz; size_t outleft = IT_MAX_WORD-1; @@ -1356,9 +1229,11 @@ static ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (ret == (size_t)(-1)) { ret = yaz_iconv(zh->iconv_to_utf8, 0, 0, 0, 0); - zh->errCode = - YAZ_BIB1_QUERY_TERM_INCLUDES_CHARS_THAT_DO_NOT_TRANSLATE_INTO_; - return -1; + zebra_setError( + zh, + YAZ_BIB1_QUERY_TERM_INCLUDES_CHARS_THAT_DO_NOT_TRANSLATE_INTO_, + 0); + return ZEBRA_FAIL; } *outbuf = 0; } @@ -1379,7 +1254,7 @@ static ZEBRA_RES zapt_term_to_utf8(ZebraHandle zh, Z_AttributesPlusTerm *zapt, termz[sizez] = '\0'; break; default: - zh->errCode = YAZ_BIB1_UNSUPP_CODED_VALUE_FOR_TERM; + zebra_setError(zh, YAZ_BIB1_UNSUPP_CODED_VALUE_FOR_TERM, 0); return ZEBRA_FAIL; } return ZEBRA_OK; @@ -1423,50 +1298,6 @@ static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, return ZEBRA_OK; } -char *normalize_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz, NMEM stream, unsigned reg_id) -{ - WRBUF wrbuf = 0; - AttrType truncation; - int truncation_value; - char *ex_list = 0; - - attr_init(&truncation, zapt, 5); - truncation_value = attr_find(&truncation, NULL); - - switch (truncation_value) - { - default: - ex_list = ""; - break; - case 101: - ex_list = "#"; - break; - case 102: - case 103: - ex_list = 0; - break; - case 104: - ex_list = "!#"; - break; - case 105: - ex_list = "!*"; - break; - } - if (ex_list) - wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, ex_list, - termz, strlen(termz)); - if (!wrbuf) - return nmem_strdup(stream, termz); - else - { - char *buf = (char*) nmem_malloc(stream, wrbuf_len(wrbuf)+1); - memcpy (buf, wrbuf_buf(wrbuf), wrbuf_len(wrbuf)); - buf[wrbuf_len(wrbuf)] = '\0'; - return buf; - } -} - static void grep_info_delete(struct grep_info *grep_info) { #ifdef TERM_COUNT @@ -1475,11 +1306,10 @@ static void grep_info_delete(struct grep_info *grep_info) xfree(grep_info->isam_p_buf); } -static int grep_info_prepare(ZebraHandle zh, - Z_AttributesPlusTerm *zapt, - struct grep_info *grep_info, - int reg_type, - NMEM stream) +static ZEBRA_RES grep_info_prepare(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + struct grep_info *grep_info, + int reg_type) { AttrType termset; int termset_value_numeric; @@ -1493,14 +1323,17 @@ static int grep_info_prepare(ZebraHandle zh, grep_info->zh = zh; grep_info->reg_type = reg_type; grep_info->termset = 0; - if (!zapt) - return 0; - attr_init(&termset, zapt, 8); + return ZEBRA_OK; + attr_init_APT(&termset, zapt, 8); termset_value_numeric = attr_find_ex(&termset, NULL, &termset_value_string); if (termset_value_numeric != -1) { +#if TERMSET_DISABLE + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, "termset"); + return ZEBRA_FAIL; +#else char resname[32]; const char *termset_name = 0; if (termset_value_numeric != -2) @@ -1515,22 +1348,40 @@ static int grep_info_prepare(ZebraHandle zh, grep_info->termset = resultSetAdd(zh, termset_name, 1); if (!grep_info->termset) { - zh->errCode = YAZ_BIB1_ILLEGAL_RESULT_SET_NAME; - zh->errString = nmem_strdup(stream, termset_name); - return -1; + zebra_setError(zh, YAZ_BIB1_ILLEGAL_RESULT_SET_NAME, termset_name); + return ZEBRA_FAIL; } +#endif } - return 0; + return ZEBRA_OK; } - +/** + \brief Create result set(s) for list of terms + \param zh Zebra Handle + \param zapt Attributes Plust Term (RPN leaf) + \param termz term as used in query but converted to UTF-8 + \param attributeSet default attribute set + \param stream memory for result + \param reg_type register type ('w', 'p',..) + \param complete_flag whether it's phrases or not + \param rank_type term flags for ranking + \param xpath_use use attribute for X-Path (-1 for no X-path) + \param num_bases number of databases + \param basenames array of databases + \param rset_nmem memory for result sets + \param result_sets output result set for each term in list (output) + \param num_result_sets number of output result sets + \param kc rset key control to be used for created result sets +*/ static ZEBRA_RES term_list_trunc(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char *termz_org, + const char *termz, oid_value attributeSet, NMEM stream, int reg_type, int complete_flag, - const char *rank_type, int xpath_use, + const char *rank_type, + const char *xpath_use, int num_bases, char **basenames, NMEM rset_nmem, RSET **result_sets, int *num_result_sets, @@ -1538,13 +1389,12 @@ static ZEBRA_RES term_list_trunc(ZebraHandle zh, { char term_dst[IT_MAX_WORD+1]; struct grep_info grep_info; - char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; int alloc_sets = 0; *num_result_sets = 0; *term_dst = 0; - if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream)) + if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL) return ZEBRA_FAIL; while(1) { @@ -1579,18 +1429,109 @@ static ZEBRA_RES term_list_trunc(ZebraHandle zh, if ((*result_sets)[*num_result_sets] == 0) break; (*num_result_sets)++; + + if (!*termp) + break; } grep_info_delete(&grep_info); return ZEBRA_OK; } +static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh, + Z_AttributesPlusTerm *zapt, + oid_value attributeSet, + int reg_type, + int num_bases, char **basenames, + NMEM rset_nmem, + RSET *rset, + struct rset_key_control *kc) +{ + RSET *f_set; + int base_no; + int position_value; + int num_sets = 0; + AttrType position; + + attr_init_APT(&position, zapt, 3); + position_value = attr_find(&position, NULL); + switch(position_value) + { + case 3: + case -1: + return ZEBRA_OK; + case 1: + case 2: + break; + default: + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE, + position_value); + return ZEBRA_FAIL; + } + + if (!zebra_maps_is_first_in_field(zh->reg->zebra_maps, reg_type)) + { + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE, + position_value); + return ZEBRA_FAIL; + } + + if (!zh->reg->isamb) + { + zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE, + position_value); + return ZEBRA_FAIL; + } + f_set = xmalloc(sizeof(RSET) * num_bases); + for (base_no = 0; base_no < num_bases; base_no++) + { + int ord = -1; + char ord_buf[32]; + char term_dict[100]; + int ord_len; + char *val; + ISAM_P isam_p; + + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) + { + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + return ZEBRA_FAIL; + } + + if (zebra_apt_get_ord(zh, zapt, reg_type, 0, + attributeSet, &ord) != ZEBRA_OK) + continue; + + ord_len = key_SU_encode (ord, ord_buf); + memcpy(term_dict, ord_buf, ord_len); + strcpy(term_dict+ord_len, FIRST_IN_FIELD_STR); + val = dict_lookup(zh->reg->dict, term_dict); + if (!val) + continue; + assert(*val == sizeof(ISAM_P)); + memcpy(&isam_p, val+1, sizeof(isam_p)); + + f_set[num_sets++] = rsisamb_create(rset_nmem, kc, kc->scope, + zh->reg->isamb, isam_p, 0); + + } + if (num_sets) + { + *rset = rset_create_or(rset_nmem, kc, kc->scope, + 0 /* termid */, num_sets, f_set); + } + xfree(f_set); + return ZEBRA_OK; +} + static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char *termz_org, oid_value attributeSet, NMEM stream, int reg_type, int complete_flag, - const char *rank_type, int xpath_use, + const char *rank_type, + const char *xpath_use, int num_bases, char **basenames, NMEM rset_nmem, RSET *rset, @@ -1605,17 +1546,39 @@ static ZEBRA_RES rpn_search_APT_phrase(ZebraHandle zh, num_bases, basenames, rset_nmem, &result_sets, &num_result_sets, kc); + if (res != ZEBRA_OK) return res; + + if (num_result_sets > 0) + { + RSET first_set = 0; + res = rpn_search_APT_position(zh, zapt, attributeSet, + reg_type, + num_bases, basenames, + rset_nmem, &first_set, + kc); + if (res != ZEBRA_OK) + return res; + if (first_set) + { + RSET *nsets = nmem_malloc(stream, + sizeof(RSET) * (num_result_sets+1)); + nsets[0] = first_set; + memcpy(nsets+1, result_sets, sizeof(RSET) * num_result_sets); + result_sets = nsets; + num_result_sets++; + } + } if (num_result_sets == 0) - *rset = rsnull_create (rset_nmem, kc); + *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; @@ -1628,7 +1591,7 @@ static ZEBRA_RES rpn_search_APT_or_list(ZebraHandle zh, NMEM stream, int reg_type, int complete_flag, const char *rank_type, - int xpath_use, + const char *xpath_use, int num_bases, char **basenames, NMEM rset_nmem, RSET *rset, @@ -1646,12 +1609,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); + *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, - 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; @@ -1664,7 +1627,7 @@ static ZEBRA_RES rpn_search_APT_and_list(ZebraHandle zh, NMEM stream, int reg_type, int complete_flag, const char *rank_type, - int xpath_use, + const char *xpath_use, int num_bases, char **basenames, NMEM rset_nmem, RSET *rset, @@ -1683,12 +1646,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); + *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; @@ -1711,40 +1674,61 @@ static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, char *term_tmp = term_dict + strlen(term_dict); *error_code = 0; - attr_init(&relation, zapt, 2); + attr_init_APT(&relation, zapt, 2); relation_value = attr_find(&relation, NULL); 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 = 117; + *error_code = YAZ_BIB1_UNSUPP_RELATION_ATTRIBUTE; return 0; } yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp); @@ -1758,126 +1742,66 @@ 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, int xpath_use, NMEM stream) + char *term_dst, + const char *xpath_use, + struct ord_list **ol) { char term_dict[2*IT_MAX_WORD+2]; - int r, base_no; - AttrType use; - int use_value; - const char *use_string = 0; - oid_value curAttributeSet = attributeSet; + int base_no; const char *termp; struct rpn_char_map_info rcmi; int bases_ok = 0; /* no of databases with OK attribute */ - int errCode = 0; /* err code (if any is not OK) */ - char *errString = 0; /* addinfo */ - rpn_char_map_prepare (zh->reg, reg_type, &rcmi); - attr_init(&use, zapt, 1); - use_value = attr_find_ex(&use, &curAttributeSet, &use_string); + *ol = ord_list_create(stream); - if (use_value == -1) - use_value = 1016; + rpn_char_map_prepare (zh->reg, reg_type, &rcmi); for (base_no = 0; base_no < num_bases; base_no++) { - attent attp; - data1_local_attribute id_xpath_attr; - data1_local_attribute *local_attr; int max_pos, prefix_len = 0; int relation_error = 0; + int ord, ord_len, i; + char ord_buf[32]; termp = *term_sub; - 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 = VAL_IDXPATH; - id_xpath_attr.next = 0; - id_xpath_attr.local = use_value; - } - else - { - if ((r = att_getentbyatt (zh, &attp, curAttributeSet, use_value, - use_string))) - { - yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d r=%d", - curAttributeSet, use_value, r); - if (r == -1) - { - errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; - if (use_string) - errString = nmem_strdup(stream, use_string); - else - errString = nmem_strdup_i (stream, use_value); - } - else - errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_SET; - continue; - } - } + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { - zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; - zh->errString = basenames[base_no]; - return -1; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + return ZEBRA_FAIL; } - for (local_attr = attp.local_attributes; local_attr; - local_attr = local_attr->next) - { - int ord; - char ord_buf[32]; - int i, ord_len; - - ord = zebraExplain_lookup_attr_su(zh->reg->zei, - attp.attset_ordinal, - local_attr->local); - 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; ierrCode = relation_error; - zh->errString = 0; + zebra_setError(zh, relation_error, 0); return ZEBRA_FAIL; } *term_sub = 0; @@ -1885,23 +1809,21 @@ static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } } if (!bases_ok) - { - zh->errCode = errCode; - zh->errString = errString; return ZEBRA_FAIL; - } *term_sub = termp; yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); return ZEBRA_OK; } + static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh, Z_AttributesPlusTerm *zapt, const char *termz, oid_value attributeSet, NMEM stream, int reg_type, int complete_flag, - const char *rank_type, int xpath_use, + const char *rank_type, + const char *xpath_use, int num_bases, char **basenames, NMEM rset_nmem, RSET *rset, @@ -1914,12 +1836,17 @@ static ZEBRA_RES rpn_search_APT_numeric(ZebraHandle zh, ZEBRA_RES res; struct grep_info grep_info; int alloc_sets = 0; + zint hits_limit_value; + const char *term_ref_id_str = 0; + + term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream); yaz_log(log_level_rpn, "APT_numeric t='%s'", termz); - if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream)) + if (grep_info_prepare(zh, zapt, &grep_info, reg_type) == ZEBRA_FAIL) return ZEBRA_FAIL; while (1) { + struct ord_list *ol; if (alloc_sets == num_result_sets) { int add = 10; @@ -1932,10 +1859,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); @@ -1945,28 +1871,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); + 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; } @@ -1982,8 +1908,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); @@ -2001,6 +1927,7 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt, oid_value attributeSet, NMEM stream, Z_SortKeySpecList *sort_sequence, const char *rank_type, + NMEM rset_nmem, RSET *rset, struct rset_key_control *kc) { @@ -2013,7 +1940,7 @@ static ZEBRA_RES rpn_sort_spec(ZebraHandle zh, Z_AttributesPlusTerm *zapt, oident oe; char termz[20]; - attr_init(&sort_relation_type, zapt, 7); + attr_init_APT(&sort_relation_type, zapt, 7); sort_relation_value = attr_find(&sort_relation_type, &attributeSet); if (!sort_sequence->specs) @@ -2069,20 +1996,21 @@ 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 (NULL, kc); + *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; const char *use_string = 0; - attr_init(&use, zapt, 1); + attr_init_APT(&use, zapt, 1); attr_find_ex(&use, &curAttributeSet, &use_string); if (!use_string || *use_string != '/') @@ -2094,8 +2022,9 @@ static int parse_xpath(ZebraHandle zh, Z_AttributesPlusTerm *zapt, static RSET xpath_trunc(ZebraHandle zh, NMEM stream, - int reg_type, const char *term, int use, - oid_value curAttributeSet, NMEM rset_nmem, + int reg_type, const char *term, + const char *xpath_use, + NMEM rset_nmem, struct rset_key_control *kc) { RSET rset; @@ -2103,16 +2032,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_su(zh->reg->zei, curAttributeSet, use); + 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', stream)) - return rsnull_create(rset_nmem, kc); + if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0') == ZEBRA_FAIL) + return rset_create_null(rset_nmem, kc, 0); if (ord < 0) - return rsnull_create(rset_nmem, kc); + return rset_create_null(rset_nmem, kc, 0); if (prefix_len) term_dict[prefix_len++] = '|'; else @@ -2125,9 +2057,6 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, term_dict[prefix_len++] = ord_buf[i]; } term_dict[prefix_len++] = ')'; - term_dict[prefix_len++] = 1; - term_dict[prefix_len++] = reg_type; - strcpy(term_dict+prefix_len, term); grep_info.isam_p_indx = 0; @@ -2138,25 +2067,30 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, rset = rset_trunc(zh, grep_info.isam_p_buf, grep_info.isam_p_indx, term, strlen(term), flags, 1, term_type,rset_nmem, - kc, kc->scope); + kc, kc->scope, 0, reg_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); 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, - NMEM rset_nmem, - struct rset_key_control *kc) +static +ZEBRA_RES rpn_search_xpath(ZebraHandle zh, + int num_bases, char **basenames, + NMEM stream, const char *rank_type, RSET rset, + int xpath_len, struct xpath_location_step *xpath, + NMEM rset_nmem, + 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) - return rset; + { + *rset_out = rset; + return ZEBRA_OK; + } yaz_log(YLOG_DEBUG, "xpath len=%d", xpath_len); for (i = 0; i a/.* //a/b -> b/a/.* @@ -2195,48 +2127,40 @@ static RSET rpn_search_xpath(ZebraHandle zh, if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { - zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; - zh->errString = basenames[base_no]; - return rset; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); + *rset_out = rset; + return ZEBRA_FAIL; } 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]) @@ -2258,35 +2182,50 @@ static RSET rpn_search_xpath(ZebraHandle zh, } wrbuf_puts(wbuf, ""); rset_attr = xpath_trunc( - zh, stream, '0', wrbuf_buf(wbuf), 3, - curAttributeSet, rset_nmem, kc); + zh, stream, '0', wrbuf_buf(wbuf), ZEBRA_XPATH_ATTR_NAME, + 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, 1, curAttributeSet, rset_nmem, kc); - - rset_end_tag = xpath_trunc(zh, stream, '0', - xpath_rev, 2, curAttributeSet, rset_nmem, kc); - - rset = rsbetween_create(rset_nmem, kc, kc->scope, - rset_start_tag, rset, - rset_end_tag, rset_attr); + wrbuf_buf(xpath_rev), + ZEBRA_XPATH_ELM_BEGIN, + rset_nmem, kc); + 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; } } - - return rset; + *rset_out = rset; + 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, @@ -2303,8 +2242,8 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, int sort_flag; char termz[IT_MAX_WORD+1]; int xpath_len; - int xpath_use = 0; - struct xpath_location_step xpath[10]; + const char *xpath_use = 0; + struct xpath_location_step xpath[MAX_XPATH_STEPS]; if (!log_level_set) { @@ -2324,15 +2263,43 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (sort_flag) return rpn_sort_spec(zh, zapt, attributeSet, stream, sort_sequence, - rank_type, rset, kc); - xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream); + rank_type, rset_nmem, rset, kc); + /* consider if an X-Path query is used */ + xpath_len = rpn_check_xpath(zh, zapt, attributeSet, + xpath, MAX_XPATH_STEPS, stream); if (xpath_len >= 0) { - xpath_use = 1016; - if (xpath[xpath_len-1].part[0] == '@') - xpath_use = 1015; + 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 + termz is our UTF-8 search term + attributeSet is top-level default attribute set + stream is ODR for search + reg_id is the register type + complete_flag is 1 for complete subfield, 0 for incomplete + xpath_use is use-attribute to be used for X-Path search, 0 for none + */ if (!strcmp(search_type, "phrase")) { res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream, @@ -2372,19 +2339,16 @@ static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, } else { - zh->errCode = YAZ_BIB1_UNSUPP_STRUCTURE_ATTRIBUTE; - return ZEBRA_FAIL; + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); + res = ZEBRA_FAIL; } if (res != ZEBRA_OK) return res; if (!*rset) return ZEBRA_FAIL; - *rset = rpn_search_xpath(zh, attributeSet, num_bases, basenames, - stream, rank_type, *rset, - xpath_len, xpath, rset_nmem, kc); - if (!*rset) - return ZEBRA_FAIL; - return ZEBRA_OK; + return rpn_search_xpath(zh, num_bases, basenames, + stream, rank_type, *rset, + xpath_len, xpath, rset_nmem, rset, kc); } static ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, @@ -2421,15 +2385,16 @@ ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, for (i = 0; idec)(kc); - return ZEBRA_OK; + return res; } ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, @@ -2499,49 +2464,50 @@ 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, - *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) { - zh->errCode = YAZ_BIB1_UNSUPP_PROX_UNIT_CODE; + zebra_setError(zh, + YAZ_BIB1_UNSUPP_PROX_UNIT_CODE, + 0); return ZEBRA_FAIL; } if (*zop->u.prox->u.known != Z_ProxUnit_word) { - char *val = (char *) nmem_malloc(stream, 16); - zh->errCode = YAZ_BIB1_UNSUPP_PROX_UNIT_CODE; - zh->errString = val; - sprintf(val, "%d", *zop->u.prox->u.known); + zebra_setError_zint(zh, + YAZ_BIB1_UNSUPP_PROX_UNIT_CODE, + *zop->u.prox->u.known); return ZEBRA_FAIL; } 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: - zh->errCode = YAZ_BIB1_OPERATOR_UNSUPP; + zebra_setError(zh, YAZ_BIB1_OPERATOR_UNSUPP, 0); return ZEBRA_FAIL; } *num_result_sets = 1; @@ -2571,16 +2537,16 @@ ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, rset = resultSetRef(zh, zs->u.simple->u.resultSetId); if (!rset) { - zh->errCode = YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST; - zh->errString = - nmem_strdup(stream, zs->u.simple->u.resultSetId); + zebra_setError(zh, + YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, + zs->u.simple->u.resultSetId); return ZEBRA_FAIL; } rset_dup(rset); } else { - zh->errCode = YAZ_BIB1_UNSUPP_SEARCH; + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); return ZEBRA_FAIL; } *num_result_sets = 1; @@ -2590,7 +2556,7 @@ ZEBRA_RES rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, } else { - zh->errCode = YAZ_BIB1_UNSUPP_SEARCH; + zebra_setError(zh, YAZ_BIB1_UNSUPP_SEARCH, 0); return ZEBRA_FAIL; } return ZEBRA_OK; @@ -2621,6 +2587,10 @@ static int scan_handle (char *name, const char *info, int pos, void *client) else idx = - pos - 1; + /* skip special terms.. of no interest */ + if (name[len_prefix] < 4) + return 1; + if (idx < 0) return 0; scan_info->list[idx].term = (char *) @@ -2631,13 +2601,13 @@ static int scan_handle (char *name, const char *info, int pos, void *client) return 0; } -static void scan_term_untrans (ZebraHandle zh, NMEM stream, int reg_type, - char **dst, const char *src) +void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type, + char **dst, const char *src) { char term_src[IT_MAX_WORD]; char term_dst[IT_MAX_WORD]; - term_untrans (zh, reg_type, term_src, src); + zebra_term_untrans (zh, reg_type, term_src, src); if (zh->iconv_from_utf8 != 0) { @@ -2663,30 +2633,33 @@ static void scan_term_untrans (ZebraHandle zh, NMEM stream, int reg_type, *dst = nmem_strdup(stream, term_src); } -static void count_set (RSET r, int *count) +static void count_set(ZebraHandle zh, RSET rset, zint *count) { zint psysno = 0; - int kno = 0; struct it_key key; RSFD rfd; yaz_log(YLOG_DEBUG, "count_set"); + rset->hits_limit = zh->approx_limit; + *count = 0; - rfd = rset_open (r, RSETF_READ); - while (rset_read (rfd, &key,0 /* never mind terms */)) + rfd = rset_open(rset, RSETF_READ); + while (rset_read(rfd, &key,0 /* never mind terms */)) { if (key.mem[0] != psysno) { psysno = key.mem[0]; - (*count)++; + if (rfd->counted_items >= rset->hits_limit) + break; } - kno++; } rset_close (rfd); - yaz_log(YLOG_DEBUG, "%d keys, %d records", kno, *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, @@ -2700,19 +2673,12 @@ 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 ords[RPN_MAX_ORDS], ord_no = 0; + int ptr[RPN_MAX_ORDS]; - int bases_ok = 0; /* no of databases with OK attribute */ - int errCode = 0; /* err code (if any is not OK) */ - char *errString = 0; /* addinfo */ - - unsigned reg_id; + unsigned index_type; char *search_type = NULL; char rank_type[128]; int complete_flag; @@ -2731,7 +2697,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, AttrType termset; int termset_value_numeric; const char *termset_value_string; - attr_init(&termset, zapt, 8); + attr_init_APT(&termset, zapt, 8); termset_value_numeric = attr_find_ex(&termset, NULL, &termset_value_string); if (termset_value_numeric != -1) @@ -2755,91 +2721,33 @@ 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(&use, zapt, 1); - use_value = attr_find_ex(&use, &attributeset, &use_string); - - if (zebra_maps_attr(zh->reg->zebra_maps, zapt, ®_id, &search_type, + if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type, rank_type, &complete_flag, &sort_flag)) { *num_entries = 0; - zh->errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_TYPE; + 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++) { - data1_local_attribute *local_attr; - attent attp; int ord; if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) { - zh->errString = basenames[base_no]; - zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE; + zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE, + basenames[base_no]); *num_entries = 0; return ZEBRA_FAIL; } - - if (use_string && - (ord = zebraExplain_lookup_attr_str(zh->reg->zei, - use_string)) >= 0) - { - /* we have a match for a raw string attribute */ - if (ord > 0) - ords[ord_no++] = ord; - attp.local_attributes = 0; /* no more attributes */ - } - else - { - int r; - - if ((r = att_getentbyatt (zh, &attp, attributeset, use_value, - use_string))) - { - yaz_log(YLOG_DEBUG, "att_getentbyatt fail. set=%d use=%d", - attributeset, use_value); - if (r == -1) - { - errCode = YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; - if (use_string) - errString = odr_strdup(stream, use_string); - else - { - char val_str[32]; - sprintf(val_str, "%d", use_value); - errString = odr_strdup(stream, val_str); - } - } - else - errCode = YAZ_BIB1_UNSUPP_ATTRIBUTE_SET; - continue; - } - } - bases_ok++; - for (local_attr = attp.local_attributes; local_attr && ord_no < 32; - local_attr = local_attr->next) - { - ord = zebraExplain_lookup_attr_su(zh->reg->zei, - attp.attset_ordinal, - local_attr->local); - if (ord > 0) - ords[ord_no++] = ord; - } - } - if (!bases_ok && errCode) - { - zh->errCode = errCode; - zh->errString = errString; - *num_entries = 0; - return ZEBRA_FAIL; + if (zebra_apt_get_ord(zh, zapt, index_type, 0, attributeset, &ord) + != ZEBRA_OK) + continue; + ords[ord_no++] = ord; } if (ord_no == 0) { *num_entries = 0; - return ZEBRA_OK; + return ZEBRA_FAIL; } /* prepare dictionary scanning */ if (num < 1) @@ -2865,7 +2773,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, struct scan_info *scan_info = scan_info_array + i; struct rpn_char_map_info rcmi; - rpn_char_map_prepare (zh->reg, reg_id, &rcmi); + rpn_char_map_prepare (zh->reg, index_type, &rcmi); scan_info->before = before; scan_info->after = after; @@ -2877,11 +2785,11 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, scan_info->list[j].term = NULL; prefix_len += key_SU_encode (ords[i], termz + prefix_len); - termz[prefix_len++] = reg_id; termz[prefix_len] = 0; strcpy(scan_info->prefix, termz); - if (trans_scan_term(zh, zapt, termz+prefix_len, reg_id) == ZEBRA_FAIL) + if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) == + ZEBRA_FAIL) return ZEBRA_FAIL; dict_scan(zh->reg->dict, termz, &before_tmp, &after_tmp, @@ -2924,12 +2832,13 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, if (lo >= 0) { /* get result set for first term */ - scan_term_untrans(zh, stream->mem, reg_id, - &glist[lo].term, mterm); + zebra_term_untrans_iconv(zh, stream->mem, index_type, + &glist[lo].term, mterm); rset = rset_trunc(zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, glist[lo].term, strlen(glist[lo].term), NULL, 0, zapt->term->which, rset_nmem, - kc, kc->scope); + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); } ptr[j0]++; /* move index for this set .. */ /* get result set for remaining scan terms */ @@ -2950,15 +2859,18 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, glist[lo].term, strlen(glist[lo].term), NULL, 0, zapt->term->which,rset_nmem, - kc, kc->scope); - rset = rsmulti_or_create(rset_nmem, kc, - 2, kc->scope, rsets); + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */ ); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, + 2, rsets); } ptr[j]++; } } if (lo >= 0) { + zint count; /* merge with limit_set if given */ if (limit_set) { @@ -2966,11 +2878,11 @@ 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(rset, &glist[lo].occurrences); + count_set(zh, rset, &count); + glist[lo].occurrences = count; rset_delete(rset); } } @@ -2997,6 +2909,7 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, const char *tst; RSET rset; int lo = before-1-i; /* offset in result list */ + zint count; for (j = 0; j mem, reg_id, - &glist[lo].term, mterm); + zebra_term_untrans_iconv(zh, stream->mem, index_type, + &glist[lo].term, mterm); rset = rset_trunc (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1, glist[lo].term, strlen(glist[lo].term), - NULL, 0, zapt->term->which,rset_nmem, - kc, kc->scope); + NULL, 0, zapt->term->which, rset_nmem, + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); ptr[j0]++; @@ -3037,9 +2951,10 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, glist[lo].term, strlen(glist[lo].term), NULL, 0, zapt->term->which, rset_nmem, - kc, kc->scope); - rset = rsmulti_or_create(rset_nmem, kc, - 2, kc->scope, rsets); + kc, kc->scope, 0, index_type, 0 /* hits_limit */, + 0 /* term_ref_id_str */); + rset = rset_create_or(rset_nmem, kc, + kc->scope, 0 /* termid */, 2, rsets); ptr[j]++; } @@ -3050,10 +2965,10 @@ 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 (rset, &glist[lo].occurrences); + count_set(zh, rset, &count); + glist[lo].occurrences = count; rset_delete (rset); } (*kc->dec)(kc); @@ -3078,3 +2993,11 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, return ZEBRA_OK; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +