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

diff --git a/include/yaz/backend.h b/include/yaz/backend.h
index 51f1ab7..c781fa3 100644 (file)
--- a/include/yaz/backend.h
+++ b/include/yaz/backend.h
@@ -74,6 +74,7 @@ typedef struct {
     int partial_resultset;     /**< 1=partial results; 0=full (output)*/
     Z_SRW_extra_arg *extra_args; /**< SRU extra request parameters (input) */
     char *extra_response_data;   /**< SRW extra XML response (output) */
+    Z_OtherInformation *search_input; /**< extra search info request (input) */
 } bend_search_rr;
 
 /** \brief Information for present handler. Does not replace bend_fetch. */

diff --git a/src/seshigh.c b/src/seshigh.c
index c9d7bb3..48e0a4b 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -950,6 +950,7 @@ static void srw_bend_search(association *assoc,
             rr.errcode = 0;
             rr.errstring = 0;
             rr.search_info = 0;
+            rr.search_input = 0;
             yaz_log_zquery_level(log_requestdetail,rr.query);
             
             (assoc->init->bend_search)(assoc->backend, &rr);
@@ -2617,6 +2618,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb)
         bsrr->errcode = 0;
         bsrr->errstring = NULL;
         bsrr->search_info = NULL;
+        bsrr->search_input = req->otherInfo;
 
         if (assoc->server && assoc->server->cql_transform 
             && req->query->which == Z_Query_type_104