*** empty log message ***

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 1021c88..ef26b1e 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.11  1995-03-28 09:16:21  quinn
+ * Revision 1.14  1995-03-30 12:18:17  quinn
+ * Fixed bug.
+ *
+ * Revision 1.13  1995/03/30  09:09:24  quinn
+ * Added state-handle and some support for asynchronous activities.
+ *
+ * Revision 1.12  1995/03/29  15:40:16  quinn
+ * Ongoing work. Statserv is now dynamic by default
+ *
+ * Revision 1.11  1995/03/28  09:16:21  quinn
  * Added record packing to the search request
  *
  * Revision 1.10  1995/03/27  08:34:24  quinn
@@ -91,6 +100,8 @@ void destroy_association(association *h)
     free(h->encode_buffer);
     if (h->input_buffer)
        free(h->input_buffer);
+    if (h->backend)
+       bend_close(h->backend);
     free(h);
 }
 
@@ -189,6 +200,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     association *assoc = iochan_getdata(client);
     bend_initrequest binitreq;
     bend_initresult *binitres;
+    Odr_bitmask options, protocolVersion;
 
     fprintf(stderr, "Got initRequest.\n");
     if (req->implementationId)
@@ -205,12 +217,27 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
        return -1;
     }
 
+    assoc->backend = binitres->handle;
     apdup = &apdu;
     apdu.which = Z_APDU_initResponse;
     apdu.u.initResponse = &resp;
     resp.referenceId = req->referenceId;
-    resp.options = req->options; /* should check these */
-    resp.protocolVersion = req->protocolVersion;
+    ODR_MASK_ZERO(&options);
+    if (ODR_MASK_GET(req->options, Z_Options_search))
+       ODR_MASK_SET(&options, Z_Options_search);
+    if (ODR_MASK_GET(req->options, Z_Options_present))
+       ODR_MASK_SET(&options, Z_Options_present);
+    if (ODR_MASK_GET(req->options, Z_Options_delSet))
+       ODR_MASK_SET(&options, Z_Options_delSet);
+    if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
+       ODR_MASK_SET(&options, Z_Options_namedResultSets);
+    resp.options = &options;
+    ODR_MASK_ZERO(&protocolVersion);
+    if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
+       ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1);
+    if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
+       ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2);
+    resp.protocolVersion = &protocolVersion;
     assoc->maximumRecordSize = *req->maximumRecordSize;
     /*
      * This is not so hot. The big todo for ODR is dynamic memory allocation
@@ -226,7 +253,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "Index Data/YAZ Generic Frontend Server";
-    resp.implementationVersion = "$Revision: 1.11 $";
+    resp.implementationVersion = "$Revision: 1.14 $";
     resp.userInformationField = 0;
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
@@ -328,7 +355,7 @@ static Z_Records *pack_records(association *a, char *setname, int start,
        }
        freq.setname = setname;
        freq.number = recno;
-       if (!(fres = bend_fetch(&freq)))
+       if (!(fres = bend_fetch(a->backend, &freq, 0)))
        {
            *pres = Z_PRES_FAILURE;
            return diagrec(a->proto, 2, "Backend interface problem");
@@ -418,6 +445,7 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
     bend_searchresult *bsrt;
     oident *oent;
     int next = 0;
+    static int none = Z_RES_NONE;
 
     fprintf(stderr, "Got SearchRequest.\n");
     apdup = &apdu;
@@ -433,7 +461,15 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
        if (!(oent = oid_getentbyoid(q->attributeSetId)) ||
            oent->class != CLASS_ATTSET ||
            oent->value != VAL_BIB1)
+       {
            resp.records = diagrec(assoc->proto, 121, 0);
+           resp.resultCount = &nulint;
+           resp.numberOfRecordsReturned = &nulint;
+           resp.nextResultSetPosition = &nulint;
+           resp.searchStatus = &none;
+           resp.resultSetStatus = 0;
+           resp.presentStatus = 0;
+       }
     }
     if (!resp.records)
     {
@@ -447,60 +483,62 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
        bsrq.basenames = req->databaseNames;
        bsrq.query = req->query;
 
-       if (!(bsrt = bend_search(&bsrq)))
+       if (!(bsrt = bend_search(assoc->backend, &bsrq, 0)))
            return -1;
        else if (bsrt->errcode)
+       {
+
            resp.records = diagrec(assoc->proto, bsrt->errcode,
                bsrt->errstring);
+           resp.resultCount = &nulint;
+           resp.numberOfRecordsReturned = &nulint;
+           resp.nextResultSetPosition = &nulint;
+           resp.searchStatus = &nulint;
+           resp.resultSetStatus = &none;
+           resp.presentStatus = 0;
+       }
        else
+       {
            resp.records = 0;
 
-       resp.resultCount = &bsrt->hits;
+           resp.resultCount = &bsrt->hits;
 
-       /* how many records does the user agent want, then? */
-       if (bsrt->hits <= *req->smallSetUpperBound)
-       {
-           toget = bsrt->hits;
-           setnames = req->smallSetElementSetNames;
-       }
-       else if (bsrt->hits < *req->largeSetLowerBound)
-       {
-           toget = *req->mediumSetPresentNumber;
-           setnames = req->mediumSetElementSetNames;
-       }
-       else
-           toget = 0;
+           /* how many records does the user agent want, then? */
+           if (bsrt->hits <= *req->smallSetUpperBound)
+           {
+               toget = bsrt->hits;
+               setnames = req->smallSetElementSetNames;
+           }
+           else if (bsrt->hits < *req->largeSetLowerBound)
+           {
+               toget = *req->mediumSetPresentNumber;
+               setnames = req->mediumSetElementSetNames;
+           }
+           else
+               toget = 0;
 
-       if (toget)
-       {
-           resp.records = pack_records(assoc, req->resultSetName, 1, &toget,
-               setnames, &next, &presst);
-           if (!resp.records)
-               return -1;
-           resp.numberOfRecordsReturned = &toget;
-           resp.nextResultSetPosition = &next;
-           resp.searchStatus = &sr;
-           resp.resultSetStatus = &sr;
-           resp.presentStatus = &presst;
-       }
-       else
-       {
-           resp.records = 0;
-           resp.numberOfRecordsReturned = &nulint;
-           resp.nextResultSetPosition = &nulint;
-           resp.searchStatus = &sr;
-           resp.resultSetStatus = &sr;
-           resp.presentStatus = 0;
+           if (toget && !resp.records)
+           {
+               resp.records = pack_records(assoc, req->resultSetName, 1,
+                   &toget, setnames, &next, &presst);
+               if (!resp.records)
+                   return -1;
+               resp.numberOfRecordsReturned = &toget;
+               resp.nextResultSetPosition = &next;
+               resp.searchStatus = &sr;
+               resp.resultSetStatus = 0;
+               resp.presentStatus = &presst;
+           }
+           else
+           {
+               resp.numberOfRecordsReturned = &nulint;
+               resp.nextResultSetPosition = &next;
+               resp.searchStatus = &sr;
+               resp.resultSetStatus = 0;
+               resp.presentStatus = 0;
+           }
        }
     }
-    else
-    {
-       resp.resultCount = &nulint;
-       resp.numberOfRecordsReturned = &nulint;
-       resp.nextResultSetPosition = &nulint;
-       resp.searchStatus = &nulint;
-       resp.resultSetStatus = 0;
-    }
 
     if (!z_APDU(assoc->encode, &apdup, 0))
     {