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
Merge branch 'protocol-version2' of ssh://git.indexdata.com/home/git/pub/pazpar2...
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
1f55a87
..
fde1e78
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-1015,7
+1015,7
@@
static int cmp_ht(const void *p1, const void *p2)
}
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
}
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
- NMEM nmem)
+ NMEM nmem, int version)
{
struct hitsbytarget *ht;
int count, i;
{
struct hitsbytarget *ht;
int count, i;
@@
-1042,7
+1042,12
@@
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
wrbuf_printf(wrbuf, "<frequency>" ODR_INT_PRINTF "</frequency>\n",
ht[i].hits);
wrbuf_printf(wrbuf, "<frequency>" ODR_INT_PRINTF "</frequency>\n",
ht[i].hits);
-
+
+ if (version >= 2) {
+ wrbuf_printf(wrbuf, "<records>%d</records>\n", ht[i].records);
+ wrbuf_printf(wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
+ }
+
wrbuf_puts(wrbuf, "<state>");
wrbuf_xmlputs(wrbuf, ht[i].state);
wrbuf_puts(wrbuf, "</state>\n");
wrbuf_puts(wrbuf, "<state>");
wrbuf_xmlputs(wrbuf, ht[i].state);
wrbuf_puts(wrbuf, "</state>\n");
@@
-1055,7
+1060,7
@@
static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
}
void perform_termlist(struct http_channel *c, struct session *se,
}
void perform_termlist(struct http_channel *c, struct session *se,
- const char *name, int num)
+ const char *name, int num, int version)
{
int i, j;
NMEM nmem_tmp = nmem_create();
{
int i, j;
NMEM nmem_tmp = nmem_create();
@@
-1118,7
+1123,7
@@
void perform_termlist(struct http_channel *c, struct session *se,
wrbuf_xmlputs(c->wrbuf, tname);
wrbuf_puts(c->wrbuf, "\">\n");
wrbuf_xmlputs(c->wrbuf, tname);
wrbuf_puts(c->wrbuf, "\">\n");
- targets_termlist_nb(c->wrbuf, se, num, c->nmem);
+ targets_termlist_nb(c->wrbuf, se, num, c->nmem, version);
wrbuf_puts(c->wrbuf, "</list>\n");
must_generate_empty = 0;
}
wrbuf_puts(c->wrbuf, "</list>\n");
must_generate_empty = 0;
}