Removed a few yaz_log calls

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

diff --git a/src/seshigh.c b/src/seshigh.c
index 3cc1b38..901aa31 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.80 2006-05-09 13:39:47 adam Exp $
+ * $Id: seshigh.c,v 1.82 2006-05-14 20:03:19 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -582,10 +582,6 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
     const char *match_schema = 0;
     int *match_syntax = 0;
 
-    if (!assoc->server)
-    {
-        yaz_log(YLOG_LOG, "no assoc->server");
-    }
     if (assoc->server)
     {
         int r;
@@ -595,8 +591,6 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
         const char *backend_schema = 0;
         Odr_oid *backend_syntax = 0;
 
-        yaz_log(YLOG_LOG, "found assoc->server");
-
         r = yaz_retrieval_request(assoc->server->retrieval,
                                   input_schema,
                                   input_syntax_raw,
@@ -605,7 +599,6 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
                                   &rc,
                                   &backend_schema,
                                   &backend_syntax);
-        yaz_log(YLOG_LOG, "yaz_retrieval_request r=%d", r);
         if (r == -1) /* error ? */
         {
             const char *details = yaz_retrieval_get_error(
@@ -677,7 +670,6 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
         rr->output_format = oi ? oi->value : VAL_NONE;
         rr->output_format_raw = match_syntax;
     }
-    yaz_log(YLOG_LOG, "match_scheam=%s", match_schema);
     if (match_schema)
         rr->schema = odr_strdup(rr->stream, match_schema);
     return 0;
@@ -2240,7 +2232,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.80 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.82 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -2656,9 +2648,39 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
                 form = VAL_NONE;
             else
                 form = prefformat->value;
-            resp->records = pack_records(assoc, req->resultSetName, 1,
-                                         toget, compp, next, presst, form, req->referenceId,
-                                         req->preferredRecordSyntax, NULL);
+
+            /* Call bend_present if defined */
+            if (assoc->init->bend_present)
+            {
+                bend_present_rr *bprr = (bend_present_rr *)
+                    nmem_malloc (reqb->request_mem, sizeof(*bprr));
+                bprr->setname = req->resultSetName;
+                bprr->start = 1;
+                bprr->number = *toget;
+                bprr->format = form;
+                bprr->comp = compp;
+                bprr->referenceId = req->referenceId;
+                bprr->stream = assoc->encode;
+                bprr->print = assoc->print;
+                bprr->request = reqb;
+                bprr->association = assoc;
+                bprr->errcode = 0;
+                bprr->errstring = NULL;
+                (*assoc->init->bend_present)(assoc->backend, bprr);
+
+                if (!bprr->request)
+                    return 0;
+                if (bprr->errcode)
+                {
+                    resp->records = diagrec(assoc, bprr->errcode, bprr->errstring);
+                    *resp->presentStatus = Z_PresentStatus_failure;
+                }
+            }
+
+            if (!resp->records)
+                resp->records = pack_records(assoc, req->resultSetName, 1,
+                                             toget, compp, next, presst, form, req->referenceId,
+                                             req->preferredRecordSyntax, NULL);
             if (!resp->records)
                 return 0;
             resp->numberOfRecordsReturned = toget;