Smallish.

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

diff --git a/server/seshigh.c b/server/seshigh.c
index a0e3126..60ad9ca 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.25  1995-05-17 08:42:26  quinn
+ * Revision 1.29  1995-06-01 11:25:03  quinn
+ * Smallish.
+ *
+ * Revision 1.28  1995/06/01  11:21:01  quinn
+ * Attempting to fix a bug in pack-records. replaced break with continue
+ * for large records, according to standard.
+ *
+ * Revision 1.27  1995/05/29  08:12:06  quinn
+ * Moved oid to util
+ *
+ * Revision 1.26  1995/05/18  13:02:12  quinn
+ * Smallish.
+ *
+ * Revision 1.25  1995/05/17  08:42:26  quinn
  * Transfer auth info to backend. Allow backend to reject init gracefully.
  *
  * Revision 1.24  1995/05/16  08:51:04  quinn
@@ -208,10 +221,7 @@ association *create_association(IOCHAN channel, COMSTACK link)
     new->rejected = 0;
     request_initq(&new->incoming);
     request_initq(&new->outgoing);
-    if (cs_getproto(link) == CS_Z3950)
-       new->proto = PROTO_Z3950;
-    else
-       new->proto = PROTO_SR;
+    new->proto = cs_getproto(link);
     return new;
 }
 
@@ -451,7 +461,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
        &req->size_response);
-    odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we have to quit */
+    odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we abort later */
     odr_reset(assoc->encode);
     if (assoc->print && !z_APDU(assoc->print, &res, 0))
     {
@@ -466,12 +476,18 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     request_enq(&assoc->outgoing, req);
     /* turn the work over to the ir_session handler */
     iochan_setflag(assoc->client_chan, EVENT_OUTPUT);
-    /* Is there more work to be done? */
+    /* Is there more work to be done? give that to the input handler too */
     if (request_head(&assoc->incoming))
        iochan_setevent(assoc->client_chan, EVENT_WORK);
     return 0;
 }
 
+/*
+ * Handle init request.
+ * At the moment, we don't check the protocol version or the options
+ * anywhere else in the code - we just don't do anything that would
+ * break a naive client.
+ */
 static Z_APDU *process_initRequest(association *assoc, request *reqb)
 {
     Z_InitRequest *req = reqb->request->u.initRequest;
@@ -535,9 +551,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     resp.preferredMessageSize = &assoc->preferredMessageSize;
     resp.maximumRecordSize = &assoc->maximumRecordSize;
     resp.result = &result;
-    resp.implementationId = "YAZ";
     resp.implementationName = "Index Data/YAZ Generic Frontend Server";
-    resp.implementationVersion = YAZ_VERSION;
     resp.userInformationField = 0;
     if (binitres->errcode)
     {
@@ -548,6 +562,13 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     return &apdu;
 }
 
+/*
+ * These functions should be merged.
+ */
+
+/*
+ * nonsurrogate diagnostic record.
+ */
 static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
 {
     static Z_Records rec;
@@ -570,6 +591,9 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
     return &rec;
 }
 
+/*
+ * surrogate diagnostic.
+ */
 static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
                                            int error, char *addinfo)
 {
@@ -593,6 +617,9 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
     return &rec;
 }
 
+/*
+ * multiple nonsurrogate diagnostics.
+ */
 static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 {
     static Z_DiagRecs recs;
@@ -692,8 +719,8 @@ static Z_Records *pack_records(association *a, char *setname, int start,
                    reclist.records[reclist.num_records] =
                         surrogatediagrec(a->proto, fres->basename, 16, 0);
                    reclist.num_records++;
-                   *pres = Z_PRES_PARTIAL_2;
-                   break;
+                   total_length += 10; /* totally arbitrary */
+                   continue;
                }
            }
            else /* too big entirely */
@@ -702,8 +729,8 @@ static Z_Records *pack_records(association *a, char *setname, int start,
                reclist.records[reclist.num_records] =
                    surrogatediagrec(a->proto, fres->basename, 17, 0);
                reclist.num_records++;
-               *pres = Z_PRES_PARTIAL_2;
-               break;
+               total_length += 10; /* totally arbitrary */
+               continue;
            }
        }
        if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
@@ -731,9 +758,9 @@ static Z_Records *pack_records(association *a, char *setname, int start,
        reclist.records[reclist.num_records] = thisrec;
        reclist.num_records++;
        total_length += fres->len;
-       (*num)++;
        *next = fres->last_in_set ? 0 : recno + 1;
     }
+    *num = reclist.num_records;
     return &records;
 }