Proper diagnostics for unsupp operation YAZ-696

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

diff --git a/src/seshigh.c b/src/seshigh.c
index a9a3cba..c744808 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -1260,8 +1260,9 @@ static void srw_bend_explain(association *assoc,
 {
     Z_SRW_explainRequest *srw_req = sr->u.explain_request;
     yaz_log(log_requestdetail, "Got SRW ExplainRequest");
-    *http_code = 404;
     srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
+    if (!assoc->init && srw_res->num_diagnostics == 0)
+        *http_code = 404;
     if (assoc->init)
     {
         bend_explain_rr rr;
@@ -1487,8 +1488,9 @@ static void srw_bend_update(association *assoc,
     Z_SRW_updateRequest *srw_req = sr->u.update_request;
     yaz_log(log_session, "SRWUpdate action=%s", srw_req->operation);
     yaz_log(YLOG_DEBUG, "num_diag = %d", srw_res->num_diagnostics );
-    *http_code = 404;
     srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr);
+    if (!assoc->init && srw_res->num_diagnostics == 0)
+        *http_code = 404;
     if (assoc->init)
     {
        bend_update_rr rr;
@@ -2681,7 +2683,9 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb)
         bsrr->errcode = 0;
         bsrr->errstring = NULL;
         bsrr->search_info = NULL;
-        bsrr->search_input = req->otherInfo;
+        bsrr->search_input = req->additionalSearchInfo;
+        if (!bsrr->search_input)
+            bsrr->search_input = req->otherInfo;
         bsrr->present_number = *req->mediumSetPresentNumber;
 
         if (assoc->server && assoc->server->cql_transform