-/* $Id: rpnsearch.c,v 1.15 2007-10-29 09:25:41 adam Exp $
+/* $Id: rpnsearch.c,v 1.16 2007-10-29 16:57:53 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
}
/* term_100: handle term, where trunc = none(no operators at all) */
-static int term_100(ZebraMaps zebra_maps, int reg_type,
+static int term_100(ZebraMaps zebra_maps, const char *index_type,
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, reg_type, src, NULL, NULL, !space_split))
+ if (!term_pre(zebra_maps, *index_type, 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, reg_type, &s0, strlen(s0),
+ map = zebra_maps_search(zebra_maps, *index_type, &s0, strlen(s0),
&q_map_match);
if (space_split)
{
}
/* term_101: handle term, where trunc = Process # */
-static int term_101(ZebraMaps zebra_maps, int reg_type,
+static int term_101(ZebraMaps zebra_maps, const char *index_type,
const char **src, WRBUF term_dict, int space_split,
char *dst_term)
{
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, reg_type, src, "#", "#", !space_split))
+ if (!term_pre(zebra_maps, *index_type, src, "#", "#", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0),
+ map = zebra_maps_search(zebra_maps, *index_type, &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, int reg_type, const char **src,
+static int term_103(ZebraMaps zebra_maps, const char *index_type,
+ 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, reg_type, src, "^\\()[].*+?|", "(", !space_split))
+ if (!term_pre(zebra_maps, *index_type, 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, reg_type, &s0, strlen(s0),
+ map = zebra_maps_search(zebra_maps, *index_type, &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, int reg_type, const char **src,
+static int term_102(ZebraMaps zebra_maps, const char *index_type,
+ const char **src,
WRBUF term_dict, int space_split, char *dst_term)
{
- return term_103(zebra_maps, reg_type, src, term_dict, NULL, space_split,
+ return term_103(zebra_maps, index_type, src, term_dict, NULL, space_split,
dst_term);
}
/* term_104: handle term, process # and ! */
-static int term_104(ZebraMaps zebra_maps, int reg_type,
+static int term_104(ZebraMaps zebra_maps, const char *index_type,
const char **src, WRBUF term_dict, int space_split,
char *dst_term)
{
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, reg_type, src, "?*#", "?*#", !space_split))
+ if (!term_pre(zebra_maps, *index_type, src, "?*#", "?*#", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0),
+ map = zebra_maps_search(zebra_maps, *index_type, &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, int reg_type,
+static int term_105(ZebraMaps zebra_maps, const char *index_type,
const char **src, WRBUF term_dict, int space_split,
char *dst_term, int right_truncate)
{
int i = 0;
int j = 0;
- if (!term_pre(zebra_maps, reg_type, src, "*!", "*!", !space_split))
+ if (!term_pre(zebra_maps, *index_type, src, "*!", "*!", !space_split))
return 0;
s0 = *src;
while (*s0)
{
const char *s1 = s0;
int q_map_match = 0;
- map = zebra_maps_search(zebra_maps, reg_type, &s0, strlen(s0),
+ map = zebra_maps_search(zebra_maps, *index_type, &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,
- int reg_type, int space_split, char *term_dst,
+ const char *index_type, int space_split, char *term_dst,
int *error_code)
{
AttrType relation;
switch (relation_value)
{
case 1:
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
term_sub, term_component,
space_split, term_dst))
{
wrbuf_putc(term_dict, ')');
break;
case 2:
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
term_sub, term_component,
space_split, term_dst))
{
wrbuf_putc(term_dict, ')');
break;
case 5:
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
term_sub, term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
wrbuf_putc(term_dict, ')');
break;
case 4:
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub,
term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
if (!**term_sub)
return 1;
yaz_log(log_level_rpn, "Relation =");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub,
term_component, space_split, term_dst))
{
wrbuf_destroy(term_component);
WRBUF term_dict,
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
const char **term_sub,
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
int num_bases, char **basenames,
char *term_dst,
const char *rank_type,
grep_info->isam_p_indx = 0;
res = string_term(zh, zapt, term_sub, term_dict,
attributeSet, stream, grep_info,
- reg_type, complete_flag, num_bases, basenames,
+ index_type, complete_flag, num_bases, basenames,
term_dst, xpath_use, &ol);
wrbuf_destroy(term_dict);
if (res != ZEBRA_OK)
grep_info->isam_p_indx, term_dst,
strlen(term_dst), rank_type, 1 /* preserve pos */,
zapt->term->which, rset_nmem,
- kc, kc->scope, ol, reg_type, hits_limit_value,
+ kc, kc->scope, ol, index_type, hits_limit_value,
term_ref_id_str);
if (!*rset)
return ZEBRA_FAIL;
WRBUF term_dict,
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
*ol = ord_list_create(stream);
- rpn_char_map_prepare(zh->reg, reg_type, &rcmi);
+ rpn_char_map_prepare(zh->reg, *index_type, &rcmi);
attr_init_APT(&truncation, zapt, 5);
truncation_value = attr_find(&truncation, NULL);
yaz_log(log_level_rpn, "truncation value %d", truncation_value);
return ZEBRA_FAIL;
}
- if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use,
+ if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
attributeSet, &ord) != ZEBRA_OK)
continue;
case 100: /* do not truncate */
if (!string_relation(zh, zapt, &termp, term_dict,
attributeSet,
- reg_type, space_split, term_dst,
+ index_type, space_split, term_dst,
&relation_error))
{
if (relation_error)
break;
case 1: /* right truncation */
wrbuf_putc(term_dict, '(');
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
break;
case 2: /* keft truncation */
wrbuf_puts(term_dict, "(.*");
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
break;
case 3: /* left&right truncation */
wrbuf_puts(term_dict, "(.*");
- if (!term_100(zh->reg->zebra_maps, reg_type,
+ if (!term_100(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
break;
case 101: /* process # in term */
wrbuf_putc(term_dict, '(');
- if (!term_101(zh->reg->zebra_maps, reg_type,
+ if (!term_101(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
break;
case 102: /* Regexp-1 */
wrbuf_putc(term_dict, '(');
- if (!term_102(zh->reg->zebra_maps, reg_type,
+ if (!term_102(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
case 103: /* Regexp-2 */
regex_range = 1;
wrbuf_putc(term_dict, '(');
- if (!term_103(zh->reg->zebra_maps, reg_type,
+ if (!term_103(zh->reg->zebra_maps, index_type,
&termp, term_dict, ®ex_range,
space_split, term_dst))
{
break;
case 104: /* process # and ! in term */
wrbuf_putc(term_dict, '(');
- if (!term_104(zh->reg->zebra_maps, reg_type,
+ if (!term_104(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst))
{
*term_sub = 0;
break;
case 105: /* process * and ! in term */
wrbuf_putc(term_dict, '(');
- if (!term_105(zh->reg->zebra_maps, reg_type,
+ if (!term_105(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst, 1))
{
*term_sub = 0;
break;
case 106: /* process * and ! in term */
wrbuf_putc(term_dict, '(');
- if (!term_105(zh->reg->zebra_maps, reg_type,
+ if (!term_105(zh->reg->zebra_maps, index_type,
&termp, term_dict, space_split, term_dst, 0))
{
*term_sub = 0;
const char *termz,
const Odr_oid *attributeSet,
NMEM stream,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
const char *rank_type,
const char *xpath_use,
int num_bases, char **basenames,
*num_result_sets = 0;
*term_dst = 0;
- if (grep_info_prepare(zh, zapt, &grep_info, reg_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,
- reg_type, complete_flag,
+ index_type, complete_flag,
num_bases, basenames,
term_dst, rank_type,
xpath_use, rset_nmem,
static ZEBRA_RES rpn_search_APT_position(ZebraHandle zh,
Z_AttributesPlusTerm *zapt,
const Odr_oid *attributeSet,
- int reg_type,
+ const char *index_type,
int num_bases, char **basenames,
NMEM rset_nmem,
RSET *rset,
return ZEBRA_FAIL;
}
- if (!zebra_maps_is_first_in_field(zh->reg->zebra_maps, reg_type))
+ if (!zebra_maps_is_first_in_field(zh->reg->zebra_maps, *index_type))
{
zebra_setError_zint(zh, YAZ_BIB1_UNSUPP_POSITION_ATTRIBUTE,
position_value);
return ZEBRA_FAIL;
}
- if (zebra_apt_get_ord(zh, zapt, reg_type, 0,
+ if (zebra_apt_get_ord(zh, zapt, index_type, 0,
attributeSet, &ord) != ZEBRA_OK)
continue;
const char *termz_org,
const Odr_oid *attributeSet,
NMEM stream,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
const char *rank_type,
const char *xpath_use,
int num_bases, char **basenames,
int num_result_sets = 0;
ZEBRA_RES res =
term_list_trunc(zh, zapt, termz_org, attributeSet,
- stream, reg_type, complete_flag,
+ stream, index_type, complete_flag,
rank_type, xpath_use,
num_bases, basenames,
rset_nmem,
{
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
- reg_type,
+ index_type,
num_bases, basenames,
rset_nmem, &first_set,
kc);
const char *termz_org,
const Odr_oid *attributeSet,
NMEM stream,
- int reg_type, int complete_flag,
+ const char *index_type,
+ int complete_flag,
const char *rank_type,
const char *xpath_use,
int num_bases, char **basenames,
int i;
ZEBRA_RES res =
term_list_trunc(zh, zapt, termz_org, attributeSet,
- stream, reg_type, complete_flag,
+ stream, index_type, complete_flag,
rank_type, xpath_use,
num_bases, basenames,
rset_nmem,
{
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
- reg_type,
+ index_type,
num_bases, basenames,
rset_nmem, &first_set,
kc);
const char *termz_org,
const Odr_oid *attributeSet,
NMEM stream,
- int reg_type, int complete_flag,
+ const char *index_type,
+ int complete_flag,
const char *rank_type,
const char *xpath_use,
int num_bases, char **basenames,
int i;
ZEBRA_RES res =
term_list_trunc(zh, zapt, termz_org, attributeSet,
- stream, reg_type, complete_flag,
+ stream, index_type, complete_flag,
rank_type, xpath_use,
num_bases, basenames,
rset_nmem,
{
RSET first_set = 0;
res = rpn_search_APT_position(zh, zapt, attributeSet,
- reg_type,
+ index_type,
num_bases, basenames,
rset_nmem, &first_set,
kc);
const Odr_oid *attributeSet,
struct grep_info *grep_info,
int *max_pos,
- int reg_type,
+ const char *index_type,
char *term_dst,
int *error_code)
{
{
case 1:
yaz_log(log_level_rpn, "Relation <");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_num, 1,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
term_dst))
{
wrbuf_destroy(term_num);
break;
case 2:
yaz_log(log_level_rpn, "Relation <=");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_num, 1,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
term_dst))
{
wrbuf_destroy(term_num);
break;
case 4:
yaz_log(log_level_rpn, "Relation >=");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_num, 1,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
term_dst))
{
wrbuf_destroy(term_num);
break;
case 5:
yaz_log(log_level_rpn, "Relation >");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_num, 1,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
term_dst))
{
wrbuf_destroy(term_num);
case -1:
case 3:
yaz_log(log_level_rpn, "Relation =");
- if (!term_100(zh->reg->zebra_maps, reg_type, term_sub, term_num, 1,
+ if (!term_100(zh->reg->zebra_maps, index_type, term_sub, term_num, 1,
term_dst))
{
wrbuf_destroy(term_num);
WRBUF term_dict,
const Odr_oid *attributeSet, NMEM stream,
struct grep_info *grep_info,
- int reg_type, int complete_flag,
+ const char *index_type, int complete_flag,
int num_bases, char **basenames,
char *term_dst,
const char *xpath_use,
*ol = ord_list_create(stream);
- rpn_char_map_prepare(zh->reg, reg_type, &rcmi);
+ rpn_char_map_prepare(zh->reg, *index_type, &rcmi);
for (base_no = 0; base_no < num_bases; base_no++)
{
return ZEBRA_FAIL;
}
- if (zebra_apt_get_ord(zh, zapt, reg_type, xpath_use,
+ if (zebra_apt_get_ord(zh, zapt, index_type, xpath_use,
attributeSet, &ord) != ZEBRA_OK)
continue;
bases_ok++;
wrbuf_putc(term_dict, ')');
if (!numeric_relation(zh, zapt, &termp, term_dict,
- attributeSet, grep_info, &max_pos, reg_type,
+ attributeSet, grep_info, &max_pos, index_type,
term_dst, &relation_error))
{
if (relation_error)
const char *termz,
const Odr_oid *attributeSet,
NMEM stream,
- int reg_type, int complete_flag,
+ const char *index_type,
+ int complete_flag,
const char *rank_type,
const char *xpath_use,
int num_bases, char **basenames,
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) == 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,
- reg_type, complete_flag, num_bases, basenames,
+ index_type, complete_flag, num_bases, basenames,
term_dst, xpath_use, &ol);
wrbuf_destroy(term_dict);
if (res == ZEBRA_FAIL || termp == 0)
strlen(term_dst), rank_type,
0 /* preserve position */,
zapt->term->which, rset_nmem,
- kc, kc->scope, ol, reg_type,
+ kc, kc->scope, ol, index_type,
hits_limit_value,
term_ref_id_str);
if (!result_sets[num_result_sets])
static RSET xpath_trunc(ZebraHandle zh, NMEM stream,
- int reg_type, const char *term,
+ const char *index_type, const char *term,
const char *xpath_use,
NMEM rset_nmem,
struct rset_key_control *kc)
struct grep_info grep_info;
int ord = zebraExplain_lookup_attr_str(zh->reg->zei,
zinfo_index_category_index,
- reg_type, xpath_use);
+ index_type, xpath_use);
if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0') == ZEBRA_FAIL)
return rset_create_null(rset_nmem, kc, 0);
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, 0, reg_type, 0 /* hits_limit */,
+ kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */);
grep_info_delete(&grep_info);
wrbuf_destroy(term_dict);
}
}
rset_attr = xpath_trunc(
- zh, stream, '0', wrbuf_cstr(wbuf), ZEBRA_XPATH_ATTR_NAME,
+ zh, stream, "0", wrbuf_cstr(wbuf),
+ ZEBRA_XPATH_ATTR_NAME,
rset_nmem, kc);
wrbuf_destroy(wbuf);
}
wrbuf_cstr(xpath_rev));
if (wrbuf_len(xpath_rev))
{
- rset_start_tag = xpath_trunc(zh, stream, '0',
+ rset_start_tag = xpath_trunc(zh, stream, "0",
wrbuf_cstr(xpath_rev),
ZEBRA_XPATH_ELM_BEGIN,
rset_nmem, kc);
rset = rset_start_tag;
else
{
- rset_end_tag = xpath_trunc(zh, stream, '0',
+ rset_end_tag = xpath_trunc(zh, stream, "0",
wrbuf_cstr(xpath_rev),
ZEBRA_XPATH_ELM_END,
rset_nmem, kc);
#define MAX_XPATH_STEPS 10
+static ZEBRA_RES rpn_search_database(ZebraHandle zh,
+ 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);
+
static ZEBRA_RES rpn_search_APT(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
const Odr_oid *attributeSet, NMEM stream,
Z_SortKeySpecList *sort_sequence,
RSET *rset,
struct rset_key_control *kc)
{
+ RSET *rsets = nmem_malloc(stream, num_bases * sizeof(*rsets));
+ ZEBRA_RES res = ZEBRA_OK;
+ int i;
+ for (i = 0; i < num_bases; i++)
+ {
+
+ if (zebraExplain_curDatabase(zh->reg->zei, basenames[i]))
+ {
+ zebra_setError(zh, YAZ_BIB1_DATABASE_UNAVAILABLE,
+ basenames[i]);
+ res = ZEBRA_FAIL;
+ break;
+ }
+ res = rpn_search_database(zh, zapt, attributeSet, stream,
+ sort_sequence, 1, basenames+i,
+ 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]);
+ *rset = 0;
+ }
+ else
+ {
+ if (num_bases == 1)
+ *rset = rsets[0];
+ 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);
+ }
+ return res;
+}
+
+static ZEBRA_RES rpn_search_database(ZebraHandle zh,
+ 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)
+{
ZEBRA_RES res = ZEBRA_OK;
- unsigned reg_id;
+ const char *index_type;
char *search_type = NULL;
char rank_type[128];
int complete_flag;
log_level_rpn = yaz_log_module_level("rpn");
log_level_set = 1;
}
- zebra_maps_attr(zh->reg->zebra_maps, zapt, ®_id, &search_type,
+ zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type,
rank_type, &complete_flag, &sort_flag);
- yaz_log(YLOG_DEBUG, "reg_id=%c", reg_id);
+ yaz_log(YLOG_DEBUG, "index_type=%s", index_type);
yaz_log(YLOG_DEBUG, "complete_flag=%d", complete_flag);
yaz_log(YLOG_DEBUG, "search_type=%s", search_type);
yaz_log(YLOG_DEBUG, "rank_type=%s", rank_type);
if (!strcmp(search_type, "phrase"))
{
res = rpn_search_APT_phrase(zh, zapt, termz, attributeSet, stream,
- reg_id, complete_flag, rank_type,
+ index_type, complete_flag, rank_type,
xpath_use,
num_bases, basenames, rset_nmem,
rset, kc);
else if (!strcmp(search_type, "and-list"))
{
res = rpn_search_APT_and_list(zh, zapt, termz, attributeSet, stream,
- reg_id, complete_flag, rank_type,
+ index_type, complete_flag, rank_type,
xpath_use,
num_bases, basenames, rset_nmem,
rset, kc);
else if (!strcmp(search_type, "or-list"))
{
res = rpn_search_APT_or_list(zh, zapt, termz, attributeSet, stream,
- reg_id, complete_flag, rank_type,
+ index_type, complete_flag, rank_type,
xpath_use,
num_bases, basenames, rset_nmem,
rset, kc);
else if (!strcmp(search_type, "numeric"))
{
res = rpn_search_APT_numeric(zh, zapt, termz, attributeSet, stream,
- reg_id, complete_flag, rank_type,
+ index_type, complete_flag, rank_type,
xpath_use,
num_bases, basenames, rset_nmem,
rset, kc);
projects / idzebra-moved-to-github.git / blobdiff