-/* $Id: rpnsearch.c,v 1.16 2007-10-29 16:57:53 adam Exp $
+/* $Id: rpnsearch.c,v 1.19 2007-10-31 16:56:14 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
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;
- const char **out = zebra_maps_input(p->zm, p->reg_type, from, len, 0);
+ const char **out = zebra_maps_input(p->zm, from, len, 0);
#if 0
if (out && *out)
{
return out;
}
-void rpn_char_map_prepare(struct zebra_register *reg, int reg_type,
+void rpn_char_map_prepare(struct zebra_register *reg, zebra_map_t zm,
struct rpn_char_map_info *map_info)
{
- map_info->zm = reg->zebra_maps;
- map_info->reg_type = reg_type;
+ map_info->zm = zm;
dict_grep_cmap(reg->dict, map_info, rpn_char_map_handler);
}
int isam_p_indx;
int trunc_max;
ZebraHandle zh;
- int reg_type;
+ const char *index_type;
ZebraSet termset;
};
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);
+ zebra_term_untrans (p->zh, p->index_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);
return add_isam_p(name, info, (struct grep_info *) p);
}
-static int term_pre(ZebraMaps zebra_maps, int reg_type, const char **src,
+static int term_pre(zebra_map_t zm, const char **src,
const char *ct1, const char *ct2, int first)
{
const char *s1, *s0 = *src;
if (ct2 && strchr(ct2, *s0))
break;
s1 = s0;
- map = zebra_maps_input(zebra_maps, reg_type, &s1, strlen(s1), first);
+ map = zebra_maps_input(zm, &s1, strlen(s1), first);
if (**map != *CHR_SPACE)
break;
s0 = s1;
}
/* term_100: handle term, where trunc = none(no operators at all) */
-static int term_100(ZebraMaps zebra_maps, const char *index_type,
+static int term_100(zebra_map_t zm,
const char **src, WRBUF term_dict, int space_split,
char *dst_term)
{
const char *space_start = 0;
const char *space_end = 0;
- if (!term_pre(zebra_maps, *index_type, src, NULL, NULL, !space_split))
+ if (!term_pre(zm, src, NULL, NULL, !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
- &q_map_match);
+ map = zebra_maps_search(zm, &s0, strlen(s0), &q_map_match);
if (space_split)
{
if (**map == *CHR_SPACE)
}
/* term_101: handle term, where trunc = Process # */
-static int term_101(ZebraMaps zebra_maps, const char *index_type,
+static int term_101(zebra_map_t zm,
const char **src, WRBUF term_dict, int space_split,
char *dst_term)
{
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, *index_type, src, "#", "#", !space_split))
+ if (!term_pre(zm, src, "#", "#", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
- &q_map_match);
+ map = zebra_maps_search(zm, &s0, strlen(s0), &q_map_match);
if (space_split && **map == *CHR_SPACE)
break;
}
/* term_103: handle term, where trunc = re-2 (regular expressions) */
-static int term_103(ZebraMaps zebra_maps, const char *index_type,
- const char **src,
+static int term_103(zebra_map_t zm, const char **src,
WRBUF term_dict, int *errors, int space_split,
char *dst_term)
{
const char *s0;
const char **map;
- if (!term_pre(zebra_maps, *index_type, src, "^\\()[].*+?|", "(", !space_split))
+ if (!term_pre(zm, src, "^\\()[].*+?|", "(", !space_split))
return 0;
s0 = *src;
if (errors && *s0 == '+' && s0[1] && s0[2] == '+' && s0[3] &&
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
- &q_map_match);
+ map = zebra_maps_search(zm, &s0, strlen(s0), &q_map_match);
if (space_split && **map == *CHR_SPACE)
break;
}
/* term_103: handle term, where trunc = re-1 (regular expressions) */
-static int term_102(ZebraMaps zebra_maps, const char *index_type,
- const char **src,
+static int term_102(zebra_map_t zm, const char **src,
WRBUF term_dict, int space_split, char *dst_term)
{
- return term_103(zebra_maps, index_type, src, term_dict, NULL, space_split,
- dst_term);
+ return term_103(zm, src, term_dict, NULL, space_split, dst_term);
}
/* term_104: handle term, process # and ! */
-static int term_104(ZebraMaps zebra_maps, const char *index_type,
- const char **src, WRBUF term_dict, int space_split,
- char *dst_term)
+static int term_104(zebra_map_t zm, const char **src,
+ WRBUF term_dict, int space_split, char *dst_term)
{
const char *s0;
const char **map;
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, *index_type, src, "?*#", "?*#", !space_split))
+ if (!term_pre(zm, src, "?*#", "?*#", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
- &q_map_match);
+ map = zebra_maps_search(zm, &s0, strlen(s0), &q_map_match);
if (space_split && **map == *CHR_SPACE)
break;
}
/* term_105/106: handle term, where trunc = Process * and ! and right trunc */
-static int term_105(ZebraMaps zebra_maps, const char *index_type,
- const char **src, WRBUF term_dict, int space_split,
+static int term_105(zebra_map_t zm, const char **src,
+ WRBUF term_dict, int space_split,
char *dst_term, int right_truncate)
{
const char *s0;
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, *index_type, src, "*!", "*!", !space_split))
+ if (!term_pre(zm, src, "*!", "*!", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
- &q_map_match);
+ map = zebra_maps_search(zm, &s0, strlen(s0), &q_map_match);
if (space_split && **map == *CHR_SPACE)
break;
static int string_relation(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const char **term_sub, WRBUF term_dict,
const Odr_oid *attributeSet,
- const char *index_type, int space_split, char *term_dst,
+ zebra_map_t zm, int space_split, char *term_dst,
int *error_code)
{
AttrType relation;
switch (relation_value)
{
case 1:
- if (!term_100(zh->reg->zebra_maps, index_type,
- term_sub, term_component,
- space_split, term_dst))
+ if (!term_100(zm, term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
return 0;
wrbuf_putc(term_dict, ')');
break;
case 2:
- if (!term_100(zh->reg->zebra_maps, index_type,
- term_sub, term_component,
- space_split, term_dst))
+ if (!term_100(zm, term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
return 0;
wrbuf_putc(term_dict, ')');
break;
case 5:
- if (!term_100(zh->reg->zebra_maps, index_type,
- term_sub, term_component, space_split, term_dst))
+ if (!term_100(zm, term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
return 0;
wrbuf_putc(term_dict, ')');
break;
case 4:
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub,
- term_component, space_split, term_dst))
+ if (!term_100(zm, term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
return 0;
if (!**term_sub)
return 1;
yaz_log(log_level_rpn, "Relation =");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub,
- term_component, space_split, term_dst))
+ if (!term_100(zm, term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
return 0;
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
const char *index_type, int complete_flag,
- int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
struct ord_list **ol);
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
const char *index_type, int complete_flag,
- int num_bases, char **basenames,
char *term_dst,
const char *rank_type,
const char *xpath_use,
grep_info->isam_p_indx = 0;
res = string_term(zh, zapt, term_sub, term_dict,
attributeSet, stream, grep_info,
- index_type, complete_flag, num_bases, basenames,
+ index_type, complete_flag,
term_dst, xpath_use, &ol);
wrbuf_destroy(term_dict);
if (res != ZEBRA_OK)
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
const char *index_type, int complete_flag,
- int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
struct ord_list **ol)
{
- int r, base_no;
+ int r;
AttrType truncation;
int truncation_value;
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 space_split = complete_flag ? 0 : 1;
+ int ord = -1;
+ int regex_range = 0;
+ int max_pos, prefix_len = 0;
+ int relation_error;
+ char ord_buf[32];
+ int ord_len, i;
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+
*ol = ord_list_create(stream);
- rpn_char_map_prepare(zh->reg, *index_type, &rcmi);
+ rpn_char_map_prepare(zh->reg, zm, &rcmi);
attr_init_APT(&truncation, zapt, 5);
truncation_value = attr_find(&truncation, NULL);
yaz_log(log_level_rpn, "truncation value %d", truncation_value);
- for (base_no = 0; base_no < num_bases; base_no++)
+ termp = *term_sub; /* start of term for each database */
+
+ if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
+ attributeSet, &ord) != ZEBRA_OK)
{
- int ord = -1;
- int regex_range = 0;
- int max_pos, prefix_len = 0;
- int relation_error;
- char ord_buf[32];
- int ord_len, i;
-
- termp = *term_sub; /* start of term for each database */
-
-
- if (zebraExplain_curDatabase(zh->reg->zei, basenames[base_no]))
+ *term_sub = 0;
+ return ZEBRA_FAIL;
+ }
+
+ wrbuf_rewind(term_dict); /* new dictionary regexp term */
+
+ *ol = ord_list_append(stream, *ol, ord);
+ ord_len = key_SU_encode(ord, ord_buf);
+
+ wrbuf_putc(term_dict, '(');
+
+ for (i = 0; i<ord_len; i++)
+ {
+ wrbuf_putc(term_dict, 1); /* our internal regexp escape char */
+ wrbuf_putc(term_dict, ord_buf[i]);
+ }
+ wrbuf_putc(term_dict, ')');
+
+ prefix_len = wrbuf_len(term_dict);
+
+ switch (truncation_value)
+ {
+ case -1: /* not specified */
+ case 100: /* do not truncate */
+ if (!string_relation(zh, zapt, &termp, term_dict,
+ attributeSet,
+ zm, space_split, term_dst,
+ &relation_error))
{
- zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
- basenames[base_no]);
- return ZEBRA_FAIL;
+ if (relation_error)
+ {
+ zebra_setError(zh, relation_error, 0);
+ return ZEBRA_FAIL;
+ }
+ *term_sub = 0;
+ return ZEBRA_OK;
}
-
- if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
- attributeSet, &ord) != ZEBRA_OK)
- continue;
-
-
- wrbuf_rewind(term_dict); /* new dictionary regexp term */
-
- bases_ok++;
-
- *ol = ord_list_append(stream, *ol, ord);
- ord_len = key_SU_encode(ord, ord_buf);
-
+ break;
+ case 1: /* right truncation */
wrbuf_putc(term_dict, '(');
-
- for (i = 0; i<ord_len; i++)
+ if (!term_100(zm, &termp, term_dict, space_split, term_dst))
{
- wrbuf_putc(term_dict, 1); /* our internal regexp escape char */
- wrbuf_putc(term_dict, ord_buf[i]);
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_puts(term_dict, ".*)");
+ break;
+ case 2: /* keft truncation */
+ wrbuf_puts(term_dict, "(.*");
+ if (!term_100(zm, &termp, term_dict, space_split, term_dst))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
}
wrbuf_putc(term_dict, ')');
-
- prefix_len = wrbuf_len(term_dict);
-
- switch (truncation_value)
+ break;
+ case 3: /* left&right truncation */
+ wrbuf_puts(term_dict, "(.*");
+ if (!term_100(zm, &termp, term_dict, space_split, term_dst))
{
- case -1: /* not specified */
- case 100: /* do not truncate */
- if (!string_relation(zh, zapt, &termp, term_dict,
- attributeSet,
- index_type, space_split, term_dst,
- &relation_error))
- {
- if (relation_error)
- {
- zebra_setError(zh, relation_error, 0);
- return ZEBRA_FAIL;
- }
- *term_sub = 0;
- return ZEBRA_OK;
- }
- break;
- case 1: /* right truncation */
- wrbuf_putc(term_dict, '(');
- if (!term_100(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_puts(term_dict, ".*)");
- break;
- case 2: /* keft truncation */
- wrbuf_puts(term_dict, "(.*");
- if (!term_100(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- case 3: /* left&right truncation */
- wrbuf_puts(term_dict, "(.*");
- if (!term_100(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_puts(term_dict, ".*)");
- break;
- case 101: /* process # in term */
- wrbuf_putc(term_dict, '(');
- if (!term_101(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_puts(term_dict, ")");
- break;
- case 102: /* Regexp-1 */
- wrbuf_putc(term_dict, '(');
- if (!term_102(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- case 103: /* Regexp-2 */
- regex_range = 1;
- wrbuf_putc(term_dict, '(');
- if (!term_103(zh->reg->zebra_maps, index_type,
- &termp, term_dict, ®ex_range,
- space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- case 104: /* process # and ! in term */
- wrbuf_putc(term_dict, '(');
- if (!term_104(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- case 105: /* process * and ! in term */
- wrbuf_putc(term_dict, '(');
- if (!term_105(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst, 1))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- case 106: /* process * and ! in term */
- wrbuf_putc(term_dict, '(');
- if (!term_105(zh->reg->zebra_maps, index_type,
- &termp, term_dict, space_split, term_dst, 0))
- {
- *term_sub = 0;
- return ZEBRA_OK;
- }
- wrbuf_putc(term_dict, ')');
- break;
- default:
- zebra_setError_zint(zh,
- YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE,
- truncation_value);
- return ZEBRA_FAIL;
+ *term_sub = 0;
+ return ZEBRA_OK;
}
- if (1)
- {
- char buf[1000];
- const char *input = wrbuf_cstr(term_dict) + prefix_len;
- esc_str(buf, sizeof(buf), input, strlen(input));
- }
- yaz_log(log_level_rpn, "dict_lookup_grep: %s",
- wrbuf_cstr(term_dict) + prefix_len);
- r = dict_lookup_grep(zh->reg->dict, wrbuf_cstr(term_dict), regex_range,
- grep_info, &max_pos,
- ord_len /* number of "exact" chars */,
- grep_handle);
- if (r == 1)
- zebra_set_partial_result(zh);
- else if (r)
- yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r);
- }
- if (!bases_ok)
+ wrbuf_puts(term_dict, ".*)");
+ break;
+ case 101: /* process # in term */
+ wrbuf_putc(term_dict, '(');
+ if (!term_101(zm, &termp, term_dict, space_split, term_dst))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_puts(term_dict, ")");
+ break;
+ case 102: /* Regexp-1 */
+ wrbuf_putc(term_dict, '(');
+ if (!term_102(zm, &termp, term_dict, space_split, term_dst))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_putc(term_dict, ')');
+ break;
+ case 103: /* Regexp-2 */
+ regex_range = 1;
+ wrbuf_putc(term_dict, '(');
+ if (!term_103(zm, &termp, term_dict, ®ex_range,
+ space_split, term_dst))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_putc(term_dict, ')');
+ break;
+ case 104: /* process # and ! in term */
+ wrbuf_putc(term_dict, '(');
+ if (!term_104(zm, &termp, term_dict, space_split, term_dst))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_putc(term_dict, ')');
+ break;
+ case 105: /* process * and ! in term */
+ wrbuf_putc(term_dict, '(');
+ if (!term_105(zm, &termp, term_dict, space_split, term_dst, 1))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_putc(term_dict, ')');
+ break;
+ case 106: /* process * and ! in term */
+ wrbuf_putc(term_dict, '(');
+ if (!term_105(zm, &termp, term_dict, space_split, term_dst, 0))
+ {
+ *term_sub = 0;
+ return ZEBRA_OK;
+ }
+ wrbuf_putc(term_dict, ')');
+ break;
+ default:
+ zebra_setError_zint(zh,
+ YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE,
+ truncation_value);
return ZEBRA_FAIL;
+ }
+ if (1)
+ {
+ char buf[1000];
+ const char *input = wrbuf_cstr(term_dict) + prefix_len;
+ esc_str(buf, sizeof(buf), input, strlen(input));
+ }
+ yaz_log(log_level_rpn, "dict_lookup_grep: %s",
+ wrbuf_cstr(term_dict) + prefix_len);
+ r = dict_lookup_grep(zh->reg->dict, wrbuf_cstr(term_dict), regex_range,
+ grep_info, &max_pos,
+ ord_len /* number of "exact" chars */,
+ grep_handle);
+ if (r == 1)
+ zebra_set_partial_result(zh);
+ else if (r)
+ yaz_log(YLOG_WARN, "dict_lookup_grep fail %d", r);
*term_sub = termp;
yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx);
return ZEBRA_OK;
static ZEBRA_RES grep_info_prepare(ZebraHandle zh,
Z_AttributesPlusTerm *zapt,
struct grep_info *grep_info,
- int reg_type)
+ const char *index_type)
{
#ifdef TERM_COUNT
grep_info->term_no = 0;
grep_info->isam_p_size = 0;
grep_info->isam_p_buf = NULL;
grep_info->zh = zh;
- grep_info->reg_type = reg_type;
+ grep_info->index_type = index_type;
grep_info->termset = 0;
if (zapt)
{
\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 index_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
const char *index_type, int complete_flag,
const char *rank_type,
const char *xpath_use,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET **result_sets, int *num_result_sets,
struct rset_key_control *kc)
*num_result_sets = 0;
*term_dst = 0;
- if (grep_info_prepare(zh, zapt, &grep_info, *index_type) == ZEBRA_FAIL)
+ if (grep_info_prepare(zh, zapt, &grep_info, index_type) == ZEBRA_FAIL)
return ZEBRA_FAIL;
while(1)
{
res = term_trunc(zh, zapt, &termp, attributeSet,
stream, &grep_info,
index_type, complete_flag,
- num_bases, basenames,
term_dst, rank_type,
xpath_use, rset_nmem,
&(*result_sets)[*num_result_sets],
Z_AttributesPlusTerm *zapt,
const Odr_oid *attributeSet,
const char *index_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;
-
+ int ord = -1;
+ char ord_buf[32];
+ char term_dict[100];
+ int ord_len;
+ char *val;
+ ISAM_P isam_p;
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+
attr_init_APT(&position, zapt, 3);
position_value = attr_find(&position, NULL);
switch(position_value)
return ZEBRA_FAIL;
}
- if (!zebra_maps_is_first_in_field(zh->reg->zebra_maps, *index_type))
+
+ if (!zebra_maps_is_first_in_field(zm))
{
zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE,
position_value);
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, index_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;
+ if (zebra_apt_get_ord(zh, zapt, index_type, 0,
+ attributeSet, &ord) != ZEBRA_OK)
+ {
+ return ZEBRA_FAIL;
+ }
+ 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)
+ {
assert(*val == sizeof(ISAM_P));
memcpy(&isam_p, val+1, sizeof(isam_p));
-
if (zh->reg->isamb)
- f_set[num_sets++] = rsisamb_create(rset_nmem, kc, kc->scope,
- zh->reg->isamb, isam_p, 0);
+ *rset = rsisamb_create(rset_nmem, kc, kc->scope,
+ zh->reg->isamb, isam_p, 0);
else if (zh->reg->isamc)
- f_set[num_sets++] = rsisamc_create(rset_nmem, kc, kc->scope,
- zh->reg->isamc, isam_p, 0);
+ *rset = rsisamc_create(rset_nmem, kc, kc->scope,
+ zh->reg->isamc, 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;
}
const char *index_type, int complete_flag,
const char *rank_type,
const char *xpath_use,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
term_list_trunc(zh, zapt, termz_org, attributeSet,
stream, index_type, complete_flag,
rank_type, xpath_use,
- num_bases, basenames,
rset_nmem,
&result_sets, &num_result_sets, kc);
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
index_type,
- num_bases, basenames,
rset_nmem, &first_set,
kc);
if (res != ZEBRA_OK)
int complete_flag,
const char *rank_type,
const char *xpath_use,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
term_list_trunc(zh, zapt, termz_org, attributeSet,
stream, index_type, complete_flag,
rank_type, xpath_use,
- num_bases, basenames,
rset_nmem,
&result_sets, &num_result_sets, kc);
if (res != ZEBRA_OK)
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
index_type,
- num_bases, basenames,
rset_nmem, &first_set,
kc);
if (res != ZEBRA_OK)
int complete_flag,
const char *rank_type,
const char *xpath_use,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
term_list_trunc(zh, zapt, termz_org, attributeSet,
stream, index_type, complete_flag,
rank_type, xpath_use,
- num_bases, basenames,
rset_nmem,
&result_sets, &num_result_sets,
kc);
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
index_type,
- num_bases, basenames,
rset_nmem, &first_set,
kc);
if (res != ZEBRA_OK)
*rset = result_sets[0];
else
*rset = rset_create_and(rset_nmem, kc, kc->scope,
- num_result_sets, result_sets);
+ num_result_sets, result_sets);
if (!*rset)
return ZEBRA_FAIL;
return ZEBRA_OK;
const Odr_oid *attributeSet,
struct grep_info *grep_info,
int *max_pos,
- const char *index_type,
+ zebra_map_t zm,
char *term_dst,
int *error_code)
{
{
case 1:
yaz_log(log_level_rpn, "Relation <");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
- term_dst))
+ if (!term_100(zm, term_sub, term_num, 1, term_dst))
{
wrbuf_destroy(term_num);
return 0;
break;
case 2:
yaz_log(log_level_rpn, "Relation <=");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
- term_dst))
+ if (!term_100(zm, term_sub, term_num, 1, term_dst))
{
wrbuf_destroy(term_num);
return 0;
break;
case 4:
yaz_log(log_level_rpn, "Relation >=");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
- term_dst))
+ if (!term_100(zm, term_sub, term_num, 1, term_dst))
{
wrbuf_destroy(term_num);
return 0;
break;
case 5:
yaz_log(log_level_rpn, "Relation >");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
- term_dst))
+ if (!term_100(zm, term_sub, term_num, 1, term_dst))
{
wrbuf_destroy(term_num);
return 0;
case -1:
case 3:
yaz_log(log_level_rpn, "Relation =");
- if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
- term_dst))
+ if (!term_100(zm, term_sub, term_num, 1, term_dst))
{
wrbuf_destroy(term_num);
return 0;
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
const char *index_type, int complete_flag,
- int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
struct ord_list **ol)
{
- int base_no;
const char *termp;
struct rpn_char_map_info rcmi;
-
- int bases_ok = 0; /* no of databases with OK attribute */
-
+ int max_pos;
+ int relation_error = 0;
+ int ord, ord_len, i;
+ char ord_buf[32];
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+
*ol = ord_list_create(stream);
- rpn_char_map_prepare(zh->reg, *index_type, &rcmi);
+ rpn_char_map_prepare(zh->reg, zm, &rcmi);
- for (base_no = 0; base_no < num_bases; base_no++)
+ termp = *term_sub;
+
+ if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
+ attributeSet, &ord) != ZEBRA_OK)
{
- int max_pos;
- int relation_error = 0;
- int ord, ord_len, i;
- char ord_buf[32];
-
- termp = *term_sub;
-
- if (zebraExplain_curDatabase(zh->reg->zei, basenames[base_no]))
+ return ZEBRA_FAIL;
+ }
+
+ wrbuf_rewind(term_dict);
+
+ *ol = ord_list_append(stream, *ol, ord);
+
+ ord_len = key_SU_encode(ord, ord_buf);
+
+ wrbuf_putc(term_dict, '(');
+ for (i = 0; i < ord_len; i++)
+ {
+ wrbuf_putc(term_dict, 1);
+ wrbuf_putc(term_dict, ord_buf[i]);
+ }
+ wrbuf_putc(term_dict, ')');
+
+ if (!numeric_relation(zh, zapt, &termp, term_dict,
+ attributeSet, grep_info, &max_pos, zm,
+ term_dst, &relation_error))
+ {
+ if (relation_error)
{
- zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
- basenames[base_no]);
+ zebra_setError(zh, relation_error, 0);
return ZEBRA_FAIL;
}
-
- if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
- attributeSet, &ord) != ZEBRA_OK)
- continue;
- bases_ok++;
-
- wrbuf_rewind(term_dict);
-
- *ol = ord_list_append(stream, *ol, ord);
-
- ord_len = key_SU_encode(ord, ord_buf);
-
- wrbuf_putc(term_dict, '(');
- for (i = 0; i < ord_len; i++)
- {
- wrbuf_putc(term_dict, 1);
- wrbuf_putc(term_dict, ord_buf[i]);
- }
- wrbuf_putc(term_dict, ')');
-
- if (!numeric_relation(zh, zapt, &termp, term_dict,
- attributeSet, grep_info, &max_pos, index_type,
- term_dst, &relation_error))
- {
- if (relation_error)
- {
- zebra_setError(zh, relation_error, 0);
- return ZEBRA_FAIL;
- }
- *term_sub = 0;
- return ZEBRA_OK;
- }
+ *term_sub = 0;
+ return ZEBRA_OK;
}
- if (!bases_ok)
- return ZEBRA_FAIL;
*term_sub = termp;
yaz_log(YLOG_DEBUG, "%d positions", grep_info->isam_p_indx);
return ZEBRA_OK;
int complete_flag,
const char *rank_type,
const char *xpath_use,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
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, *index_type) == ZEBRA_FAIL)
+ if (grep_info_prepare(zh, zapt, &grep_info, index_type) == ZEBRA_FAIL)
return ZEBRA_FAIL;
while (1)
{
grep_info.isam_p_indx = 0;
res = numeric_term(zh, zapt, &termp, term_dict,
attributeSet, stream, &grep_info,
- index_type, complete_flag, num_bases, basenames,
+ index_type, complete_flag,
term_dst, xpath_use, &ol);
wrbuf_destroy(term_dict);
if (res == ZEBRA_FAIL || termp == 0)
int ord = zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_index,
index_type, xpath_use);
- if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0') == ZEBRA_FAIL)
+ if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, "0") == ZEBRA_FAIL)
return rset_create_null(rset_nmem, kc, 0);
if (ord < 0)
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)
{
- int base_no;
int i;
int always_matches = rset ? 0 : 1;
*/
dict_grep_cmap(zh->reg->dict, 0, 0);
-
- for (base_no = 0; base_no < num_bases; base_no++)
+
{
int level = xpath_len;
int first_path = 1;
- if (zebraExplain_curDatabase(zh->reg->zei, basenames[base_no]))
- {
- zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
- basenames[base_no]);
- *rset_out = rset;
- return ZEBRA_FAIL;
- }
while (--level >= 0)
{
WRBUF xpath_rev = wrbuf_alloc();
Z_AttributesPlusTerm *zapt,
const Odr_oid *attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc);
break;
}
res = rpn_search_database(zh, zapt, attributeSet, stream,
- sort_sequence, 1, basenames+i,
+ sort_sequence,
rset_nmem, rsets+i, kc);
if (res != ZEBRA_OK)
break;
}
if (res != ZEBRA_OK)
{ /* must clean up the already created sets */
- int j;
- for (i = 0; j < i; j++)
- rset_delete(rsets[j]);
+ while (--i >= 0)
+ rset_delete(rsets[i]);
*rset = 0;
}
else
else if (num_bases == 0)
*rset = rset_create_null(rset_nmem, kc, 0);
else
- *rset = rset_create_and(rset_nmem, kc, kc->scope,
- num_bases, rsets);
+ *rset = rset_create_or(rset_nmem, kc, kc->scope, 0 /* TERMID */,
+ num_bases, rsets);
}
return res;
}
Z_AttributesPlusTerm *zapt,
const Odr_oid *attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
- int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
struct rset_key_control *kc)
if (relation_value == 103) /* alwaysmatches */
{
*rset = 0; /* signal no "term" set */
- return rpn_search_xpath(zh, num_bases, basenames,
- stream, rank_type, *rset,
+ return rpn_search_xpath(zh, stream, rank_type, *rset,
xpath_len, xpath, rset_nmem, rset, kc);
}
}
res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream,
index_type, complete_flag, rank_type,
xpath_use,
- num_bases, basenames, rset_nmem,
+ rset_nmem,
rset, kc);
}
else if (!strcmp(search_type, "and-list"))
res = rpn_search_APT_and_list(zh, zapt, termz, attributeSet, stream,
index_type, complete_flag, rank_type,
xpath_use,
- num_bases, basenames, rset_nmem,
+ rset_nmem,
rset, kc);
}
else if (!strcmp(search_type, "or-list"))
res = rpn_search_APT_or_list(zh, zapt, termz, attributeSet, stream,
index_type, complete_flag, rank_type,
xpath_use,
- num_bases, basenames, rset_nmem,
+ rset_nmem,
rset, kc);
}
else if (!strcmp(search_type, "local"))
res = rpn_search_APT_numeric(zh, zapt, termz, attributeSet, stream,
index_type, complete_flag, rank_type,
xpath_use,
- num_bases, basenames, rset_nmem,
+ rset_nmem,
rset, kc);
}
else
return res;
if (!*rset)
return ZEBRA_FAIL;
- return rpn_search_xpath(zh, num_bases, basenames,
- stream, rank_type, *rset,
+ return rpn_search_xpath(zh, stream, rank_type, *rset,
xpath_len, xpath, rset_nmem, rset, kc);
}
projects / idzebra-moved-to-github.git / blobdiff