X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=8b5702a67724a2aaa0e8bdda5e6b8bf5aa66f56b;hb=4cd00529895588ac3f40224b8e2bbb57ba28ddc1;hp=2a7a4c64c1866c42d357bd43e720293786d8cb4b;hpb=5227c7d54c015a1fda5d5b848445fb0343554b61;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index 2a7a4c6..8b5702a 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,40 +4,32 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.1  1995-03-15 16:02:10  quinn
- * Modded session.c seshigh.c
+ * Revision 1.9  1995-03-22 15:01:26  quinn
+ * Adjusting record packing.
  *
- * Revision 1.10  1995/03/15  15:18:51  quinn
- * Little changes to better support nonblocking I/O
- * Added backend.h
+ * Revision 1.8  1995/03/22  10:13:21  quinn
+ * Working on record packer
  *
- * Revision 1.9  1995/03/15  13:20:23  adam
- * Yet another bug fix in very dummy_database...
+ * Revision 1.7  1995/03/21  15:53:31  quinn
+ * Little changes.
  *
- * Revision 1.8  1995/03/15  11:18:17  quinn
- * Smallish changes.
+ * Revision 1.6  1995/03/21  12:30:09  quinn
+ * Beginning to add support for record packing.
  *
- * Revision 1.7  1995/03/15  09:40:15  adam
- * Bug fixes in dummy_database_...
+ * Revision 1.5  1995/03/17  10:44:13  quinn
+ * Added catch of null-string in makediagrec
  *
- * Revision 1.6  1995/03/15  09:08:30  adam
- * Take care of preferredMessageSize.
+ * Revision 1.4  1995/03/17  10:18:08  quinn
+ * Added memory management.
  *
- * Revision 1.5  1995/03/15  08:37:44  quinn
- * Now we're pretty much set for nonblocking I/O.
+ * Revision 1.3  1995/03/16  17:42:39  quinn
+ * Little changes
  *
- * 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.
+ * Revision 1.2  1995/03/16  13:29:01  quinn
+ * Partitioned server.
  *
+ * Revision 1.1  1995/03/15  16:02:10  quinn
+ * Modded session.c to seshigh.c
  *
  */
 
@@ -85,6 +77,8 @@ void destroy_association(association *h)
     odr_destroy(h->decode);
     odr_destroy(h->encode);
     free(h->encode_buffer);
+    if (h->input_buffer)
+    	free(h->input_buffer);
     free(h);
 }
 
@@ -112,7 +106,7 @@ void ir_session(IOCHAN h, int event)
 		assoc->input_apdu_len = res;
 		if (process_apdu(h) < 0)
 		{
-		    fprintf(stderr, "Bad data from peer\n");
+		    fprintf(stderr, "Operation failed\n");
 		    cs_close(conn);
 		    destroy_association(assoc);
 		    iochan_destroy(h);
@@ -170,6 +164,8 @@ static int process_apdu(IOCHAN chan)
 	    fprintf(stderr, "Bad APDU\n");
 	    return -1;
     }
+    odr_reset(assoc->decode); /* release incopming APDU */
+    odr_reset(assoc->encode); /* release stuff alloced before encoding */
     return res;
 }
 
@@ -204,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;
@@ -214,14 +214,15 @@ 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.1 $";
+    resp.implementationVersion = "$Revision: 1.9 $";
     resp.userInformationField = 0;
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
-    	odr_perror(assoc->encode, "Encode init");
+    	odr_perror(assoc->encode, "Encode initres");
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }
@@ -233,16 +234,152 @@ 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;
     dr.diagnosticSetId = bib1;
     dr.condition = &err;
-    dr.addinfo = addinfo;
+    dr.addinfo = addinfo ? addinfo : "";
     return &rec;
 }
 
+static Z_NamePlusRecord *surrogatediagrec(char *dbname, int error,
+					    char *addinfo)
+{
+    static Z_NamePlusRecord rec;
+    static Z_DiagRec dr;
+    static Odr_oid bib1[] = { 1, 2, 3, 4, 5, -1 };
+    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;
+    dr.diagnosticSetId = bib1;
+    dr.condition = &err;
+    dr.addinfo = addinfo ? addinfo : "";
+    return &rec;
+}
+
+#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)
 {
     Z_APDU apdu, *apdup;
@@ -283,86 +420,21 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
 
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
-    	odr_perror(assoc->encode, "Encode init");
+    	odr_perror(assoc->encode, "Encode searchres");
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }
 
-static Z_Records *dummy_database_records (int start, int no_requested, 
-					  int *no_returned, 
-                                          int preferredMessageSize)
-{
-    static Z_Records rec;
-    static int no_records = 0;
-    static Z_NamePlusRecordList z_nprl;
-    int i, size;
-    static Z_NamePlusRecord **records;
-    
-    rec.which = Z_Records_DBOSD;
-    rec.u.databaseOrSurDiagnostics = &z_nprl;
-    if (!no_records)
-    {
-        FILE *inf;
-        char *buf;
-        Odr_external *oep;
-        
-        inf = fopen ("dummy-records", "r");
-        if (!inf)
-            return NULL;
-        records = malloc (sizeof(*records) * 50);
-        assert (records);
-        for (i=0; i<50; i++)
-        {
-            buf = iso2709_read (inf);
-            if (!buf)
-                break;
-            records[i] = malloc (sizeof(**records));
-            assert (records[i]);
-            records[i]->databaseName = NULL;
-            records[i]->which = Z_NamePlusRecord_databaseRecord;
-            oep = records[i]->u.databaseRecord = 
-                malloc (sizeof(*oep));
-            assert (oep);
-            oep->direct_reference = NULL;
-            oep->indirect_reference = NULL;
-            oep->descriptor = NULL;
-            oep->which = ODR_EXTERNAL_octet;
-            oep->u.octet_aligned = malloc (sizeof(*oep->u.octet_aligned));
-            assert (oep->u.octet_aligned);
-            oep->u.octet_aligned->size = oep->u.octet_aligned->len
-                = strlen(buf);
-            oep->u.octet_aligned->buf = buf;
-        }
-        no_records = i;
-        fclose (inf);
-    }
-    if (no_records < start + no_requested)
-        return NULL;
-    
-    z_nprl.records = records + start -1;
-    for (size = 0, i = 0; i<no_requested; i++)
-    {
-        if (z_nprl.records[i]->which == Z_NamePlusRecord_databaseRecord)
-            size += z_nprl.records[i]->u.databaseRecord->u.octet_aligned->size;
-        printf ("size=%d\n", size);
-        if (size > preferredMessageSize)
-            break;
-    }
-    if (i == 0)
-        return NULL;
-    z_nprl.num_records = *no_returned = i;
-    return &rec;
-}
-
 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;
@@ -370,25 +442,22 @@ 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;
-
-#if 0
-    resp.records = diagrec(1, "Waiting for records from Adam.  :)");
-#else
-    if (!(resp.records = dummy_database_records (*req->resultSetStartPoint,
-        *req->numberOfRecordsRequested, &nrr, assoc->preferredMessageSize)))
-        resp.records = diagrec (1, "No records from Adam. Sorry");
-    printf ("nrr=%d\n", nrr);
-#endif
+    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))
     {
-    	odr_perror(assoc->encode, "Encode init");
+    	odr_perror(assoc->encode, "Encode presentres");
 	return -1;
     }
     odr_getbuf(assoc->encode, &assoc->encoded_len);
+    odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
 }