-/* $Id: rpnscan.c,v 1.7 2007-04-16 08:44:32 adam Exp $
+/* $Id: rpnscan.c,v 1.11 2007-05-09 07:07:18 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
struct scan2_info_entry *ar = nmem_malloc(nmem, sizeof(*ar) * ord_no);
struct rpn_char_map_info rcmi;
int i, dif;
+ int after_pos;
int pos = 0;
ZebraScanEntry *glist = (ZebraScanEntry *)
if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) ==
ZEBRA_FAIL)
+ {
+ for (i = 0; i < ord_no; i++)
+ wrbuf_destroy(ar[i].term);
return ZEBRA_FAIL;
+ }
wrbuf_rewind(ar[i].term);
wrbuf_puts(ar[i].term, termz + prefix_len);
ar[i].isam_p = 0;
ar[i].isam_p = 0;
}
+ after_pos = 1; /* immediate term first.. */
for (pos = *position-1; pos < *num_entries; )
{
const char *lo = 0;
{
char termz[IT_MAX_WORD+20];
int before = 0;
- int after = (pos == *position-1) ? 1 : 2;
+ int after = after_pos;
ar[i].pos_to_save = 1;
ar+i, scan_handle2);
}
}
+ after_pos = 2; /* next round we grab following term */
+
/* get minimum after scan */
for (i = 0; i < ord_no; i++)
{
*list = glist;
+ for (i = 0; i < ord_no; i++)
+ wrbuf_destroy(ar[i].term);
+
return ZEBRA_OK;
}
};
ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
- const int *attributeset,
+ const Odr_oid *attributeset,
int num_bases, char **basenames,
int *position, int *num_entries, ZebraScanEntry **list,
int *is_partial, RSET limit_set)
*is_partial = 0;
if (!attributeset)
- attributeset = yaz_oid_attset_bib1();
+ attributeset = yaz_oid_attset_bib_1;
if (!limit_set) /* no limit set given already */
{
if (termset_value_numeric != -2)
{
-
sprintf(resname, "%d", termset_value_numeric);
termset_name = resname;
}
termset_name = termset_value_string;
limit_set = resultSetRef (zh, termset_name);
+
+ if (!limit_set)
+ {
+ zebra_setError(zh,
+ YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+ termset_name);
+ return ZEBRA_FAIL;
+ }
}
}