X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=2722d439c010e826cc15693a95e6f89810001539;hb=cd5d6beb85878bfc65a2ebd2b771b86a1872af40;hp=a3e3807adc6499e850386563d50339ca224a6795;hpb=9e1a8a0a598aef894f59fa8abe3ccb144a5294a8;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index a3e3807..2722d43 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.47  1995-08-29 14:24:16  quinn
+ * 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
  * Added second half of close-handshake
  *
  * Revision 1.46  1995/08/29  11:17:58  quinn
@@ -20,8 +26,6 @@
  * Updated External
  *
  * Revision 1.42  1995/08/15  11:16:50  quinn
- * CV:e ----------------------------------------------------------------------
- * CV:e ----------------------------------------------------------------------
  *
  * Revision 1.41  1995/08/02  10:23:06  quinn
  * Smallish
@@ -584,7 +588,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
 
 /*
  * Handle init request.
- * At the moment, we don't check the protocol version or the options
+ * At the moment, we don't check the options
  * anywhere else in the code - we just try not to do anything that would
  * break a naive client. We'll toss 'em into the association block when
  * we need them there.
@@ -806,7 +810,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;
@@ -847,6 +851,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)))
@@ -1035,24 +1040,25 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
     else
     {
     	static int toget;
-	Z_ElementSetNames *setnames;
+	Z_RecordComposition comp;
 	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;
+	    comp.u.simple = req->smallSetElementSetNames;
 	}
 	else if (bsrt->hits < *req->largeSetLowerBound)
 	{
 	    toget = *req->mediumSetPresentNumber;
 	    if (toget > bsrt->hits)
 		toget = bsrt->hits;
-	    setnames = req->mediumSetElementSetNames;
+	    comp.u.simple = req->mediumSetElementSetNames;
 	}
 	else
 	    toget = 0;
@@ -1068,7 +1074,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb,
 	    else
 	    	form = prefformat->value;
 	    resp.records = pack_records(assoc, req->resultSetName, 1,
-		&toget, setnames, &next, &presst, form);
+		&toget, &comp, &next, &presst, form);
 	    if (!resp.records)
 		return 0;
 	    resp.numberOfRecordsReturned = &toget;
@@ -1132,7 +1138,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
 	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;