Chanes to SCAN

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 3ebb06f..ab54a94 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $

- * Revision 1.53  1995-11-01 13:54:58  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
  * Minor adjustments
  *
  * Revision 1.52  1995/11/01  12:19:13  quinn

@@ -323,7 +338,8 @@ static void do_close(association *a, int reason, char *message)
     while (request_deq(&a->outgoing));
     if (a->version >= 3)
     {
     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;
        apdu.which = Z_APDU_close;
        apdu.u.close = cls;
        *cls->closeReason = reason;

@@ -448,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);
                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))
                request_deq(&assoc->outgoing);
                request_release(req);
                if (!request_head(&assoc->outgoing))

@@ -569,6 +585,7 @@ 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)]);
     {
        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,
        return -1;
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,

@@ -721,7 +738,7 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
 #endif
 
     bib1.proto = proto;
 #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 :
     bib1.value = VAL_BIB1;
 
     logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :

@@ -759,7 +776,7 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
 #endif
 
     bib1.proto = proto;
 #endif
 
     bib1.proto = proto;

-    bib1.class = CLASS_DIAGSET;
+    bib1.oclass = CLASS_DIAGSET;

     bib1.value = VAL_BIB1;
 
     logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
     bib1.value = VAL_BIB1;
 
     logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);

@@ -797,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;
 
     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;
     bib1.value = VAL_BIB1;
 
     err = error;

@@ -924,7 +941,7 @@ static Z_Records *pack_records(association *a, char *setname, int start,
            sizeof(Z_DatabaseRecord))))
            return 0;
        recform.proto = a->proto;
            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));
        recform.value = fres->format;
        thisext->direct_reference = odr_oiddup(a->encode,
            oid_getoidbyent(&recform));

@@ -1081,7 +1098,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
            oid_value form;
 
            if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
            oid_value form;
 
            if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||

-               prefformat->class != CLASS_RECSYN)
+               prefformat->oclass != CLASS_RECSYN)

                form = VAL_NONE;
            else
                form = prefformat->value;
                form = VAL_NONE;
            else
                form = prefformat->value;

@@ -1144,7 +1161,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
 #endif
 
     if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
 #endif
 
     if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||

-       prefformat->class != CLASS_RECSYN)
+       prefformat->oclass != CLASS_RECSYN)

        form = VAL_NONE;
     else
        form = prefformat->value;
        form = VAL_NONE;
     else
        form = prefformat->value;

@@ -1195,7 +1212,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
 #endif
 
     if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
 #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);
        ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0);
     else if (req->stepSize && *req->stepSize > 0)
        ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);

@@ -1243,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;
                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->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;
                t->globalOccurrences = &srs->entries[i].occurrences;
                t->term = odr_malloc(assoc->encode, sizeof(*t->term));
                t->term->which = Z_Term_general;