Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

[pazpar2-moved-to-github.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index 9e52b0a..2b270ae 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -412,16 +412,12 @@ static int nativesyntax_to_type(const char *s, char *type,
             const char *cp = strchr(s, ';');
             yaz_snprintf(type, 80, "xml; charset=%s", cp ? cp+1 : "marc-8s");
         }
-        else if (!strncmp(s, "xml", 3))
-        {
-            strcpy(type, "xml");
-        }
         else if (!strncmp(s, "txml", 4))
         {
             const char *cp = strchr(s, ';');
             yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s");
         }
-        else
+        else /* pass verbatim to ZOOM - including "xml" */
             strcpy(type, s);
         return 0;
     }
@@ -695,7 +691,7 @@ static void client_set_facets_request(struct client *cl, ZOOM_connection link)
                 wrbuf_puts(w, ",");
         }
     }
-    yaz_log(YLOG_LOG, "using facets str: %s", wrbuf_cstr(w));
+    yaz_log(YLOG_DEBUG, "using facets str: %s", wrbuf_cstr(w));
     ZOOM_connection_option_set(link, "facets",
                                wrbuf_len(w) ? wrbuf_cstr(w) : 0);
     wrbuf_destroy(w);
@@ -764,10 +760,10 @@ void client_start_search(struct client *cl)
         present_chunk = atoi(opt_present_chunk);
         yaz_log(YLOG_DEBUG, "Present chunk set to %d", present_chunk);
     }
-
     assert(link);
 
     cl->diagnostic = 0;
+    cl->filtered = 0;
 
     if (extra_args && *extra_args)
         ZOOM_connection_option_set(link, "extraArgs", extra_args);
@@ -1092,7 +1088,7 @@ static int apply_limit(struct session_database *sdb,
     for (i = 0; (name = facet_limits_get(facet_limits, i, &value)); i++)
     {
         struct setting *s = 0;
-        
+        nmem_reset(nmem_tmp);
         for (s = sdb->settings[PZ_LIMITMAP]; s; s = s->next)
         {
             const char *p = strchr(s->name + 3, ':');
@@ -1148,7 +1144,6 @@ static int apply_limit(struct session_database *sdb,
                 break;
             }
         }
-        nmem_reset(nmem_tmp);
         if (!s)
         {
             yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined",
@@ -1291,8 +1286,7 @@ int client_parse_query(struct client *cl, const char *query,
     if (!se->relevance)
     {
         // Initialize relevance structure with query terms
-        se->relevance = relevance_create_ccl(
-            se->service->charsets, se->nmem, cn);
+        se->relevance = relevance_create_ccl(se->service->charsets, cn);
     }
     ccl_rpn_delete(cn);
     return ret_value;
@@ -1332,7 +1326,7 @@ Odr_int client_get_approximation(struct client *cl)
 {
     if (cl->record_offset > 0) {
         Odr_int approx = ((10 * cl->hits * (cl->record_offset - cl->filtered)) / cl->record_offset + 5) /10;
-        yaz_log(YLOG_LOG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx);
+        yaz_log(YLOG_DEBUG, "%s: Approx: %lld * %d / %d = %lld ", client_get_id(cl), cl->hits, cl->record_offset - cl->filtered, cl->record_offset, approx);
         return approx;
     }
     return cl->hits;