X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=c7c04432838b0b9897d87b3fd302e23613030cdc;hb=7e46fe0e2db894bc60bff710725c6854a261adc4;hp=492cb8879c2a692cfc8c010e8f9c08d3145af83d;hpb=3a3a0d3c1c05d30b8520b86fa8fdcbe0123fbb1c;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 492cb88..c7c0443 100644
--- a/src/client.c
+++ b/src/client.c
@@ -391,6 +391,33 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type,
     }
 }
 
+/**
+ * TODO Consider thread safety!!!
+ *
+ */
+int client_report_facets(struct client *cl, ZOOM_resultset rs) {
+    int facet_idx;
+    ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
+    int facet_num;
+    struct session *se = client_get_session(cl);
+    facet_num = ZOOM_resultset_facets_size(rs);
+    yaz_log(YLOG_DEBUG, "client_report_facets: %d", facet_num);
+
+    for (facet_idx = 0; facet_idx < facet_num; facet_idx++) {
+        const char *name = ZOOM_facet_field_name(facets[facet_idx]);
+        size_t term_idx;
+        size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
+        for (term_idx = 0; term_idx < term_num; term_idx++ ) {
+            int freq;
+            const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
+            if (term)
+                add_facet(se, name, term, freq);
+        }
+    }
+
+    return 0;
+}
+
 static void ingest_raw_record(struct client *cl, ZOOM_record rec)
 {
     const char *buf;
@@ -416,6 +443,7 @@ void client_search_response(struct client *cl)
     struct session *se = cl->session;
     ZOOM_connection link = connection_get_link(co);
     ZOOM_resultset resultset = cl->resultset;
+
     const char *error, *addinfo = 0;
     
     if (ZOOM_connection_error(link, &error, &addinfo))
@@ -427,6 +455,7 @@ void client_search_response(struct client *cl)
     }
     else
     {
+        client_report_facets(cl, resultset);
         cl->record_offset = cl->startrecs;
         cl->hits = ZOOM_resultset_size(resultset);
         if (se)
@@ -531,6 +560,7 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
     struct session *session = client_get_session(cl);
     struct conf_service *service = session->service;
     int num = service->num_metadata;
+    yaz_log(YLOG_DEBUG, "Facet settings, sort: %s count: %s", opt_facet_term_sort, opt_facet_term_count);
     WRBUF wrbuf = wrbuf_alloc();
     int first = 1;
     for (index = 0; index < num; index++) {
@@ -543,10 +573,10 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
             wrbuf_printf(wrbuf, "@attr 1=%s ", conf_meta->name);
 
             if (opt_facet_term_sort && opt_facet_term_sort[0] != '\0') {
-                wrbuf_printf(wrbuf, " 2=%s ", opt_facet_term_sort);
+                wrbuf_printf(wrbuf, " @attr 2=%s ", opt_facet_term_sort);
             }
             if (opt_facet_term_count && opt_facet_term_count[0] != '\0') {
-                wrbuf_printf(wrbuf, " 3=%s ", opt_facet_term_count);
+                wrbuf_printf(wrbuf, " @attr 3=%s ", opt_facet_term_count);
             }
         }
     }
@@ -560,39 +590,20 @@ static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
 
 int client_has_facet(struct client *cl, const char *name) {
     ZOOM_facet_field facet_field;
-    if (!cl || !cl->resultset || !name)
+    if (!cl || !cl->resultset || !name) {
+        yaz_log(YLOG_DEBUG, "client has facet: Missing %p %p %s", cl, (cl ? cl->resultset: 0), name);
         return 0;
+    }
     facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name);
-    if (facet_field)
+    if (facet_field) {
+        yaz_log(YLOG_DEBUG, "client: has facets for %s", name);
         return 1;
-    return 0;
-}
-
-/**
- * TODO Consider thread safety!!!
- *
- */
-int client_report_facets(struct client *cl, ZOOM_resultset rs) {
-    int facet_idx;
-    ZOOM_facet_field *facets = ZOOM_resultset_facets(rs);
-    struct session *se = client_get_session(cl);
-
-    int facet_num = ZOOM_resultset_facets_size(rs);
-    for (facet_idx = 0; facet_idx < facet_num; facet_idx++) {
-        const char *name = ZOOM_facet_field_name(facets[facet_idx]);
-        size_t term_idx;
-        size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
-        for (term_idx = 0; term_idx < term_num; term_idx++ ) {
-            int freq;
-            const char *term = ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
-            if (term)
-                add_facet(se, name, term, freq);
-        }
     }
-
+    yaz_log(YLOG_DEBUG, "client: No facets for %s", name);
     return 0;
 }
 
+
 void client_start_search(struct client *cl)
 {
     struct session_database *sdb = client_get_database(cl);
@@ -660,11 +671,9 @@ void client_start_search(struct client *cl)
     }
     else
     {
-        int has_facets = client_set_facets_request(cl, link);
+        client_set_facets_request(cl, link);
         yaz_log(YLOG_LOG, "Search %s PQF: %s", sdb->database->url, cl->pquery);
         rs = ZOOM_connection_search_pqf(link, cl->pquery);
-        if (has_facets)
-            client_report_facets(cl, rs);
     }
     ZOOM_resultset_destroy(cl->resultset);
     cl->resultset = rs;