X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=92ff44a6362edf487bb117168063d3ab18b85779;hb=a6eef2e7073a7295d1a7bf09f538946135a5ebbb;hp=04157d24fe7e51ee3cd84baf4df8e2042b4b4aa6;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index 04157d2..92ff44a 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.99  1999-11-30 13:47:12  adam
+ * Revision 1.103  2000-03-20 19:06:25  adam
+ * Added Segment request for fronend server. Work on admin for client.
+ *
+ * Revision 1.102  2000/03/15 12:59:49  adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.101  2000/01/12 14:36:07  adam
+ * Added printing stream (ODR) for backend functions.
+ *
+ * Revision 1.100  1999/12/16 23:36:19  adam
+ * Implemented ILL protocol. Minor updates ASN.1 compiler.
+ *
+ * Revision 1.99  1999/11/30 13:47:12  adam
  * Improved installation. Moved header files to include/yaz.
  *
  * Revision 1.98  1999/11/29 15:12:27  adam
@@ -376,6 +387,7 @@ static void process_close(association *assoc, request *reqb);
 void save_referenceId (request *reqb, Z_ReferenceId *refid);
 static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
     int *fd);
+static Z_APDU *process_segmentRequest (association *assoc, request *reqb);
 static int bend_default_scan (void *handle, bend_scan_rr *rr);
 
 static FILE *apduf = 0; /* for use in static mode */
@@ -647,59 +659,70 @@ static int process_request(association *assoc, request *req, char **msg)
     int fd = -1;
     Z_APDU *res;
     int retval;
