Chanes to SCAN

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 7e88771..ab54a94 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,34 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.48  1995-10-06 08:51:20  quinn
+ * Revision 1.58  1996-02-20 12:53:04  quinn
+ * Chanes to SCAN
+ *
+ * Revision 1.57  1996/01/02  08:57:47  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.56  1995/12/14  11:09:57  quinn
+ * Work on Explain
+ *
+ * Revision 1.55  1995/11/08  17:41:37  quinn
+ * Smallish.
+ *
+ * Revision 1.54  1995/11/08  15:11:29  quinn
+ * Log of close transmit.
+ *
+ * Revision 1.53  1995/11/01  13:54:58  quinn
+ * Minor adjustments
+ *
+ * Revision 1.52  1995/11/01  12:19:13  quinn
+ * Second attempt to fix same bug.
+ *
+ * Revision 1.50  1995/10/25  16:58:32  quinn
+ * Simple.
+ *
+ * Revision 1.49  1995/10/16  13:51:53  quinn
+ * Changes to provide Especs to the backend.
+ *
+ * Revision 1.48  1995/10/06  08:51:20  quinn
  * Added Write-buffer.
  *
  * Revision 1.47  1995/08/29  14:24:16  quinn
@@ -187,7 +214,7 @@
 #include <assert.h>
 #include <sys/time.h>
 
-#include <dmalloc.h>
+#include <xmalloc.h>
 #include <comstack.h>
 #include <eventl.h>
 #include <session.h>
@@ -226,7 +253,7 @@ association *create_association(IOCHAN channel, COMSTACK link)
 
     if (!control_block)
        control_block = statserv_getcontrol();
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
        return 0;
     new->client_chan = channel;
     new->client_link = link;
@@ -292,12 +319,12 @@ void destroy_association(association *h)
     if (h->print)
        odr_destroy(h->print);
     if (h->input_buffer)
-       free(h->input_buffer);
+    xfree(h->input_buffer);
     if (h->backend)
        bend_close(h->backend);
     while (request_deq(&h->incoming));
     while (request_deq(&h->outgoing));
-    free(h);
+   xfree(h);
 }
 
 static void do_close(association *a, int reason, char *message)
