Reformat

[yaz-moved-to-github.git] / src / zoom-sru.c

diff --git a/src/zoom-sru.c b/src/zoom-sru.c
index 1932f09..557e812 100644 (file)
--- a/src/zoom-sru.c
+++ b/src/zoom-sru.c
@@ -1,11 +1,14 @@
 /* This file is part of the YAZ toolkit.
 /* This file is part of the YAZ toolkit.

- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2011 Index Data

  * See the file LICENSE for details.
  */
 /**
  * \file zoom-sru.c
  * \brief Implements ZOOM SRU
  */
  * See the file LICENSE for details.
  */
 /**
  * \file zoom-sru.c
  * \brief Implements ZOOM SRU
  */

+#if HAVE_CONFIG_H
+#include <config.h>
+#endif

 
 #include <assert.h>
 #include <string.h>
 
 #include <assert.h>
 #include <string.h>

@@ -13,6 +16,9 @@
 #include "zoom-p.h"
 
 #include <yaz/log.h>
 #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)
 
 #if YAZ_HAVE_XML2
 static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)

@@ -24,7 +30,6 @@ static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d)
 #endif
 
 
 #endif
 
 

-

 #if YAZ_HAVE_XML2
 static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr)
 {
 #if YAZ_HAVE_XML2
 static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr)
 {

@@ -50,6 +55,10 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr)
     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
     }
     {
         yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
     }

+    else if (c->sru_mode == zoom_sru_solr)
+    {
+        yaz_solr_encode_request(gdu->u.HTTP_Request, sr, c->odr_out, c->charset);
+    }

     if (!z_GDU(c->odr_out, &gdu, 0, 0))
         return zoom_complete;
     if (c->odr_print)
     if (!z_GDU(c->odr_out, &gdu, 0, 0))
         return zoom_complete;
     if (c->odr_print)

@@ -129,13 +138,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)
 {
 #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;
     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);
     if (c->error)                  /* don't continue on error */
         return zoom_complete;
     assert(c->tasks);

@@ -148,6 +158,9 @@ 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;
         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;
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;

@@ -210,6 +223,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;
         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)
     
     option_val = ZOOM_resultset_option_get(resultset, "recordPacking");
     if (option_val)

@@ -249,12 +263,15 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         syntax = c->tasks->u.search.syntax;
         elementSetName = c->tasks->u.search.elementSetName;        
 
         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;
         }
             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;
         break;
     case ZOOM_TASK_RETRIEVE:
         resultset = c->tasks->u.retrieve.resultset;

@@ -280,8 +297,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
     }
     else
     {
     }
     else
     {

-        if (res->numberOfRecords)
+        if (res->numberOfRecords) {

             resultset->size = *res->numberOfRecords;
             resultset->size = *res->numberOfRecords;

+        }

         for (i = 0; i<res->num_records; i++)
         {
             int pos;
         for (i = 0; i<res->num_records; i++)
         {
             int pos;

@@ -291,13 +309,16 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
             
             Z_NamePlusRecord *npr = (Z_NamePlusRecord *)
                 odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord));
             
             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;
             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;
             sru_rec = &res->records[i];
             
             npr->databaseName = 0;

@@ -333,9 +354,9 @@ static zoom_ret handle_srw_response(ZOOM_connection c,
         *start += i;
         if (*count + *start > resultset->size)
             *count = resultset->size - *start;
         *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;
         if (*count < 0)
             *count = 0;

-        

         nmem = odr_extract_mem(c->odr_in);
         nmem_transfer(odr_getmem(resultset->odr), nmem);
         nmem_destroy(nmem);
         nmem = odr_extract_mem(c->odr_in);
         nmem_transfer(odr_getmem(resultset->odr), nmem);
         nmem_destroy(nmem);

@@ -373,12 +394,24 @@ static void handle_srw_scan_response(ZOOM_connection c,
 int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
                     zoom_ret *cret)
 {
 int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
                     zoom_ret *cret)
 {

+#if YAZ_HAVE_XML2

     int ret = 0;
     const char *addinfo = 0;
 
     /* not redirect (normal response) */
     if (!yaz_srw_check_content_type(hres))
     int ret = 0;
     const char *addinfo = 0;
 
     /* not redirect (normal response) */
     if (!yaz_srw_check_content_type(hres))

+    {

         addinfo = "content-type";
         addinfo = "content-type";

+        ret = -1;
+    }
+    else if (c->sru_mode == zoom_sru_solr)
+    {
+        Z_SRW_PDU *sr;
+        ret = yaz_solr_decode_response(c->odr_in, hres, &sr);
+        if (ret == 0)
+            if (sr->which == Z_SRW_searchRetrieve_response)
+                *cret = handle_srw_response(c, sr->u.response);
+    }

     else
     {
         Z_SOAP *soap_package = 0;
     else
     {
         Z_SOAP *soap_package = 0;

@@ -416,6 +449,9 @@ int ZOOM_handle_sru(ZOOM_connection c, Z_HTTP_Response *hres,
             ret = -1;
     }   
     return ret;
             ret = -1;
     }   
     return ret;

+#else
+    return -1;
+#endif

 }
 
 /*
 }
 
 /*