From 78dea15933d8f4d2802fc0e4d0b9bf27d9a0f61c Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 1 Sep 2014 14:34:59 +0200
Subject: [PATCH] Report number of filtered records in bytarget PAZ-954

---
 src/http_command.c              |    2 +-
 src/session.c                   |    2 --
 test/test_facets_10.res         |    1 +
 test/test_facets_19.res         |    1 +
 test/test_facets_5.res          |    1 +
 test/test_http_21.res           |    1 +
 test/test_http_65.res           |    1 +
 test/test_http_71.res           |    1 +
 test/test_limit_limitmap_10.res |    2 ++
 test/test_limit_limitmap_13.res |    2 ++
 test/test_limit_limitmap_20.res |    1 +
 test/test_limit_limitmap_5.res  |    1 +
 test/test_post_11.res           |    1 +
 test/test_settings_7.res        |    1 +
 test/test_settings_8.res        |    1 +
 test/test_solr_14.res           |    1 +
 test/test_solr_19.res           |    1 +
 test/test_solr_26.res           |    1 +
 test/test_solr_5.res            |    1 +
 test/test_sort_5.res            |    1 +
 test/test_termlist_block_10.res |    2 ++
 test/test_termlist_block_13.res |    2 ++
 test/test_termlist_block_5.res  |    1 +
 test/test_turbomarcxml_8.res    |    1 +
 24 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/http_command.c b/src/http_command.c
index 64331a4..f4cc792 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -788,9 +788,9 @@ static void bytarget_response(struct http_channel *c, struct http_session *s,
 
         wrbuf_printf(c->wrbuf, "<records>%d</records>\n",
                      ht[i].records - ht[i].filtered);
+        wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
         if (version >= 2)
         {
-            wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
             wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
                          "</approximation>\n", ht[i].approximation);
         }