-
+    
     *msg = "Unknown Error";
     assert(req && req->state == REQUEST_IDLE);
     switch (req->request->which)
     {
-    	case Z_APDU_initRequest:
-	    res = process_initRequest(assoc, req); break;
-	case Z_APDU_searchRequest:
-	    res = process_searchRequest(assoc, req, &fd); break;
-	case Z_APDU_presentRequest:
-	    res = process_presentRequest(assoc, req, &fd); break;
-	case Z_APDU_scanRequest:
-	    if (assoc->bend_scan)
-		res = process_scanRequest(assoc, req, &fd);
-	    else
-	    {
-		*msg = "Cannot handle Scan APDU";
-		return -1;
-	    }
-	    break;
-        case Z_APDU_extendedServicesRequest:
-	    if (assoc->bend_esrequest)
-		res = process_ESRequest(assoc, req, &fd);
-	    else
-	    {
-		*msg = "Cannot handle Extended Services APDU";
-		return -1;
-	    }
-	    break;
-        case Z_APDU_sortRequest:
-	    if (assoc->bend_sort)
-		res = process_sortRequest(assoc, req, &fd);
-	    else
-	    {
-		*msg = "Cannot handle Sort APDU";
-		return -1;
-	    }
-	    break;
-	case Z_APDU_close:
-	    process_close(assoc, req);
-	    return 0;
-        case Z_APDU_deleteResultSetRequest:
-	    if (assoc->bend_delete)
-		res = process_deleteRequest(assoc, req, &fd);
-	    else
-	    {
-		*msg = "Cannot handle Delete APDU";
-		return -1;
-	    }
-	    break;
-	default:
-	    *msg = "Bad APDU received";
+    case Z_APDU_initRequest:
+	res = process_initRequest(assoc, req); break;
+    case Z_APDU_searchRequest:
+	res = process_searchRequest(assoc, req, &fd); break;
+    case Z_APDU_presentRequest:
+	res = process_presentRequest(assoc, req, &fd); break;
+    case Z_APDU_scanRequest:
+	if (assoc->bend_scan)
+	    res = process_scanRequest(assoc, req, &fd);
+	else
+	{
+	    *msg = "Cannot handle Scan APDU";
 	    return -1;
+	}
+	break;
+    case Z_APDU_extendedServicesRequest:
+	if (assoc->bend_esrequest)
+	    res = process_ESRequest(assoc, req, &fd);
+	else
+	{
+	    *msg = "Cannot handle Extended Services APDU";
+	    return -1;
+	}
+	break;
+    case Z_APDU_sortRequest:
+	if (assoc->bend_sort)
+	    res = process_sortRequest(assoc, req, &fd);
+	else
+	{
+	    *msg = "Cannot handle Sort APDU";
+	    return -1;
+	}
+	break;
+    case Z_APDU_close:
+	process_close(assoc, req);
+	return 0;
+    case Z_APDU_deleteResultSetRequest:
+	if (assoc->bend_delete)
+	    res = process_deleteRequest(assoc, req, &fd);
+	else
+	{
+	    *msg = "Cannot handle Delete APDU";
+	    return -1;
+	}
+	break;
+    case Z_APDU_segmentRequest:
+	if (assoc->bend_segment)
+	{
+	    res = process_segmentRequest (assoc, req);
+	}
+	else
+	{
+	    *msg = "Cannot handle Segment APDU";
+	    return -1;
+	}
+	break;
+    default:
+	*msg = "Bad APDU received";
+	return -1;
     }
     if (res)
     {
@@ -831,7 +854,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     	yaz_log(LOG_LOG, "Version:   %s", req->implementationVersion);
 
     binitreq.stream = assoc->encode;
-    binitreq.configname = "default-config";
+    binitreq.print = assoc->print;
     binitreq.auth = req->idAuthentication;
     binitreq.referenceId = req->referenceId;
     binitreq.implementation_version = 0;
@@ -842,6 +865,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     binitreq.bend_esrequest = NULL;
     binitreq.bend_delete = NULL;
     binitreq.bend_scan = bend_default_scan;
+    binitreq.bend_segment = NULL;
     if (!(binitres = bend_init(&binitreq)))
     {
     	yaz_log(LOG_WARN, "Bad response from backend.");
@@ -861,6 +885,8 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
 	yaz_log (LOG_DEBUG, "Delete handler installed");   
     if ((assoc->bend_scan = (int (*)())binitreq.bend_scan))
 	yaz_log (LOG_DEBUG, "Scan handler installed");   
+    if ((assoc->bend_segment = (int (*)())binitreq.bend_segment))
+	yaz_log (LOG_DEBUG, "Segment handler installed");   
     
     resp->referenceId = req->referenceId;
     *options = '\0';
@@ -1132,6 +1158,7 @@ static Z_Records *pack_records(association *a, char *setname, int start,
 	freq.comp = comp;
 	freq.format = format;
 	freq.stream = a->encode;
+	freq.print = a->print;
 	freq.surrogate_flag = 0;
 	freq.referenceId = referenceId;
 	if (!(fres = bend_fetch(a->backend, &freq, 0)))
@@ -1252,6 +1279,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
 	bsrr->query = req->query;
 	bsrr->stream = assoc->encode;
 	bsrr->decode = assoc->decode;
+	bsrr->print = assoc->print;
 	bsrr->errcode = 0;
 	bsrr->hits = 0;
 	bsrr->errstring = NULL;
@@ -1273,6 +1301,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
         bsrq.referenceId = req->referenceId;
 	bsrq.stream = assoc->encode;
 	bsrq.decode = assoc->decode;
+	bsrq.print = assoc->print;
 	if (!(bsrt = bend_search (assoc->backend, &bsrq, fd)))
 	    return 0;
 	bsrr->hits = bsrt->hits;
@@ -1438,6 +1467,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb,
 	bprr->comp = req->recordComposition;
 	bprr->referenceId = req->referenceId;
 	bprr->stream = assoc->encode;
+	bprr->print = assoc->print;
 	bprr->request = reqb;
 	bprr->association = assoc;
 	bprr->errcode = 0;
@@ -1488,6 +1518,7 @@ static int bend_default_scan (void *handle, bend_scan_rr *rr)
     srq.term_position = rr->term_position;
     srq.num_entries = rr->num_entries;
     srq.stream = rr->stream;
+    srq.print = rr->print;
     
     srs = bend_scan(handle, &srq, 0);
 
@@ -1561,6 +1592,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
 	bsrr->term = req->termListAndStartPoint;
 	bsrr->referenceId = req->referenceId;
 	bsrr->stream = assoc->encode;
+	bsrr->print = assoc->print;
 	if (!(attset = oid_getentbyoid(req->attributeSet)) ||
 	    attset->oclass != CLASS_RECSYN)
 	    bsrr->attributeset = VAL_NONE;
@@ -1662,6 +1694,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb,
     bsrr->output_setname = req->sortedResultSetName;
     bsrr->sort_sequence = req->sortSequence;
     bsrr->stream = assoc->encode;
+    bsrr->print = assoc->print;
 
     bsrr->sort_status = Z_SortStatus_failure;
     bsrr->errcode = 0;
@@ -1714,6 +1747,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
     bdrr->num_setnames = req->num_resultSetList;
     bdrr->setnames = req->resultSetList;
     bdrr->stream = assoc->encode;
+    bdrr->print = assoc->print;
     bdrr->function = *req->deleteFunction;
     bdrr->referenceId = req->referenceId;
     bdrr->statuses = 0;
@@ -1858,6 +1892,22 @@ void *bend_request_getdata(bend_request r)
     return r->clientData;
 }
 
+static Z_APDU *process_segmentRequest (association *assoc, request *reqb)
+{
+    bend_segment_rr request;
+
+    request.segment = reqb->request->u.segmentRequest;
+    request.stream = assoc->encode;
+    request.decode = assoc->decode;
+    request.print = assoc->print;
+    request.association = assoc;
+    
+    ((int (*)(void *, bend_segment_rr *))(*assoc->bend_segment))
+	(assoc->backend, &request);
+
+    return 0;
+}
+
 static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
 {
     bend_esrequest_rr esrequest;
@@ -1871,6 +1921,8 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd)
 
     esrequest.esr = reqb->request->u.extendedServicesRequest;
     esrequest.stream = assoc->encode;
+    esrequest.decode = assoc->decode;
+    esrequest.print = assoc->print;
     esrequest.errcode = 0;
     esrequest.errstring = NULL;
     esrequest.request = reqb;