X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=014682b33fa4ccddd1c706a58d36ba14dde875df;hb=edcd2c238dd59430ef9933f56fdce1631dad323e;hp=0a49a0fd11657d69621f41f4850cb0dd35cc1bbf;hpb=98912d364cb21abf4c2f3229d5578e2a3159f616;p=idzebra-moved-to-github.git diff --git a/index/zrpn.c b/index/zrpn.c index 0a49a0f..014682b 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.168 2005-01-15 20:47:15 adam Exp $ +/* $Id: zrpn.c,v 1.176 2005-04-20 10:17:14 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -180,7 +180,7 @@ struct grep_info { #ifdef TERM_COUNT int *term_no; #endif - ISAMC_P *isam_p_buf; + ISAM_P *isam_p_buf; int isam_p_size; int isam_p_indx; ZebraHandle zh; @@ -206,7 +206,7 @@ static void term_untrans(ZebraHandle zh, int reg_type, } static void add_isam_p(const char *name, const char *info, - struct grep_info *p) + struct grep_info *p) { if (!log_level_set) { @@ -215,13 +215,13 @@ static void add_isam_p(const char *name, const char *info, } if (p->isam_p_indx == p->isam_p_size) { - ISAMC_P *new_isam_p_buf; + ISAM_P *new_isam_p_buf; #ifdef TERM_COUNT int *new_term_no; #endif p->isam_p_size = 2*p->isam_p_size + 100; - new_isam_p_buf = (ISAMC_P *) xmalloc(sizeof(*new_isam_p_buf) * - p->isam_p_size); + new_isam_p_buf = (ISAM_P *) xmalloc(sizeof(*new_isam_p_buf) * + p->isam_p_size); if (p->isam_p_buf) { memcpy(new_isam_p_buf, p->isam_p_buf, @@ -295,6 +295,33 @@ static int term_pre(ZebraMaps zebra_maps, int reg_type, const char **src, return *s0; } + +static void esc_str(char *out_buf, int out_size, + const char *in_buf, int in_size) +{ + int k; + + assert(out_buf); + assert(in_buf); + assert(out_size > 20); + *out_buf = '\0'; + for (k = 0; k 126) + pc = '?'; + else + pc = c; + sprintf(out_buf +strlen(out_buf), "%02X:%c ", c, pc); + if (strlen(out_buf) > out_size-20) + { + strcat(out_buf, ".."); + break; + } + } +} + #define REGEX_CHARS " []()|.*+?!" /* term_100: handle term, where trunc = none(no operators at all) */ @@ -302,7 +329,7 @@ static int term_100(ZebraMaps zebra_maps, int reg_type, const char **src, char *dst, int space_split, char *dst_term) { - const char *s0, *s1; + const char *s0; const char **map; int i = 0; int j = 0; @@ -315,8 +342,10 @@ static int term_100(ZebraMaps zebra_maps, int reg_type, s0 = *src; while (*s0) { - s1 = s0; - map = zebra_maps_input(zebra_maps, reg_type, &s0, strlen(s0), 0); + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); if (space_split) { if (**map == *CHR_SPACE) @@ -343,14 +372,26 @@ static int term_100(ZebraMaps zebra_maps, int reg_type, space_start = space_end = 0; } } - /* add non-space char */ - while (s1 < s0) - { - if (strchr(REGEX_CHARS, *s1)) - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; - } + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } dst[i] = '\0'; dst_term[j] = '\0'; @@ -363,7 +404,7 @@ static int term_101(ZebraMaps zebra_maps, int reg_type, const char **src, char *dst, int space_split, char *dst_term) { - const char *s0, *s1; + const char *s0; const char **map; int i = 0; int j = 0; @@ -381,17 +422,33 @@ static int term_101(ZebraMaps zebra_maps, int reg_type, } else { - s1 = s0; - map = zebra_maps_input(zebra_maps, reg_type, &s0, strlen(s0), 0); + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); if (space_split && **map == *CHR_SPACE) break; - while (s1 < s0) - { - if (strchr(REGEX_CHARS, *s1)) - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; - } + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } } dst[i] = '\0'; @@ -407,7 +464,7 @@ static int term_103(ZebraMaps zebra_maps, int reg_type, const char **src, { int i = 0; int j = 0; - const char *s0, *s1; + const char *s0; const char **map; if (!term_pre(zebra_maps, reg_type, src, "^\\()[].*+?|", "(", !space_split)) @@ -430,22 +487,39 @@ static int term_103(ZebraMaps zebra_maps, int reg_type, const char **src, } else { - s1 = s0; - map = zebra_maps_input(zebra_maps, reg_type, &s0, strlen(s0), 0); - if (**map == *CHR_SPACE) + const char *s1 = s0; + int q_map_match = 0; + map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0), + &q_map_match); + if (space_split && **map == *CHR_SPACE) break; - while (s1 < s0) - { - if (strchr(REGEX_CHARS, *s1)) - dst[i++] = '\\'; - dst_term[j++] = *s1; - dst[i++] = *s1++; - } + + /* add non-space char */ + memcpy(dst_term+j, s1, s0 - s1); + j += (s0 - s1); + if (!q_map_match) + { + while (s1 < s0) + { + if (strchr(REGEX_CHARS, *s1)) + dst[i++] = '\\'; + dst[i++] = *s1++; + } + } + else + { + char tmpbuf[80]; + esc_str(tmpbuf, sizeof(tmpbuf), map[0], strlen(map[0])); + + strcpy(dst + i, map[0]); + i += strlen(map[0]); + } } } dst[i] = '\0'; dst_term[j] = '\0'; *src = s0; + return i; } @@ -509,6 +583,7 @@ static int term_104(ZebraMaps zebra_maps, int reg_type, dst[i++] = '.'; dst_term[j++] = *s0++; } + else { s1 = s0; map = zebra_maps_input(zebra_maps, reg_type, &s0, strlen(s0), 0); @@ -555,6 +630,7 @@ static int term_105 (ZebraMaps zebra_maps, int reg_type, dst[i++] = '.'; dst_term[j++] = *s0++; } + else { s1 = s0; map = zebra_maps_input(zebra_maps, reg_type, &s0, strlen(s0), 0); @@ -712,9 +788,10 @@ void string_rel_add_char(char **term_p, const char *src, int *indx) * ([^a-].*|a[^b-].*|ab[^c-].*|abc) */ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char **term_sub, char *term_dict, - oid_value attributeSet, - int reg_type, int space_split, char *term_dst) + const char **term_sub, char *term_dict, + oid_value attributeSet, + int reg_type, int space_split, char *term_dst, + int *error_code) { AttrType relation; int relation_value; @@ -725,6 +802,7 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, attr_init(&relation, zapt, 2); relation_value = attr_find(&relation, NULL); + *error_code = 0; yaz_log(YLOG_DEBUG, "string relation value=%d", relation_value); switch (relation_value) { @@ -869,7 +947,8 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, *term_tmp = '\0'; break; case 3: - default: + case 102: + case -1: yaz_log(log_level_rpn, "Relation ="); if (!term_100 (zh->reg->zebra_maps, reg_type, term_sub, term_component, space_split, term_dst)) @@ -877,41 +956,47 @@ static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, strcat(term_tmp, "("); strcat(term_tmp, term_component); strcat(term_tmp, ")"); + break; + default: + *error_code = 117; + return 0; } return 1; } -static int 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); +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); static RSET term_trunc(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, - const char *rank_type, int xpath_use, - NMEM rset_nmem) + 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, + const char *rank_type, int xpath_use, + NMEM rset_nmem) { - int r; + ZEBRA_RES res; 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, xpath_use); - if (r < 1) + res = string_term(zh, zapt, term_sub, attributeSet, stream, grep_info, + reg_type, complete_flag, num_bases, basenames, + term_dst, xpath_use); + if (res != ZEBRA_OK) return 0; + if (!*term_sub) /* no more terms ? */ + return 0; yaz_log(log_level_rpn, "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 */, - zapt->term->which, rset_nmem, - key_it_ctrl,key_it_ctrl->scope); + grep_info->isam_p_indx, term_dst, + strlen(term_dst), rank_type, 1 /* preserve pos */, + zapt->term->which, rset_nmem, + key_it_ctrl, key_it_ctrl->scope); } static char *nmem_strdup_i(NMEM nmem, int v) { @@ -920,13 +1005,13 @@ static char *nmem_strdup_i(NMEM nmem, int v) return nmem_strdup(nmem, val_str); } -static int 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) +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_dict[2*IT_MAX_WORD+4000]; int j, r, base_no; @@ -956,6 +1041,7 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, 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; @@ -963,6 +1049,7 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, data1_local_attribute id_xpath_attr; data1_local_attribute *local_attr; int max_pos, prefix_len = 0; + int relation_error; termp = *term_sub; @@ -970,30 +1057,55 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, { zh->errCode = 109; /* Database unavailable */ zh->errString = basenames[base_no]; - return -1; + return ZEBRA_FAIL; } if (xpath_use > 0 && use_value == -2) { - use_value = xpath_use; + /* xpath mode and we have a string attribute */ attp.local_attributes = &id_xpath_attr; attp.attset_ordinal = VAL_IDXPATH; id_xpath_attr.next = 0; + + use_value = xpath_use; /* xpath_use as use-attribute now */ id_xpath_attr.local = use_value; } - else if (curAttributeSet == VAL_IDXPATH) + 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 + 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; + + if (prefix_len) + term_dict[prefix_len++] = '|'; + else + term_dict[prefix_len++] = '('; + + ord_len = key_SU_encode (ord, ord_buf); + for (i = 0; inext) - { - int ord; - char ord_buf[32]; - int i, ord_len; - - ord = zebraExplain_lookupSU (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; inext) { - bases_ok++; /* this has OK attributes */ - attr_ok = 1; + 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; + return ZEBRA_FAIL; + } + *term_sub = 0; + return ZEBRA_OK; + } break; case 1: /* right truncation */ term_dict[j++] = '('; if (!term_100(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ".*)"); break; case 2: /* keft truncation */ term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; if (!term_100(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; case 3: /* left&right truncation */ term_dict[j++] = '('; term_dict[j++] = '.'; term_dict[j++] = '*'; if (!term_100(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ".*)"); break; case 101: /* process # in term */ term_dict[j++] = '('; if (!term_101(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; case 102: /* Regexp-1 */ term_dict[j++] = '('; if (!term_102(zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; case 103: /* Regexp-2 */ @@ -1115,36 +1239,54 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, if (!term_103 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, ®ex_range, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); case 104: /* process # and ! in term */ term_dict[j++] = '('; if (!term_104 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; case 105: /* process * and ! in term */ term_dict[j++] = '('; if (!term_105 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst, 1)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; case 106: /* process * and ! in term */ term_dict[j++] = '('; if (!term_105 (zh->reg->zebra_maps, reg_type, &termp, term_dict + j, space_split, term_dst, 0)) - return 0; + { + *term_sub = 0; + return ZEBRA_OK; + } strcat(term_dict, ")"); break; default: zh->errCode = 120; zh->errString = nmem_strdup_i(stream, truncation_value); - return -1; + return ZEBRA_FAIL; } if (attr_ok) { + 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, @@ -1157,11 +1299,11 @@ static int string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, { zh->errCode = errCode; zh->errString = errString; - return -1; + return ZEBRA_FAIL; } *term_sub = termp; yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); - return 1; + return ZEBRA_OK; } @@ -1355,15 +1497,15 @@ static int grep_info_prepare (ZebraHandle zh, } -static RSET 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, - int num_bases, char **basenames, - NMEM rset_nmem) +static RSET 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, + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[TERM_LIST_LENGTH_MAX], result; @@ -1379,15 +1521,22 @@ static RSET rpn_search_APT_phrase (ZebraHandle zh, { yaz_log(log_level_rpn, "APT_phrase termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, - stream, &grep_info, - reg_type, complete_flag, - num_bases, basenames, - term_dst, rank_type, - xpath_use,rset_nmem); - if (!rset[rset_no]) - break; + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type, + xpath_use, rset_nmem); + if (!rset[rset_no]) /* error or no more terms */ + break; } grep_info_delete (&grep_info); + if (termp) + { + int i; + for (i = 0; iscope, + return rsmulti_or_create(rset_nmem, key_it_ctrl, key_it_ctrl->scope, rset_no, rset); } -static RSET rpn_search_APT_and_list (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, - int num_bases, char **basenames, - NMEM rset_nmem) +static RSET rpn_search_APT_and_list(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, + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; RSET rset[TERM_LIST_LENGTH_MAX]; @@ -1457,36 +1613,44 @@ static RSET rpn_search_APT_and_list (ZebraHandle zh, char *termz = normalize_term(zh, zapt, termz_org, stream, reg_type); const char *termp = termz; - if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) + if (grep_info_prepare(zh, zapt, &grep_info, reg_type, stream)) return 0; for (; rset_no < sizeof(rset)/sizeof(*rset); rset_no++) { yaz_log(log_level_rpn, "APT_and_list termp=%s", termp); rset[rset_no] = term_trunc(zh, zapt, &termp, attributeSet, - stream, &grep_info, - reg_type, complete_flag, - num_bases, basenames, - term_dst, rank_type, - xpath_use, rset_nmem); - if (!rset[rset_no]) - break; + stream, &grep_info, + reg_type, complete_flag, + num_bases, basenames, + term_dst, rank_type, + xpath_use, rset_nmem); + if (!rset[rset_no]) /* error or no more terms */ + break; } grep_info_delete (&grep_info); + if (termp) + { + int i; + for (i = 0; iscope, rset_no, rset); } -static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char **term_sub, - char *term_dict, - oid_value attributeSet, - struct grep_info *grep_info, - int *max_pos, - int reg_type, - char *term_dst) +static int numeric_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + const char **term_sub, + char *term_dict, + oid_value attributeSet, + struct grep_info *grep_info, + int *max_pos, + int reg_type, + char *term_dst, + int *error_code) { AttrType relation; int relation_value; @@ -1494,37 +1658,42 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, int r; char *term_tmp = term_dict + strlen(term_dict); + *error_code = 0; attr_init (&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)) + 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 <"); - gen_regular_rel (term_tmp, term_value-1, 1); + gen_regular_rel(term_tmp, term_value-1, 1); break; case 2: yaz_log(log_level_rpn, "Relation <="); - gen_regular_rel (term_tmp, term_value, 1); + gen_regular_rel(term_tmp, term_value, 1); break; case 4: yaz_log(log_level_rpn, "Relation >="); - gen_regular_rel (term_tmp, term_value, 0); + gen_regular_rel(term_tmp, term_value, 0); break; case 5: yaz_log(log_level_rpn, "Relation >"); - gen_regular_rel (term_tmp, term_value+1, 0); + gen_regular_rel(term_tmp, term_value+1, 0); break; + case -1: case 3: - default: yaz_log(log_level_rpn, "Relation ="); - sprintf (term_tmp, "(0*%d)", term_value); + sprintf(term_tmp, "(0*%d)", term_value); + break; + default: + *error_code = 117; + return 0; } yaz_log(log_level_rpn, "dict_lookup_grep: %s", term_tmp); r = dict_lookup_grep(zh->reg->dict, term_dict, 0, grep_info, max_pos, @@ -1535,12 +1704,13 @@ static int numeric_relation (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return 1; } -static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, - const char **term_sub, - oid_value attributeSet, struct grep_info *grep_info, - int reg_type, int complete_flag, - int num_bases, char **basenames, - char *term_dst, int xpath_use, NMEM stream) +static ZEBRA_RES numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + const char **term_sub, + oid_value attributeSet, + 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_dict[2*IT_MAX_WORD+2]; int r, base_no; @@ -1568,6 +1738,7 @@ static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, data1_local_attribute id_xpath_attr; data1_local_attribute *local_attr; int max_pos, prefix_len = 0; + int relation_error = 0; termp = *term_sub; if (use_value == -2) /* string attribute (assume IDXPATH/any) */ @@ -1594,8 +1765,11 @@ static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, curAttributeSet, use_value, r); if (r == -1) { - errString = nmem_strdup_i(stream, use_value); errCode = 114; + if (use_string) + errString = nmem_strdup(stream, use_string); + else + errString = nmem_strdup_i (stream, use_value); } else errCode = 121; @@ -1615,8 +1789,9 @@ static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, char ord_buf[32]; int i, ord_len; - ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, - local_attr->local); + ord = zebraExplain_lookup_attr_su(zh->reg->zei, + attp.attset_ordinal, + local_attr->local); if (ord < 0) continue; if (prefix_len) @@ -1643,36 +1818,45 @@ static int numeric_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, term_dict[prefix_len++] = reg_type; yaz_log(YLOG_DEBUG, "reg_type = %d", term_dict[prefix_len-1]); term_dict[prefix_len] = '\0'; - if (!numeric_relation (zh, zapt, &termp, term_dict, - attributeSet, grep_info, &max_pos, reg_type, - term_dst)) - return 0; + if (!numeric_relation(zh, zapt, &termp, term_dict, + attributeSet, grep_info, &max_pos, reg_type, + term_dst, &relation_error)) + { + if (relation_error) + { + zh->errCode = relation_error; + zh->errString = 0; + return ZEBRA_FAIL; + } + *term_sub = 0; + return ZEBRA_OK; + } } if (!bases_ok) { zh->errCode = errCode; zh->errString = errString; - return -1; + return ZEBRA_FAIL; } *term_sub = termp; yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx); - return 1; + return ZEBRA_OK; } -static RSET 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, - int num_bases, char **basenames, - NMEM rset_nmem) +static RSET 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, + int num_bases, char **basenames, + NMEM rset_nmem) { char term_dst[IT_MAX_WORD+1]; const char *termp = termz; RSET rset[TERM_LIST_LENGTH_MAX]; - int r; + ZEBRA_RES r; size_t rset_no = 0; struct grep_info grep_info; @@ -1684,22 +1868,29 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, yaz_log(YLOG_DEBUG, "APT_numeric termp=%s", termp); grep_info.isam_p_indx = 0; r = numeric_term(zh, zapt, &termp, attributeSet, &grep_info, - reg_type, complete_flag, num_bases, basenames, - term_dst, xpath_use, - stream); - if (r < 1) - break; + reg_type, complete_flag, num_bases, basenames, + term_dst, xpath_use, + stream); + if (r == ZEBRA_FAIL || termp == 0) + break; yaz_log(YLOG_DEBUG, "term: %s", term_dst); 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 */, - zapt->term->which, rset_nmem, - key_it_ctrl,key_it_ctrl->scope); + grep_info.isam_p_indx, term_dst, + strlen(term_dst), rank_type, + 0 /* preserve position */, + zapt->term->which, rset_nmem, + key_it_ctrl,key_it_ctrl->scope); if (!rset[rset_no]) break; } grep_info_delete (&grep_info); + if (termp) + { + int i; + for (i = 0; ireg->zei, curAttributeSet, use); + int ord = zebraExplain_lookup_attr_su(zh->reg->zei, curAttributeSet, use); int ord_len, i, r, max_pos; int term_type = Z_Term_characterString; const char *flags = "void"; @@ -1886,12 +2077,12 @@ static RSET xpath_trunc(ZebraHandle zh, NMEM stream, 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 (YLOG_LOG, "%s %d positions", term, + yaz_log (YLOG_DEBUG, "%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,rset_nmem, - key_it_ctrl, key_it_ctrl->scope); + grep_info.isam_p_indx, term, strlen(term), + flags, 1, term_type,rset_nmem, + key_it_ctrl, key_it_ctrl->scope); grep_info_delete (&grep_info); return rset; } @@ -2042,11 +2233,11 @@ static RSET rpn_search_xpath (ZebraHandle zh, -static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, - oid_value attributeSet, NMEM stream, - Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames, - NMEM rset_nmem) +static RSET rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt, + oid_value attributeSet, NMEM stream, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames, + NMEM rset_nmem) { unsigned reg_id; char *search_type = NULL; @@ -2064,8 +2255,8 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, log_level_rpn = yaz_log_module_level("rpn"); log_level_set = 1; } - zebra_maps_attr (zh->reg->zebra_maps, zapt, ®_id, &search_type, - rank_type, &complete_flag, &sort_flag); + zebra_maps_attr(zh->reg->zebra_maps, zapt, ®_id, &search_type, + rank_type, &complete_flag, &sort_flag); yaz_log(YLOG_DEBUG, "reg_id=%c", reg_id); yaz_log(YLOG_DEBUG, "complete_flag=%d", complete_flag); @@ -2076,8 +2267,8 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, return 0; if (sort_flag) - return rpn_sort_spec (zh, zapt, attributeSet, stream, sort_sequence, - rank_type); + return rpn_sort_spec(zh, zapt, attributeSet, stream, sort_sequence, + rank_type); xpath_len = parse_xpath(zh, zapt, attributeSet, xpath, 10, stream); if (xpath_len >= 0) { @@ -2088,53 +2279,56 @@ static RSET rpn_search_APT (ZebraHandle zh, Z_AttributesPlusTerm *zapt, 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, rset_nmem); + rset = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem); } 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, rset_nmem); + rset = rpn_search_APT_and_list(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem); } 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, rset_nmem); + rset = rpn_search_APT_or_list(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "local")) { - rset = rpn_search_APT_local (zh, zapt, termz, attributeSet, stream, - rank_type, rset_nmem); + rset = rpn_search_APT_local(zh, zapt, termz, attributeSet, stream, + rank_type, rset_nmem); } else if (!strcmp (search_type, "numeric")) { - rset = rpn_search_APT_numeric (zh, zapt, termz, attributeSet, stream, - reg_id, complete_flag, rank_type, - xpath_use, - num_bases, basenames, rset_nmem); + rset = rpn_search_APT_numeric(zh, zapt, termz, attributeSet, stream, + reg_id, complete_flag, rank_type, + xpath_use, + num_bases, basenames, rset_nmem); } else if (!strcmp (search_type, "always")) { rset = 0; } else + { zh->errCode = 118; + return 0; + } return rpn_search_xpath (zh, attributeSet, num_bases, basenames, stream, rank_type, rset, xpath_len, xpath, rset_nmem); } -static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, - oid_value attributeSet, - NMEM stream, NMEM rset_nmem, - Z_SortKeySpecList *sort_sequence, - int num_bases, char **basenames) +RSET rpn_search_structure(ZebraHandle zh, Z_RPNStructure *zs, + oid_value attributeSet, + NMEM stream, NMEM rset_nmem, + Z_SortKeySpecList *sort_sequence, + int num_bases, char **basenames) { RSET r = NULL; if (zs->which == Z_RPNStructure_complex) @@ -2142,19 +2336,19 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, Z_Operator *zop = zs->u.complex->roperator; RSET rsets[2]; /* l and r argument */ - rsets[0]=rpn_search_structure (zh, zs->u.complex->s1, - attributeSet, stream, rset_nmem, - sort_sequence, - num_bases, basenames); + rsets[0] = rpn_search_structure(zh, zs->u.complex->s1, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames); if (rsets[0] == NULL) return NULL; - rsets[1]=rpn_search_structure (zh, zs->u.complex->s2, - attributeSet, stream, rset_nmem, - sort_sequence, - num_bases, basenames); + rsets[1] = rpn_search_structure(zh, zs->u.complex->s2, + attributeSet, stream, rset_nmem, + sort_sequence, + num_bases, basenames); if (rsets[1] == NULL) { - rset_delete (rsets[0]); + rset_delete(rsets[0]); return NULL; } @@ -2170,7 +2364,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, break; case Z_Operator_and_not: r = rsbool_create_not(rset_nmem,key_it_ctrl, key_it_ctrl->scope, - rsets[0],rsets[1]); + rsets[0], rsets[1]); break; case Z_Operator_prox: if (zop->u.prox->which != Z_ProximityOperator_known) @@ -2208,9 +2402,9 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, if (zs->u.simple->which == Z_Operand_APT) { yaz_log(YLOG_DEBUG, "rpn_search_APT"); - r = rpn_search_APT (zh, zs->u.simple->u.attributesPlusTerm, - attributeSet, stream, sort_sequence, - num_bases, basenames,rset_nmem); + r = rpn_search_APT(zh, zs->u.simple->u.attributesPlusTerm, + attributeSet, stream, sort_sequence, + num_bases, basenames,rset_nmem); } else if (zs->u.simple->which == Z_Operand_resultSetId) { @@ -2218,14 +2412,12 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, r = resultSetRef (zh, zs->u.simple->u.resultSetId); if (!r) { - r = rsnull_create (rset_nmem,key_it_ctrl); zh->errCode = 30; zh->errString = nmem_strdup (stream, zs->u.simple->u.resultSetId); return 0; } - else - rset_dup(r); + rset_dup(r); } else { @@ -2241,63 +2433,9 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, return r; } - -RSET rpn_search(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, - Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname, - ZebraSet sset) -{ - RSET rset; - oident *attrset; - oid_value attributeSet; - Z_SortKeySpecList *sort_sequence; - int sort_status, i; - - zh->errCode = 0; - zh->errString = NULL; - zh->hits = 0; - - sort_sequence = (Z_SortKeySpecList *) - nmem_malloc(nmem, sizeof(*sort_sequence)); - sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */ - sort_sequence->specs = (Z_SortKeySpec **) - nmem_malloc(nmem, sort_sequence->num_specs * - sizeof(*sort_sequence->specs)); - for (i = 0; inum_specs; i++) - sort_sequence->specs[i] = 0; - - attrset = oid_getentbyoid (rpn->attributeSetId); - attributeSet = attrset->value; - rset = rpn_search_structure (zh, rpn->RPNStructure, attributeSet, - nmem, rset_nmem, - sort_sequence, num_bases, basenames); - if (!rset) - return 0; - - if (zh->errCode) - yaz_log(YLOG_DEBUG, "search error: %d", zh->errCode); - - for (i = 0; sort_sequence->specs[i]; i++) - ; - sort_sequence->num_specs = i; - if (!i) - resultSetRank (zh, sset, rset, rset_nmem); - else - { - yaz_log(YLOG_DEBUG, "resultSetSortSingle in rpn_search"); - resultSetSortSingle (zh, nmem, sset, rset, - sort_sequence, &sort_status); - if (zh->errCode) - { - yaz_log(YLOG_DEBUG, "resultSetSortSingle status = %d", zh->errCode); - } - } - return rset; -} - struct scan_info_entry { char *term; - ISAMC_P isam_p; + ISAM_P isam_p; }; struct scan_info { @@ -2321,8 +2459,8 @@ static int scan_handle (char *name, const char *info, int pos, void *client) scan_info->list[idx].term = (char *) odr_malloc(scan_info->odr, strlen(name + len_prefix)+1); strcpy(scan_info->list[idx].term, name + len_prefix); - assert (*info == sizeof(ISAMC_P)); - memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAMC_P)); + assert (*info == sizeof(ISAM_P)); + memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P)); return 0; } @@ -2382,11 +2520,11 @@ static void count_set (RSET r, int *count) yaz_log(YLOG_DEBUG, "%d keys, %d records", kno, *count); } -void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int num_bases, char **basenames, - int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial, RSET limit_set, int return_zero) +ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, + oid_value attributeset, + int num_bases, char **basenames, + int *position, int *num_entries, ZebraScanEntry **list, + int *is_partial, RSET limit_set, int return_zero) { int i; int pos = *position; @@ -2415,6 +2553,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, NMEM rset_nmem = NULL; *list = 0; + *is_partial = 0; if (attributeset == VAL_NONE) attributeset = VAL_BIB1; @@ -2456,7 +2595,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, { *num_entries = 0; zh->errCode = 113; - return ; + return ZEBRA_FAIL; } yaz_log (YLOG_DEBUG, "use_value = %d", use_value); @@ -2464,55 +2603,75 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, use_value = 1016; for (base_no = 0; base_no < num_bases && ord_no < 32; base_no++) { - int r; - attent attp; - data1_local_attribute *local_attr; + data1_local_attribute *local_attr; + attent attp; + int ord; - 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) - { - char val_str[32]; - sprintf (val_str, "%d", use_value); - errCode = 114; - errString = odr_strdup (stream, val_str); - } - else - errCode = 121; - continue; - } - if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) - { - zh->errString = basenames[base_no]; - zh->errCode = 109; /* Database unavailable */ - *num_entries = 0; - return; - } - bases_ok++; - for (local_attr = attp.local_attributes; local_attr && ord_no < 32; - local_attr = local_attr->next) - { - int ord; + if (zebraExplain_curDatabase (zh->reg->zei, basenames[base_no])) + { + zh->errString = basenames[base_no]; + zh->errCode = 109; /* Database unavailable */ + *num_entries = 0; + return ZEBRA_FAIL; + } - ord = zebraExplain_lookupSU (zh->reg->zei, attp.attset_ordinal, - local_attr->local); - if (ord > 0) - ords[ord_no++] = ord; - } + 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 = 114; + 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 = 121; + 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 (ord_no == 0) { *num_entries = 0; - return; + return ZEBRA_OK; } /* prepare dictionary scanning */ before = pos-1; @@ -2543,7 +2702,7 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, strcpy(scan_info->prefix, termz); if (trans_scan_term(zh, zapt, termz+prefix_len, reg_id)) - return ; + return ZEBRA_FAIL; dict_scan(zh->reg->dict, termz, &before_tmp, &after_tmp, scan_info, scan_handle); @@ -2704,7 +2863,6 @@ void rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, yaz_log(YLOG_DEBUG, "position = %d, num_entries = %d", *position, *num_entries); - if (zh->errCode) - yaz_log(YLOG_DEBUG, "scan error: %d", zh->errCode); + return ZEBRA_OK; }