*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#ifdef WIN32
len_prefix = strlen(scan_info->prefix);
if (memcmp(name, scan_info->prefix, len_prefix))
return 1;
-
- /* skip special terms such as first-in-field specials */
- if (name[len_prefix] < CHR_BASE_CHAR)
- return 1;
-
wrbuf_rewind(scan_info->term);
wrbuf_puts(scan_info->term, name+len_prefix);
{
if (ar[i].isam_p && strcmp(wrbuf_cstr(ar[i].term), term) == 0)
{
- struct ord_list *ol = ord_list_create(nmem);
- RSET rset_t;
-
- ol = ord_list_append(nmem, ol, ar[i].ord);
-
- assert(ol);
- rset_t = rset_trunc(
+ if (strcmp(term, FIRST_IN_FIELD_STR))
+ {
+ struct ord_list *ol = ord_list_create(nmem);
+ RSET rset_t;
+
+ ol = ord_list_append(nmem, ol, ar[i].ord);
+
+ assert(ol);
+ rset_t = rset_trunc(
zh, &ar[i].isam_p, 1,
wrbuf_buf(ar[i].term), wrbuf_len(ar[i].term),
NULL, 1, zapt->term->which, nmem,
kc, kc->scope, ol, index_type,
0 /* hits_limit_value */,
0 /* term_ref_id_str */);
- if (!rset)
- rset = rset_t;
- else
- {
- RSET rsets[2];
-
- rsets[0] = rset;
- rsets[1] = rset_t;
- rset = rset_create_or(nmem, kc, kc->scope, 0 /* termid */,
- 2, rsets);
+ if (!rset)
+ rset = rset_t;
+ else
+ {
+ RSET rsets[2];
+
+ rsets[0] = rset;
+ rsets[1] = rset_t;
+ rset = rset_create_or(nmem, kc, kc->scope, 0 /* termid */,
+ 2, rsets);
+ }
}
ar[i].isam_p = 0;
}
odr_malloc(stream, *num_entries * sizeof(*glist));
*is_partial = 0;
- if (*position > *num_entries+1)
- {
- *is_partial = 1;
- *position = 1;
- *num_entries = 0;
- return ZEBRA_OK;
- }
rpn_char_map_prepare(zh->reg, zm, &rcmi);
for (i = 0; i < ord_no; i++)
{
/* did not get all terms; adjust the real position and reduce
number of entries */
- yaz_log(YLOG_LOG, "before terms dif=%d", dif);
- glist = glist + dif;
- *num_entries -= dif;
+ if (dif < *num_entries)
+ {
+ glist = glist + dif;
+ *num_entries -= dif;
+ }
+ else
+ *num_entries = 0;
*position -= dif;
*is_partial = 1;
}
pos++;
}
- if (pos != *num_entries)
+ if (pos < *num_entries)
{
if (pos >= 0)
*num_entries = pos;