@@ -311,7 +338,8 @@ static void do_close(association *a, int reason, char *message)
     while (request_deq(&a->outgoing));
     if (a->version >= 3)
     {
-       logf(LOG_DEBUG, "Generating Close PDU");
+       logf(LOG_LOG, "Sending Close PDU, reason=%d, message=%s",
+           reason, message ? message : "none");
        apdu.which = Z_APDU_close;
        apdu.u.close = cls;
        *cls->closeReason = reason;
@@ -396,8 +424,9 @@ void ir_session(IOCHAN h, int event)
            odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
            if (!z_APDU(assoc->decode, &req->request, 0))
            {
-               logf(LOG_LOG, "ODR error on incoming PDU: %s",
-                   odr_errlist[odr_geterror(assoc->decode)]);
+               logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+                   odr_errlist[odr_geterror(assoc->decode)],
+                   odr_offset(assoc->decode));
                logf(LOG_LOG, "PDU dump:");
                odr_dumpBER(log_file(), assoc->input_buffer, res);
                do_close(assoc, Z_Close_protocolError, "Malformed package");
@@ -435,7 +464,7 @@ void ir_session(IOCHAN h, int event)
                break;
            case 0: /* all sent - release the request structure */
                logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
-               odr_release_mem(req->request_mem);
+               nmem_destroy(req->request_mem);
                request_deq(&assoc->outgoing);
                request_release(req);
                if (!request_head(&assoc->outgoing))
@@ -556,11 +585,12 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     {
        logf(LOG_WARN, "ODR error when encoding response: %s",
            odr_errlist[odr_geterror(assoc->decode)]);
+       odr_reset(assoc->encode);
        return -1;
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
        &req->size_response);
-    odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we abort later */
+    odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
     odr_reset(assoc->encode);
     if (assoc->print && !z_APDU(assoc->print, &res, 0))
     {
@@ -708,7 +738,7 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
 #endif
 
     bib1.proto = proto;
-    bib1.class = CLASS_DIAGSET;
+    bib1.oclass = CLASS_DIAGSET;
     bib1.value = VAL_BIB1;
 
     logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
@@ -746,7 +776,7 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
 #endif
 
     bib1.proto = proto;
-    bib1.class = CLASS_DIAGSET;
+    bib1.oclass = CLASS_DIAGSET;
     bib1.value = VAL_BIB1;
 
     logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
@@ -784,7 +814,7 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 
     logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
     bib1.proto = proto;
-    bib1.class = CLASS_DIAGSET;
+    bib1.oclass = CLASS_DIAGSET;
     bib1.value = VAL_BIB1;
 
     err = error;
@@ -807,7 +837,7 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 #define MAX_RECORDS 256
 
 static Z_Records *pack_records(association *a, char *setname, int start,
-                               int *num, Z_ElementSetNames *esn,
+                               int *num, Z_RecordComposition *comp,
                                int *next, int *pres, oid_value format)
 {
     int recno, total_length = 0, toget = *num;
@@ -848,6 +878,7 @@ static Z_Records *pack_records(association *a, char *setname, int start,
        }
        freq.setname = setname;
        freq.number = recno;
+       freq.comp = comp;
        freq.format = format;
        freq.stream = a->encode;
        if (!(fres = bend_fetch(a->backend, &freq, 0)))
@@ -910,7 +941,7 @@ static Z_Records *pack_records(association *a, char *setname, int start,
            sizeof(Z_DatabaseRecord))))
            return 0;
        recform.proto = a->proto;
-       recform.class = CLASS_RECSYN;
+       recform.oclass = CLASS_RECSYN;
        recform.value = fres->format;
        thisext->direct_reference = odr_oiddup(a->encode,
            oid_getoidbyent(&recform));
@@ -1036,24 +1067,27 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     else
     {
        static int toget;
-       Z_ElementSetNames *setnames;
+       Z_RecordComposition comp, *compp = 0;
        static int presst = 0;
 
        resp.records = 0;
        resp.resultCount = &bsrt->hits;
 
+       comp.which = Z_RecordComp_simple;
        /* how many records does the user agent want, then? */
        if (bsrt->hits <= *req->smallSetUpperBound)
        {
            toget = bsrt->hits;
-           setnames = req->smallSetElementSetNames;
+           if ((comp.u.simple = req->smallSetElementSetNames))
+               compp = &comp;
        }
        else if (bsrt->hits < *req->largeSetLowerBound)
        {
            toget = *req->mediumSetPresentNumber;
            if (toget > bsrt->hits)
                toget = bsrt->hits;
-           setnames = req->mediumSetElementSetNames;
+           if ((comp.u.simple = req->mediumSetElementSetNames))
+               compp = &comp;
        }
        else
            toget = 0;
@@ -1064,12 +1098,12 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
            oid_value form;
 
            if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
-               prefformat->class != CLASS_RECSYN)
+               prefformat->oclass != CLASS_RECSYN)
                form = VAL_NONE;
            else
                form = prefformat->value;
            resp.records = pack_records(assoc, req->resultSetName, 1,
-               &toget, setnames, &next, &presst, form);
+               &toget, compp, &next, &presst, form);
            if (!resp.records)
                return 0;
            resp.numberOfRecordsReturned = &toget;
@@ -1127,13 +1161,14 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
 #endif
 
     if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
-       prefformat->class != CLASS_RECSYN)
+       prefformat->oclass != CLASS_RECSYN)
        form = VAL_NONE;
     else
        form = prefformat->value;
     num = *req->numberOfRecordsRequested;
     resp.records = pack_records(assoc, req->resultSetId,
-       *req->resultSetStartPoint, &num, 0, &next, &presst, form);
+       *req->resultSetStartPoint, &num, req->recordComposition, &next,
+       &presst, form);
     if (!resp.records)
        return 0;
     resp.numberOfRecordsReturned = &num;
@@ -1177,7 +1212,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
 #endif
 
     if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
-       attent->class != CLASS_ATTSET || attent->value != VAL_BIB1))
+       attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1))
        ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0);
     else if (req->stepSize && *req->stepSize > 0)
        ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);
@@ -1225,8 +1260,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
                e->which = Z_Entry_termInfo;
                e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t));
                t->suggestedAttributes = 0;
+               t->displayTerm = 0;
                t->alternativeTerm = 0;
                t->byAttributes = 0;
+               t->otherTermInfo = 0;
                t->globalOccurrences = &srs->entries[i].occurrences;
                t->term = odr_malloc(assoc->encode, sizeof(*t->term));
                t->term->which = Z_Term_general;