-/* $Id: zrpn.c,v 1.214 2006-05-19 13:49:34 adam Exp $
+/* $Id: zrpn.c,v 1.217 2006-06-07 10:50:08 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
if (p->termset)
{
const char *db;
- int set, use;
char term_tmp[IT_MAX_WORD];
int ord = 0;
+ 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+1);
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, &set, &use, 0);
- yaz_log(log_level_rpn, "grep: set=%d use=%d db=%s", set, use, db);
+ 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)++;
}
-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;
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *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;
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *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, 0 /* termid */,
- 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;
if (res != ZEBRA_OK)
return res;
if (num_result_sets == 0)
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *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;
return ZEBRA_FAIL;
}
if (num_result_sets == 0)
- *rset = rsnull_create(rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
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;
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);
sks->which = Z_SortKeySpec_null;
sks->u.null = odr_nullval ();
sort_sequence->specs[i] = sks;
- *rset = rsnull_create (rset_nmem, kc, 0);
+ *rset = rset_create_null(rset_nmem, kc, 0);
return ZEBRA_OK;
}
const char *flags = "void";
if (grep_info_prepare(zh, 0 /* zapt */, &grep_info, '0') == ZEBRA_FAIL)
- return rsnull_create(rset_nmem, kc, 0);
+ return rset_create_null(rset_nmem, kc, 0);
if (ord < 0)
- return rsnull_create(rset_nmem, kc, 0);
+ return rset_create_null(rset_nmem, kc, 0);
if (prefix_len)
term_dict[prefix_len++] = '|';
else
curAttributeSet,
rset_nmem, kc);
- rset = rsbetween_create(rset_nmem, kc, kc->scope,
- rset_start_tag, rset,
- rset_end_tag, rset_attr);
+ rset = rset_create_between(rset_nmem, kc, kc->scope,
+ rset_start_tag, rset,
+ rset_end_tag, rset_attr);
}
first_path = 0;
}
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, 0, /* termid */
- *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)
}
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:
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;
yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d",
pos, num, attributeset);
- attr_init_APT(&use, zapt, 1);
- use_value = attr_find_ex(&use, &attributeset, &use_string);
-
if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type,
rank_type, &complete_flag, &sort_flag))
{
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++)
{
int ord;
zapt->term->which,rset_nmem,
kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */ );
- rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope, 0 /* termid */,
- 2, rsets);
+ rset = rset_create_or(rset_nmem, kc,
+ kc->scope, 0 /* termid */,
+ 2, rsets);
}
ptr[j]++;
}
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(zh, rset, &count);
zapt->term->which, rset_nmem,
kc, kc->scope, 0, index_type, 0 /* hits_limit */,
0 /* term_ref_id_str */);
- rset = rsmulti_or_create(rset_nmem, kc,
- kc->scope, 0 /* termid */, 2, rsets);
+ rset = rset_create_or(rset_nmem, kc,
+ kc->scope, 0 /* termid */, 2, rsets);
ptr[j]++;
}
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(zh, rset, &count);
glist[lo].occurrences = count;