-/* $Id: rpnsearch.c,v 1.18 2007-10-30 19:17:15 adam Exp $
+/* $Id: rpnsearch.c,v 1.20 2007-11-01 14:10:03 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
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);
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)
+ZEBRA_RES zebra_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;
WRBUF term_dict = wrbuf_alloc();
*rset = 0;
- term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream);
+ zebra_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, term_dict,
attributeSet, stream, grep_info,
int relation_error;
char ord_buf[32];
int ord_len, i;
- zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, *index_type);
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
*ol = ord_list_create(stream);
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)
{
*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)
{
int ord_len;
char *val;
ISAM_P isam_p;
- zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, *index_type);
+ 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);
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);
+ zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
*ol = ord_list_create(stream);
zint hits_limit_value;
const char *term_ref_id_str = 0;
- term_limits_APT(zh, zapt, &hits_limit_value, &term_ref_id_str, stream);
+ zebra_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)
{
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)