X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=b5df1c15ad74d6f75a0a3e389cba2cbc7d72a13f;hb=48e0165508cf435576b6b479ef504d9fba7da66a;hp=2113f9d1e93d8b60bf26805e6fa7bb548593d748;hpb=4a750da30cd12e7490a4162ade70a8b14145121d;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 2113f9d..b5df1c1 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);
+    yaz_log(YLOG_DEBUG, "client_report_facets %p %p", rs, cl->resultset);
+
+    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);
+        }
+    }
+
+    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)
@@ -523,6 +552,55 @@ void client_record_response(struct client *cl)
     }
 }
 
+static int client_set_facets_request(struct client *cl, ZOOM_connection link) {
+    int index = 0;
+    struct session_database *sdb = client_get_database(cl);
+    const char *opt_facet_term_sort  = session_setting_oneval(sdb, PZ_TERMLIST_TERM_SORT);
+    const char *opt_facet_term_count = session_setting_oneval(sdb, PZ_TERMLIST_TERM_COUNT);
+    struct session *session = client_get_session(cl);
+    struct conf_service *service = session->service;
+    int num = service->num_metadata;
+    WRBUF wrbuf = wrbuf_alloc();
+    int first = 1;
+    for (index = 0; index < num; index++) {
+        struct conf_metadata *conf_meta = &service->metadata[index];
+        if (conf_meta->termlist) {
+            if (first)
+                first = 0;
+            else
+                wrbuf_puts(wrbuf, ",");
+            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);
+            }
+            if (opt_facet_term_count && opt_facet_term_count[0] != '\0') {
+                wrbuf_printf(wrbuf, " 3=%s ", opt_facet_term_count);
+            }
+        }
+    }
+    if (wrbuf_len(wrbuf)) {
+        yaz_log(YLOG_LOG, "Setting ZOOM facets option: %s", wrbuf_cstr(wrbuf));
+        ZOOM_connection_option_set(link, "facets", wrbuf_cstr(wrbuf));
+        return 1;
+    }
+    return 0;
+}
+
+int client_has_facet(struct client *cl, const char *name) {
+    ZOOM_facet_field facet_field;
+    if (!cl || !cl->resultset || !name)
+        return 0;
+    facet_field = ZOOM_resultset_get_facet_field(cl->resultset, name);
+    if (facet_field) {
+        yaz_log(YLOG_DEBUG, "target has facets for %s", name);
+        return 1;
+    }
+    yaz_log(YLOG_DEBUG, "target: No facets for %s", name);
+    return 0;
+}
+
+
 void client_start_search(struct client *cl)
 {
     struct session_database *sdb = client_get_database(cl);
@@ -583,13 +661,14 @@ void client_start_search(struct client *cl)
         ZOOM_query q = ZOOM_query_create();
         yaz_log(YLOG_LOG, "Search %s CQL: %s", sdb->database->url, cl->cqlquery);
         ZOOM_query_cql(q, cl->cqlquery);
-	if (*opt_sort)
-	    ZOOM_query_sortby(q, opt_sort);
+        if (*opt_sort)
+            ZOOM_query_sortby(q, opt_sort);
         rs = ZOOM_connection_search(link, q);
         ZOOM_query_destroy(q);
     }
     else
     {
+        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);
     }
@@ -815,6 +894,7 @@ int client_parse_query(struct client *cl, const char *query)
     else
         cl->cqlquery = 0;
 
+    /* TODO FIX Not thread safe */
     if (!se->relevance)
     {
         // Initialize relevance structure with query terms