X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=8b5702a67724a2aaa0e8bdda5e6b8bf5aa66f56b;hb=6ea099611ad6b5eacd8abdc2d798f86d4adfbd12;hp=42a90d82b340a0bd69829906ecbebd7b2aaae95a;hpb=dbf6bee5181285baf2fd8f36511846d138655404;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index 42a90d8..8b5702a 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.6  1995-03-21 12:30:09  quinn
+ * Revision 1.9  1995-03-22 15:01:26  quinn
+ * Adjusting record packing.
+ *
+ * Revision 1.8  1995/03/22  10:13:21  quinn
+ * Working on record packer
+ *
+ * Revision 1.7  1995/03/21  15:53:31  quinn
+ * Little changes.
+ *
+ * Revision 1.6  1995/03/21  12:30:09  quinn
  * Beginning to add support for record packing.
  *
  * Revision 1.5  1995/03/17  10:44:13  quinn
@@ -20,39 +29,7 @@
  * Partitioned server.
  *
  * Revision 1.1  1995/03/15  16:02:10  quinn
- * Modded session.c seshigh.c
- *
- * Revision 1.10  1995/03/15  15:18:51  quinn
- * Little changes to better support nonblocking I/O
- * Added backend.h
- *
- * Revision 1.9  1995/03/15  13:20:23  adam
- * Yet another bug fix in very dummy_database...
- *
- * Revision 1.8  1995/03/15  11:18:17  quinn
- * Smallish changes.
- *
- * Revision 1.7  1995/03/15  09:40:15  adam
- * Bug fixes in dummy_database_...
- *
- * Revision 1.6  1995/03/15  09:08:30  adam
- * Take care of preferredMessageSize.
- *
- * Revision 1.5  1995/03/15  08:37:44  quinn
- * Now we're pretty much set for nonblocking I/O.
- *
- * Revision 1.4  1995/03/15  08:27:20  adam
- * PresentRequest changed to return MARC records from file 'dummy-records'.
- *
- * Revision 1.3  1995/03/14  16:59:48  quinn
- * Bug-fixes
- *
- * Revision 1.2  1995/03/14  11:30:14  quinn
- * Works better now.
- *
- * Revision 1.1  1995/03/14  10:28:01  quinn
- * More work on demo server.
- *
+ * Modded session.c to seshigh.c
  *
  */
 
@@ -187,7 +164,8 @@ static int process_apdu(IOCHAN chan)
 	    fprintf(stderr, "Bad APDU\n");
 	    return -1;
     }
-    odr_reset(assoc->decode);
+    odr_reset(assoc->decode); /* release incopming APDU */
+    odr_reset(assoc->encode); /* release stuff alloced before encoding */
     return res;
 }
 
@@ -222,8 +200,12 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     resp.options = req->options; /* should check these */
     resp.protocolVersion = req->protocolVersion;
     assoc->maximumRecordSize = *req->maximumRecordSize;
-    if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 500)
-    	assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 500;
+    /*
+     * This is not so hot. The big todo for ODR is dynamic memory allocation
+     * on encoding.
+     */
+    if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 1000)
+    	assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 1000;
     assoc->preferredMessageSize = *req->preferredMessageSize;
     if (assoc->preferredMessageSize > assoc->maximumRecordSize)
     	assoc->preferredMessageSize = assoc->maximumRecordSize;
@@ -232,7 +214,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "YAZ/Simple asynchronous test server";
-    resp.implementationVersion = "$Revision: 1.6 $";
+    resp.implementationVersion = "$Revision: 1.9 $";
     resp.userInformationField = 0;
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
@@ -252,7 +234,8 @@ static Z_Records *diagrec(int error, char *addinfo)
     static Z_DiagRec dr;
     static int err;
 
-    fprintf(stderr, "Diagnostic: %d -- %s\n", error, addinfo);
+    fprintf(stderr, "Diagnostic: %d -- %s\n", error, addinfo ? addinfo :
+	"NULL");
     err = error;
     rec.which = Z_Records_NSD;
     rec.u.nonSurrogateDiagnostic = &dr;
