projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WS changes for function calls.
[idzebra-moved-to-github.git]
/
index
/
rpnscan.c
diff --git
a/index/rpnscan.c
b/index/rpnscan.c
index
9349565
..
670a30d
100644
(file)
--- a/
index/rpnscan.c
+++ b/
index/rpnscan.c
@@
-1,4
+1,4
@@
-/* $Id: rpnscan.c,v 1.17 2007-10-31 16:56:14 adam Exp $
+/* $Id: rpnscan.c,v 1.19 2007-11-01 14:56:07 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-41,7
+41,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define RPN_MAX_ORDS 32
#define RPN_MAX_ORDS 32
-int log_scan = YLOG_LOG;
+static int log_scan = YLOG_LOG;
/* convert APT SCAN term to internal cmap */
static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
/* convert APT SCAN term to internal cmap */
static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
@@
-81,7
+81,7
@@
static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt,
return ZEBRA_OK;
}
return ZEBRA_OK;
}
-static void count_set(ZebraHandle zh, RSET rset, zint *count)
+static void count_set(ZebraHandle zh, RSET rset, zint *count, zint approx_limit)
{
zint psysno = 0;
struct it_key key;
{
zint psysno = 0;
struct it_key key;
@@
-89,7
+89,7
@@
static void count_set(ZebraHandle zh, RSET rset, zint *count)
yaz_log(YLOG_DEBUG, "count_set");
yaz_log(YLOG_DEBUG, "count_set");
- rset->hits_limit = zh->approx_limit;
+ rset->hits_limit = approx_limit;
*count = 0;
rfd = rset_open(rset, RSETF_READ);
*count = 0;
rfd = rset_open(rset, RSETF_READ);
@@
-187,6
+187,15
@@
static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
{
int i;
RSET rset = 0;
{
int i;
RSET rset = 0;
+ zint approx_limit = zh->approx_limit;
+ AttrType global_hits_limit_attr;
+ int l;
+ attr_init_APT(&global_hits_limit_attr, zapt, 12);
+
+ l = attr_find(&global_hits_limit_attr, NULL);
+ if (l != -1)
+ approx_limit = l;
+
for (i = 0; i < ord_no; i++)
{
if (ar[i].isam_p && strcmp(wrbuf_cstr(ar[i].term), term) == 0)
for (i = 0; i < ord_no; i++)
{
if (ar[i].isam_p && strcmp(wrbuf_cstr(ar[i].term), term) == 0)
@@
-202,7
+211,7
@@
static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
wrbuf_buf(ar[i].term), wrbuf_len(ar[i].term),
NULL, 1, zapt->term->which, nmem,
kc, kc->scope, ol, index_type,
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 */,
+ 0 /* hits_limit_value */,
0 /* term_ref_id_str */);
if (!rset)
rset = rset_t;
0 /* term_ref_id_str */);
if (!rset)
rset = rset_t;
@@
-231,7
+240,7
@@
static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
rset = rset_create_and(nmem, kc, kc->scope, 2, rsets);
}
/* count it */
rset = rset_create_and(nmem, kc, kc->scope, 2, rsets);
}
/* count it */
- count_set(zh, rset, &count);
+ count_set(zh, rset, &count, approx_limit);
if (pos != -1)
{
if (pos != -1)
{
@@
-271,8
+280,8
@@
static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem,
}
return 0;
}
}
return 0;
}
-
-static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem,
+
+static ZEBRA_RES rpn_scan_norm(ZebraHandle zh, ODR stream, NMEM nmem,
struct rset_key_control *kc,
Z_AttributesPlusTerm *zapt,
int *position, int *num_entries,
struct rset_key_control *kc,
Z_AttributesPlusTerm *zapt,
int *position, int *num_entries,
@@
-563,9
+572,14
@@
ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
nmem = nmem_create();
kc = zebra_key_control_create(zh);
nmem = nmem_create();
kc = zebra_key_control_create(zh);
- res = rpn_scan_ver2(zh, stream, nmem, kc, zapt, position, num_entries,
+ if (sort_flag)
+ res = rpn_facet(zh, stream, nmem, kc, zapt, position, num_entries,
list,
is_partial, limit_set, index_type, ord_no, ords);
list,
is_partial, limit_set, index_type, ord_no, ords);
+ else
+ res = rpn_scan_norm(zh, stream, nmem, kc, zapt, position, num_entries,
+ list,
+ is_partial, limit_set, index_type, ord_no, ords);
nmem_destroy(nmem);
(*kc->dec)(kc);
return res;
nmem_destroy(nmem);
(*kc->dec)(kc);
return res;