From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 3 Aug 1998 10:23:55 +0000 (+0000)
Subject: Fixed bug regarding Options for Sort.
X-Git-Tag: YAZ.1.8~458
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=adfa93d3033913d04c134941f7035f00fd2f080b;p=yaz-moved-to-github.git

Fixed bug regarding Options for Sort.
---

diff --git a/server/seshigh.c b/server/seshigh.c
index ced78e1..3233f05 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.77  1998-07-20 12:38:42  adam
+ * 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 +817,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");
diff --git a/server/session.h b/server/session.h
index 79f5604..7c13234 100644
--- a/server/session.h
+++ b/server/session.h
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: session.h,v $
- * Revision 1.17  1998-07-20 12:38:43  adam
+ * Revision 1.18  1998-08-03 10:23:57  adam
+ * Fixed bug regarding Options for Sort.
+ *
+ * Revision 1.17  1998/07/20 12:38:43  adam
  * Implemented delete result set service to server API.
  *
  * Revision 1.16  1998/03/31 11:07:45  adam
@@ -109,9 +112,9 @@ typedef struct request_q
  */
 typedef enum
 {
-   	ASSOC_NEW,                /* not initialized yet */
-	ASSOC_UP,                 /* normal operation */
-	ASSOC_DEAD                /* dead. Close if input arrives */
+    ASSOC_NEW,                /* not initialized yet */
+    ASSOC_UP,                 /* normal operation */
+    ASSOC_DEAD                /* dead. Close if input arrives */
 } association_state;
 
 typedef struct association