X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-sru.c;h=bf00f61103969680f12588a35f59f0c9d8400822;hp=2319387acbf2ec939e603b4ebacf6cc1c4a520a5;hb=a5795a2df2095d5a44b012a59426e7b906db3ec9;hpb=45beb75c13c772c5dc305cb443208862f33061c7

diff --git a/src/zoom-sru.c b/src/zoom-sru.c
index 2319387..bf00f61 100644
--- a/src/zoom-sru.c
+++ b/src/zoom-sru.c
@@ -13,6 +13,9 @@
 #include "zoom-p.h"
 
 #include <yaz/log.h>
+#include <yaz/pquery.h>
+
+void handle_facet_list(ZOOM_resultset r, Z_FacetList *fl);
 
 #if YAZ_HAVE_XML2
 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)
@@ -132,13 +135,14 @@ zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c)
 #if YAZ_HAVE_XML2
 zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
 {
+    const char *facets = 0;
     int i;
     int *start, *count;
     ZOOM_resultset resultset = 0;
     Z_SRW_PDU *sr = 0;
     const char *option_val = 0;
     Z_Query *z_query;
-
+    Z_FacetList *facet_list = 0;
     if (c->error)                  /* don't continue on error */
         return zoom_complete;
     assert(c->tasks);
@@ -151,6 +155,10 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
         ZOOM_options_set(resultset->options, "setname", resultset->setname);
         start = &c->tasks->u.search.start;
         count = &c->tasks->u.search.count;
+        facets = ZOOM_options_get(resultset->options, "facets");
+        if (facets) {
+            facet_list = yaz_pqf_parse_facet_list(c->odr_out, facets);
+        }
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
@@ -213,6 +221,7 @@ zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
         c->odr_out, (resultset->step > 0 && resultset->step < *count) ? 
         resultset->step : *count);
     sr->u.request->recordSchema = resultset->schema;
+    sr->u.request->facetList = facet_list;
     
     option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
     if (option_val)
@@ -252,12 +261,15 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         syntax = c->tasks->u.search.syntax;
         elementSetName = c->tasks->u.search.elementSetName;        
 
-        if (!c->tasks->u.search.recv_search_fired)
-        {
+        /* Required not for reporting client hit count multiple times into session */
+        if (!c->tasks->u.search.recv_search_fired) {
+            yaz_log(YLOG_DEBUG, "posting ZOOM_EVENT_RECV_SEARCH");
             event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
             ZOOM_connection_put_event(c, event);
             c->tasks->u.search.recv_search_fired = 1;
         }
+        if (res->facetList)
+            handle_facet_list(resultset, res->facetList);
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;
@@ -283,8 +295,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
     }
     else
     {
-        if (res->numberOfRecords)
+        if (res->numberOfRecords) {
             resultset->size = *res->numberOfRecords;
+        }
         for (i = 0; i<res->num_records; i++)
         {
             int pos;
@@ -294,13 +307,16 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
             
             Z_NamePlusRecord *npr = (Z_NamePlusRecord *)
                 odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord));
-            
+            /*
+             * TODO This does not work with 0-based recordPositions.
+             * We will iterate over one twice
+             */
             if (res->records[i].recordPosition && 
                 *res->records[i].recordPosition > 0)
                 pos = *res->records[i].recordPosition - 1;
             else
                 pos = *start + i;
-            
+
             sru_rec = &res->records[i];
             
             npr->databaseName = 0;
@@ -336,9 +352,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         *start += i;
         if (*count + *start > resultset->size)
             *count = resultset->size - *start;
+        yaz_log(YLOG_DEBUG, "SRU result set size " ODR_INT_PRINTF " start %d count %d", resultset->size, *start, *count);
         if (*count < 0)
             *count = 0;
-        
         nmem = odr_extract_mem(c->odr_in);
         nmem_transfer(odr_getmem(resultset->odr), nmem);
         nmem_destroy(nmem);