diff --git a/src/session.c b/src/session.c
index b132824..5f8cb7d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -2077,8 +2077,6 @@ static int ingest_to_cluster(struct client *cl,
 
     if (check_limit_local(cl, record, record_no))
     {
-        session_log(se, YLOG_LOG, "Facet filtered out record no %d from %s",
-                    record_no, sdb->database->id);
         if (type)
             xmlFree(type);
         if (value)
diff --git a/test/test_facets_10.res b/test/test_facets_10.res
index 44f1bb9..7bac2b5 100644
--- a/test/test_facets_10.res
+++ b/test/test_facets_10.res
@@ -5,5 +5,6 @@
 <hits>4</hits>
 <diagnostic>0</diagnostic>
 <records>2</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_facets_19.res b/test/test_facets_19.res
index b91448e..1910a36 100644
--- a/test/test_facets_19.res
+++ b/test/test_facets_19.res
@@ -5,5 +5,6 @@
 <hits>6</hits>
 <diagnostic>0</diagnostic>
 <records>2</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_facets_5.res b/test/test_facets_5.res
index 8b8a807..ffc2e84 100644
--- a/test/test_facets_5.res
+++ b/test/test_facets_5.res
@@ -5,5 +5,6 @@
 <hits>7</hits>
 <diagnostic>0</diagnostic>
 <records>7</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_http_21.res b/test/test_http_21.res
index a156563..48290d2 100644
--- a/test/test_http_21.res
+++ b/test/test_http_21.res
@@ -5,5 +5,6 @@
 <hits>0</hits>
 <diagnostic>0</diagnostic>
 <records>0</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_http_65.res b/test/test_http_65.res
index efe653d..bd79080 100644
--- a/test/test_http_65.res
+++ b/test/test_http_65.res
@@ -5,5 +5,6 @@
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_http_71.res b/test/test_http_71.res
index efe653d..bd79080 100644
--- a/test/test_http_71.res
+++ b/test/test_http_71.res
@@ -5,5 +5,6 @@
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_10.res b/test/test_limit_limitmap_10.res
index 44ad1fb..7aa85fa 100644
--- a/test/test_limit_limitmap_10.res
+++ b/test/test_limit_limitmap_10.res
@@ -5,6 +5,7 @@
 <hits>10</hits>
 <diagnostic>0</diagnostic>
 <records>10</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target>
 <target><id>Target-2</id>
@@ -12,5 +13,6 @@
 <hits>2015</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_13.res b/test/test_limit_limitmap_13.res
index 44ad1fb..7aa85fa 100644
--- a/test/test_limit_limitmap_13.res
+++ b/test/test_limit_limitmap_13.res
@@ -5,6 +5,7 @@
 <hits>10</hits>
 <diagnostic>0</diagnostic>
 <records>10</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target>
 <target><id>Target-2</id>
@@ -12,5 +13,6 @@
 <hits>2015</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_20.res b/test/test_limit_limitmap_20.res
index 2fd0767..3802c69 100644
--- a/test/test_limit_limitmap_20.res
+++ b/test/test_limit_limitmap_20.res
@@ -5,5 +5,6 @@
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_limit_limitmap_5.res b/test/test_limit_limitmap_5.res
index 7735835..d23fbc8 100644
--- a/test/test_limit_limitmap_5.res
+++ b/test/test_limit_limitmap_5.res
@@ -5,5 +5,6 @@
 <hits>10</hits>
 <diagnostic>0</diagnostic>
 <records>10</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_post_11.res b/test/test_post_11.res
index 944b7ac..f5a8e90 100644
--- a/test/test_post_11.res
+++ b/test/test_post_11.res
@@ -5,5 +5,6 @@
 <hits>10</hits>
 <diagnostic>0</diagnostic>
 <records>10</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_settings_7.res b/test/test_settings_7.res
index 6ef303f..cf7fcd5 100644
--- a/test/test_settings_7.res
+++ b/test/test_settings_7.res
@@ -7,6 +7,7 @@
 <message>Unsupported Use attribute</message>
 <addinfo>host_wildcard</addinfo>
 <records>0</records>
+<filtered>0</filtered>
 <state>Client_Error</state>
 <settings>
 <set name="pz:elements" value="F"/>
diff --git a/test/test_settings_8.res b/test/test_settings_8.res
index 066eca1..63a213d 100644
--- a/test/test_settings_8.res
+++ b/test/test_settings_8.res
@@ -5,6 +5,7 @@
 <hits>0</hits>
 <diagnostic>0</diagnostic>
 <records>0</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 <settings>
 <set name="pz:elements" value="F"/>
diff --git a/test/test_solr_14.res b/test/test_solr_14.res
index b709f6e..313fc4a 100644
--- a/test/test_solr_14.res
+++ b/test/test_solr_14.res
@@ -5,5 +5,6 @@
 <hits>1995</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_solr_19.res b/test/test_solr_19.res
index 67dffe0..a47a5d4 100644
--- a/test/test_solr_19.res
+++ b/test/test_solr_19.res
@@ -5,5 +5,6 @@
 <hits>1995</hits>
 <diagnostic>0</diagnostic>
 <records>200</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_solr_26.res b/test/test_solr_26.res
index b709f6e..313fc4a 100644
--- a/test/test_solr_26.res
+++ b/test/test_solr_26.res
@@ -5,5 +5,6 @@
 <hits>1995</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_solr_5.res b/test/test_solr_5.res
index b709f6e..313fc4a 100644
--- a/test/test_solr_5.res
+++ b/test/test_solr_5.res
@@ -5,5 +5,6 @@
 <hits>1995</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_sort_5.res b/test/test_sort_5.res
index 67dffe0..a47a5d4 100644
--- a/test/test_sort_5.res
+++ b/test/test_sort_5.res
@@ -5,5 +5,6 @@
 <hits>1995</hits>
 <diagnostic>0</diagnostic>
 <records>200</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_termlist_block_10.res b/test/test_termlist_block_10.res
index fe72f49..3d39b01 100644
--- a/test/test_termlist_block_10.res
+++ b/test/test_termlist_block_10.res
@@ -5,6 +5,7 @@
 <hits>23</hits>
 <diagnostic>0</diagnostic>
 <records>23</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target>
 <target><id>id_solr</id>
@@ -12,5 +13,6 @@
 <hits>2015</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_termlist_block_13.res b/test/test_termlist_block_13.res
index fe72f49..3d39b01 100644
--- a/test/test_termlist_block_13.res
+++ b/test/test_termlist_block_13.res
@@ -5,6 +5,7 @@
 <hits>23</hits>
 <diagnostic>0</diagnostic>
 <records>23</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target>
 <target><id>id_solr</id>
@@ -12,5 +13,6 @@
 <hits>2015</hits>
 <diagnostic>0</diagnostic>
 <records>100</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_termlist_block_5.res b/test/test_termlist_block_5.res
index 129dfa4..9643e8a 100644
--- a/test/test_termlist_block_5.res
+++ b/test/test_termlist_block_5.res
@@ -5,5 +5,6 @@
 <hits>23</hits>
 <diagnostic>0</diagnostic>
 <records>23</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
diff --git a/test/test_turbomarcxml_8.res b/test/test_turbomarcxml_8.res
index 76e330a..2df4e9a 100644
--- a/test/test_turbomarcxml_8.res
+++ b/test/test_turbomarcxml_8.res
@@ -5,5 +5,6 @@
 <hits>3</hits>
 <diagnostic>0</diagnostic>
 <records>3</records>
+<filtered>0</filtered>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file
-- 
1.7.10.4