Implemented ILL protocol. Minor updates ASN.1 compiler.

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 2e32af2..eb26f03 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.95  1999-10-11 10:01:24  adam
+ * 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
+ * Changed the way implementationName - and version is set.
+ *
+ * Revision 1.96  1999/11/04 14:58:44  adam
+ * Added status elements for backend delete result set handler.
+ * Updated delete result result set command for client.
+ *
+ * Revision 1.95  1999/10/11 10:01:24  adam
  * Implemented bend_sort_rr handler for frontend server.
  *
  * Revision 1.94  1999/08/27 09:40:32  adam
@@ -328,7 +341,6 @@
  *
  */
 
-#include <yconfig.h>
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef WIN32
@@ -338,17 +350,18 @@
 #endif
 #include <assert.h>
 
-#include <xmalloc.h>
-#include <comstack.h>
+#include <yaz/yconfig.h>
+#include <yaz/xmalloc.h>
+#include <yaz/comstack.h>
 #include "eventl.h"
 #include "session.h"
-#include <proto.h>
-#include <oid.h>
-#include <log.h>
-#include <logrpn.h>
-#include <statserv.h>
+#include <yaz/proto.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/logrpn.h>
+#include <yaz/statserv.h>
 
-#include <backend.h>
+#include <yaz/backend.h>
 
 static int process_request(association *assoc, request *req, char **msg);
 void backend_response(IOCHAN i, int event);
@@ -921,15 +934,15 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     resp->preferredMessageSize = &assoc->preferredMessageSize;
     resp->maximumRecordSize = &assoc->maximumRecordSize;
 
-    resp->implementationName = "Index Data/YAZ Generic Frontend Server";
+    resp->implementationName = "GFS";
 
     if (binitreq.implementation_name)
     {
        char *nv = (char *)
            odr_malloc (assoc->encode,
-                       strlen(binitreq.implementation_name) + 3 + 
+                       strlen(binitreq.implementation_name) + 10 + 
                               strlen(resp->implementationName));
-       sprintf (nv, "%s %s",
+       sprintf (nv, "%s / %s",
                 resp->implementationName, binitreq.implementation_name);
         resp->implementationName = nv;
     }
@@ -937,9 +950,9 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     {
        char *nv = (char *)
            odr_malloc (assoc->encode,
-                       strlen(binitreq.implementation_version) + 3 + 
+                       strlen(binitreq.implementation_version) + 10 + 
                               strlen(resp->implementationVersion));
-       sprintf (nv, "%s %s",
+       sprintf (nv, "YAZ %s / %s",
                 resp->implementationVersion, binitreq.implementation_version);
         resp->implementationVersion = nv;
     }
@@ -1706,7 +1719,15 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
     bdrr->stream = assoc->encode;
     bdrr->function = *req->deleteFunction;
     bdrr->referenceId = req->referenceId;
-
+    bdrr->statuses = 0;
+    if (bdrr->num_setnames > 0)
+    {
+       int i;
+       bdrr->statuses = odr_malloc(assoc->encode, sizeof(*bdrr->statuses) *
+                                   bdrr->num_setnames);
+       for (i = 0; i < bdrr->num_setnames; i++)
+           bdrr->statuses[i] = 0;
+    }
     ((int (*)(void *, bend_delete_rr *))
      (*assoc->bend_delete))(assoc->backend, bdrr);
     
@@ -1717,6 +1738,27 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
     *res->deleteOperationStatus = bdrr->delete_status;
 
     res->deleteListStatuses = 0;
+    if (bdrr->num_setnames > 0)
+    {
+       int i;
+       res->deleteListStatuses = odr_malloc(assoc->encode,
+                                            sizeof(*res->deleteListStatuses));
+       res->deleteListStatuses->num = bdrr->num_setnames;
+       res->deleteListStatuses->elements =
+           odr_malloc (assoc->encode,
+                       sizeof(*res->deleteListStatuses->elements) *
+                       bdrr->num_setnames);
+       for (i = 0; i<bdrr->num_setnames; i++)
+       {
+           res->deleteListStatuses->elements[i] =
+               odr_malloc (assoc->encode,
+                           sizeof(**res->deleteListStatuses->elements));
+           res->deleteListStatuses->elements[i]->status = bdrr->statuses+i;
+           res->deleteListStatuses->elements[i]->id =
+               odr_strdup (assoc->encode, bdrr->setnames[i]);
+           
+       }
+    }
     res->numberNotDeleted = 0;
     res->bulkStatuses = 0;
     res->deleteMessage = 0;
@@ -1832,6 +1874,7 @@ 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.errcode = 0;
     esrequest.errstring = NULL;
     esrequest.request = reqb;