X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=542143254c32ff109e3940470242fc60111365b8;hb=d4727a15cd43e69241152bcdec5c8ad97c6c8695;hp=ced78e1a5000e4ccac3898854ab5ad6dc77dff5a;hpb=3060b77b776350c6e677c06b3070542dba5c42b6;p=yaz-moved-to-github.git

diff --git a/server/seshigh.c b/server/seshigh.c
index ced78e1..5421432 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.77  1998-07-20 12:38:42  adam
+ * Revision 1.80  1998-09-02 12:41:53  adam
+ * Added decode stream in bend search structures.
+ *
+ * Revision 1.79  1998/08/19 16:10:08  adam
+ * Changed som member names of DeleteResultSetRequest/Response.
+ *
+ * Revision 1.78  1998/08/03 10:23:55  adam
+ * Fixed bug regarding Options for Sort.
+ *
+ * Revision 1.77  1998/07/20 12:38:42  adam
  * Implemented delete result set service to server API.
  *
  * Revision 1.76  1998/05/27 16:57:07  adam
@@ -814,7 +823,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     	ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
 	strcat(options, " concurop");
     }
-    if (ODR_MASK_GET(req->options, Z_Options_sort && binitreq.bend_sort))
+    if (ODR_MASK_GET(req->options, Z_Options_sort) && binitreq.bend_sort)
     {
 	ODR_MASK_SET(resp->options, Z_Options_sort);
 	strcat(options, " sort");
@@ -1183,6 +1192,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
 	bsrr->basenames = req->databaseNames;
 	bsrr->query = req->query;
 	bsrr->stream = assoc->encode;
+	bsrr->decode = assoc->decode;
 	bsrr->errcode = 0;
 	bsrr->hits = 0;
 	bsrr->errstring = NULL;
@@ -1201,6 +1211,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb,
 	bsrq.basenames = req->databaseNames;
 	bsrq.query = req->query;
 	bsrq.stream = assoc->encode;
+	bsrq.decode = assoc->decode;
 	if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
 	    return 0;
 	bsrr->hits = bsrt->hits;
@@ -1602,7 +1613,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
 
     logf(LOG_LOG, "Got DeleteRequest.");
 
-    bdrr->num_setnames = req->num_ids;
+    bdrr->num_setnames = req->num_resultSetList;
     bdrr->setnames = req->resultSetList;
     bdrr->stream = assoc->encode;
     bdrr->function = *req->deleteFunction;
@@ -1616,10 +1627,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
 	odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus));
     *res->deleteOperationStatus = bdrr->delete_status;
 
-    res->num_statuses = 0;
     res->deleteListStatuses = 0;
     res->numberNotDeleted = 0;
-    res->num_bulkStatuses = 0;
     res->bulkStatuses = 0;
     res->deleteMessage = 0;
     res->otherInfo = 0;