projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New hard settings. Functions to handle settings value on services, not targets.
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
eb50ad1
..
207f47c
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-963,6
+963,7
@@
static struct hitsbytarget *hitsbytarget_nb(struct session *se,
res[*count].id = client_get_id(cl);
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
res[*count].id = client_get_id(cl);
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
+ res[*count].approximation = client_get_approximation(cl);
res[*count].records = client_get_num_records(cl);
res[*count].filtered = client_get_num_records_filtered(cl);
res[*count].diagnostic =
res[*count].records = client_get_num_records(cl);
res[*count].filtered = client_get_num_records_filtered(cl);
res[*count].diagnostic =
@@
-1014,6
+1015,14
@@
static int cmp_ht(const void *p1, const void *p2)
return h2->hits - h1->hits;
}
return h2->hits - h1->hits;
}
+// Compares two hitsbytarget nodes by hitcount
+static int cmp_ht_approx(const void *p1, const void *p2)
+{
+ const struct hitsbytarget *h1 = p1;
+ const struct hitsbytarget *h2 = p2;
+ return h2->approximation - h1->approximation;
+}
+
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
NMEM nmem, int version)
{
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
NMEM nmem, int version)
{
@@
-1021,7
+1030,10
@@
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
int count, i;
ht = hitsbytarget_nb(se, &count, nmem);
int count, i;
ht = hitsbytarget_nb(se, &count, nmem);
- qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
+ if (version >= 2)
+ qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht_approx);
+ else
+ qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
{
for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
{
@@
-1044,6
+1056,8
@@
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
ht[i].hits);
if (version >= 2) {
ht[i].hits);
if (version >= 2) {
+ // Should not print if we know it isn't a approximation.
+ wrbuf_printf(wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", ht[i].approximation);
wrbuf_printf(wrbuf, "<records>%d</records>\n", ht[i].records - ht[i].filtered);
wrbuf_printf(wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
}
wrbuf_printf(wrbuf, "<records>%d</records>\n", ht[i].records - ht[i].filtered);
wrbuf_printf(wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
}
@@
-1186,7
+1200,7
@@
void show_single_stop(struct session *se, struct record_cluster *rec)
struct record_cluster **show_range_start(struct session *se,
struct reclist_sortparms *sp,
struct record_cluster **show_range_start(struct session *se,
struct reclist_sortparms *sp,
- int start, int *num, int *total, Odr_int *sumhits)
+ int start, int *num, int *total, Odr_int *sumhits, Odr_int *approx_hits)
{
struct record_cluster **recs;
struct reclist_sortparms *spp;
{
struct record_cluster **recs;
struct reclist_sortparms *spp;
@@
-1200,7
+1214,8
@@
struct record_cluster **show_range_start(struct session *se,
{
*num = 0;
*total = 0;
{
*num = 0;
*total = 0;
- *sumhits = 0;
+ *sumhits = 0;
+ *approx_hits = 0;
recs = 0;
}
else
recs = 0;
}
else
@@
-1219,9
+1234,11
@@
struct record_cluster **show_range_start(struct session *se,
*total = reclist_get_num_records(se->reclist);
*sumhits = 0;
*total = reclist_get_num_records(se->reclist);
*sumhits = 0;
- for (l = se->clients_active; l; l = l->next)
+ *approx_hits = 0;
+ for (l = se->clients_active; l; l = l->next) {
*sumhits += client_get_hits(l->client);
*sumhits += client_get_hits(l->client);
-
+ *approx_hits += client_get_approximation(l->client);
+ }
for (i = 0; i < start; i++)
if (!reclist_read_record(se->reclist))
{
for (i = 0; i < start; i++)
if (!reclist_read_record(se->reclist))
{
@@
-1570,6
+1587,7
@@
int ingest_record(struct client *cl, const char *rec,
return ret;
}
return ret;
}
+// Skip record on non-zero
static int check_limit_local(struct client *cl,
struct record *record,
int record_no)
static int check_limit_local(struct client *cl,
struct record *record,
int record_no)
@@
-1588,9
+1606,7
@@
static int check_limit_local(struct client *cl,
char **values = 0;
int i, num_v = 0;
char **values = 0;
int i, num_v = 0;
- const char *name =
- client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v,
- &values);
+ const char *name = client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, &values);
if (!name)
break;
if (!name)
break;
@@
-1617,10
+1633,10
@@
static int check_limit_local(struct client *cl,
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "cmp: '%s' '%s'",
- rec_md->data.text.disp, values[i]);
+ yaz_log(YLOG_LOG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
if (!strcmp(rec_md->data.text.disp, values[i]))
{
if (!strcmp(rec_md->data.text.disp, values[i]))
{
+ // Value equals, should not be filtered.
break;
}
}
break;
}
}
@@
-1632,6
+1648,7
@@
static int check_limit_local(struct client *cl,
i++;
}
}
i++;
}
}
+ // At end , not match
if (i == num_v)
{
skip_record = 1;
if (i == num_v)
{
skip_record = 1;