From: Dennis Schafroth Date: Thu, 12 Apr 2012 13:04:33 +0000 (+0200) Subject: Add version to termlist response method. Print records and filtered in target respons... X-Git-Tag: v1.6.13~58^2~2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=1f6dfd5e7730b749418257cee09fc8bb864e67e9;p=pazpar2-moved-to-github.git Add version to termlist response method. Print records and filtered in target response if version is 2 and above --- diff --git a/src/session.c b/src/session.c index 1f55a87..fde1e78 100644 --- 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, - NMEM nmem) + NMEM nmem, int version) { 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, "" ODR_INT_PRINTF "\n", ht[i].hits); - + + if (version >= 2) { + wrbuf_printf(wrbuf, "%d\n", ht[i].records); + wrbuf_printf(wrbuf, "%d\n", ht[i].filtered); + } + wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].state); wrbuf_puts(wrbuf, "\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, - const char *name, int num) + const char *name, int num, int version) { 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"); - targets_termlist_nb(c->wrbuf, se, num, c->nmem); + targets_termlist_nb(c->wrbuf, se, num, c->nmem, version); wrbuf_puts(c->wrbuf, "\n"); must_generate_empty = 0; }