log msg cleanup PAZ-1037

diff --git a/src/client.c b/src/client.c
index fe5bef3..31c1745 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -833,18 +833,18 @@ int client_fetch_more(struct client *cl)
 
     extend_recs = atoi(str);
 
-    yaz_log(YLOG_LOG, "cl=%s show_stat_no=%d got=%d",
+    yaz_log(YLOG_DEBUG, "cl=%s show_stat_no=%d got=%d",
             client_get_id(cl), cl->show_stat_no, cl->record_offset);
     if (cl->show_stat_no < cl->record_offset)
         return 0;
-    yaz_log(YLOG_LOG, "cl=%s Trying to fetch more", client_get_id(cl));
+    yaz_log(YLOG_DEBUG, "cl=%s Trying to fetch more", client_get_id(cl));
 
     if (number > extend_recs)
         number = extend_recs;
     if (number <= 0)
-        yaz_log(YLOG_LOG, "cl=%s. OK no more in total set", client_get_id(cl));
+        yaz_log(YLOG_DEBUG, "cl=%s. OK no more in total set", client_get_id(cl));
     else if (!co)
-        yaz_log(YLOG_LOG, "cl=%s. No connection", client_get_id(cl));
+        yaz_log(YLOG_DEBUG, "cl=%s. No connection", client_get_id(cl));
     else
     {
         ZOOM_resultset set = cl->resultset;
@@ -969,8 +969,6 @@ int client_start_search(struct client *cl)
     link = connection_get_link(co);
     assert(link);
 
-    session_log(se, YLOG_LOG, "%s: new search", client_get_id(cl));
-
     client_destroy_xdoc(cl);
     client_init_xdoc(cl);
 
@@ -1555,8 +1553,6 @@ int client_parse_query(struct client *cl, const char *query,
     facet_limits_destroy(cl->facet_limits);
     cl->facet_limits = facet_limits_dup(facet_limits);
 
-    yaz_log(YLOG_LOG, "Client %s: CCL query: %s limit: %s",
-            client_get_id(cl), wrbuf_cstr(w_ccl), wrbuf_cstr(w_pqf));
     cn = ccl_find_str(ccl_map, wrbuf_cstr(w_ccl), &cerror, &cpos);
     ccl_qual_rm(&ccl_map);
     if (!cn)
@@ -1625,9 +1621,6 @@ int client_parse_query(struct client *cl, const char *query,
     }
     else
     {
-        session_log(se, YLOG_LOG, "PQF for Client %s: %s",
-                    client_get_id(cl), cl->pquery);
-
         /* Support for PQF on SRU targets. */
         if (strcmp(query_syntax, "pqf") != 0 && *sru)
         {

diff --git a/src/session.c b/src/session.c
index 33cfc39..f597d7c 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -834,7 +834,11 @@ enum pazpar2_error_code session_search(struct session *se,
     int no_sortmap = 0;
     struct client_list *l;
 
-    session_log(se, YLOG_DEBUG, "Search");
+    session_log(se, YLOG_LOG, "search query %s", query);
+    if (filter)
+        session_log(se, YLOG_LOG, "search filter %s", filter);
+    if (limit)
+        session_log(se, YLOG_LOG, "search limit %s", limit);
 
     *addinfo = 0;
 
@@ -920,8 +924,9 @@ enum pazpar2_error_code session_search(struct session *se,
             no_working++;
         }
     }
-    yaz_log(YLOG_LOG, "session_search: no_working=%d no_sortmap=%d",
-            no_working, no_sortmap);
+    session_log(se, YLOG_LOG, "search "
+                "working %d sortmap %d failed-query %d failed-limit %d",
+                no_working, no_sortmap, no_failed_query, no_failed_limit);
     session_enter(se, "session_search2");
     if (no_working == 1 && no_sortmap == 1)
     {