@@ -271,6 +254,7 @@ static Z_NamePlusRecord *surrogatediagrec(char *dbname, int error,
     static int err;
 
     fprintf(stderr, "SurrogateDiagnotic: %d -- %s\n", error, addinfo);
+    err = error;
     rec.databaseName = dbname;
     rec.which = Z_NamePlusRecord_surrogateDiagnostic;
     rec.u.surrogateDiagnostic = &dr;
@@ -280,8 +264,120 @@ static Z_NamePlusRecord *surrogatediagrec(char *dbname, int error,
     return &rec;
 }
 
-static Z_Records *pack_records(association *a, int num, Z_ElementSetNames *esn)
+#define MAX_RECORDS 256
+
+static Z_Records *pack_records(association *a, char *setname, int start,
+				int *num, Z_ElementSetNames *esn,
+				int *next, int *pres)
 {
+    int recno, total_length = 0, toget = *num;
+    static Z_Records records;
+    static Z_NamePlusRecordList reclist;
+    static Z_NamePlusRecord *list[MAX_RECORDS];
+
+    records.which = Z_Records_DBOSD;
+    records.u.databaseOrSurDiagnostics = &reclist;
+    reclist.num_records = 0;
+    reclist.records = list;
+    *pres = Z_PRES_SUCCESS;
+    *num = 0;
+    *next = 0;
+
+    fprintf(stderr, "Request to pack %d+%d\n", start, toget);
+    fprintf(stderr, "pms=%d, mrs=%d\n", a->preferredMessageSize,
+    	a->maximumRecordSize);
+    for (recno = start; reclist.num_records < toget; recno++)
+    {
+    	bend_fetchrequest freq;
+	bend_fetchresult *fres;
+	Z_NamePlusRecord *thisrec;
+	Z_DatabaseRecord *thisext;
+
+	if (reclist.num_records == MAX_RECORDS - 1)
+	{
+	    *pres = Z_PRES_PARTIAL_2;
+	    break;
+	}
+	freq.setname = setname;
+	freq.number = recno;
+	if (!(fres = bend_fetch(&freq)))
+	{
+	    *pres = Z_PRES_FAILURE;
+	    return diagrec(2, "Backend interface problem");
+	}
+	/* backend should be able to signal whether error is system-wide
+	   or only pertaining to current record */
+	if (fres->errcode)
+	{
+	    *pres = Z_PRES_FAILURE;
+	    return diagrec(fres->errcode, fres->errstring);
+	}
+	fprintf(stderr, "  Got record, len=%d, total=%d\n",
+	    fres->len, total_length);
+	if (fres->len + total_length > a->preferredMessageSize)
+	{
+	    fprintf(stderr, "  In drop-zone\n");
+	    /* record is small enough, really */
+	    if (fres->len <= a->preferredMessageSize)
+	    {
+	    	fprintf(stderr, "  Dropped last normal-sized record\n");
+		*pres = Z_PRES_PARTIAL_2;
+		break;
+	    }
+	    /* record can only be fetched by itself */
+	    if (fres->len < a->maximumRecordSize)
+	    {
+	    	fprintf(stderr, "  Record > prefmsgsz\n");
+	    	if (toget > 1)
+		{
+		    fprintf(stderr, "  Dropped it\n");
+		    reclist.records[reclist.num_records] =
+		   	 surrogatediagrec(fres->basename, 16, 0);
+		    reclist.num_records++;
+		    *pres = Z_PRES_PARTIAL_2;
+		    break;
+		}
+	    }
+	    else /* too big entirely */
+	    {
+	    	fprintf(stderr, "Record > maxrcdsz\n");
+		reclist.records[reclist.num_records] =
+		    surrogatediagrec(fres->basename,
+		    17, 0);
+		reclist.num_records++;
+		*pres = Z_PRES_PARTIAL_2;
+		break;
+	    }
+	}
+	if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
+	    return 0;
+	if (!(thisrec->databaseName = odr_malloc(a->encode,
+	    strlen(fres->basename) + 1)))
+	    return 0;
+	strcpy(thisrec->databaseName, fres->basename);
+	thisrec->which = Z_NamePlusRecord_databaseRecord;
+	if (!(thisrec->u.databaseRecord = thisext =  odr_malloc(a->encode,
+	    sizeof(Z_DatabaseRecord))))
+	    return 0;
+	thisext->direct_reference = 0; /* should be OID for current MARC */
+	thisext->indirect_reference = 0;
+	thisext->descriptor = 0;
+	thisext->which = ODR_EXTERNAL_octet;
+	if (!(thisext->u.octet_aligned = odr_malloc(a->encode,
+	    sizeof(Odr_oct))))
+	    return 0;
+	if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode, fres->len)))
+	    return 0;
+	memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len);
+	thisext->u.octet_aligned->len = thisext->u.octet_aligned->size =
+	    fres->len;
+	reclist.records[reclist.num_records] = thisrec;
+	reclist.num_records++;
+	total_length += fres->len;
+	(*num)++;
+	*next = fres->last_in_set ? 0 : recno + 1;
+    }
+    return &records;
 }
 
 static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
@@ -338,7 +434,7 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req)
     Z_APDU apdu, *apdup;
     Z_PresentResponse resp;
     association *assoc = iochan_getdata(client);
-    int nrr = 1;
+    int presst, next, num;
 
     fprintf(stderr, "Got PresentRequest.\n");
     apdup = &apdu;
@@ -346,11 +442,14 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req)
     apdu.u.presentResponse = &resp;
     resp.referenceId = req->referenceId;
 
-    resp.numberOfRecordsReturned = &nrr;
-    resp.nextResultSetPosition = &nrr;
-    resp.presentStatus = &nrr;
-
-    resp.records = diagrec(1, "No records yet.");
+    num = *req->numberOfRecordsRequested;
+    resp.records = pack_records(assoc, req->resultSetId,
+	*req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst);
+    if (!resp.records)
+    	return -1;
+    resp.numberOfRecordsReturned = &num;
+    resp.presentStatus = &presst;
+    resp.nextResultSetPosition = &next;
 
     if (!z_APDU(assoc->encode, &apdup, 0))
     {