Uses preprocessor define WIN32 instead of WINDOWS to build code

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 7683043..8a65140 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.84  1998-11-16 16:02:32  adam
+ * Revision 1.86  1999-02-02 13:57:38  adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.85  1998/11/17 09:52:59  adam
+ * Fixed minor bug (introduced by previous commit).
+ *
+ * Revision 1.84  1998/11/16 16:02:32  adam
  * Added loggin utilies, log_rpn_query and log_scan_term. These used
  * to be part of Zebra.
  *
@@ -295,7 +302,7 @@
 #include <yconfig.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <process.h>
 #else
 #include <unistd.h>
@@ -1497,7 +1504,6 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
            for (i = 0; i < req->num_databaseNames; i++)
                logf (LOG_LOG, "Database '%s'", req->databaseNames[i]);
        }
-       log_scan_term (req->termListAndStartPoint, attset->value);
        srq.num_bases = req->num_databaseNames;
        srq.basenames = req->databaseNames;
        srq.num_entries = *req->numberOfTermsRequested;
@@ -1508,6 +1514,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
            srq.attributeset = VAL_NONE;
        else
            srq.attributeset = attset->value;
+       log_scan_term (req->termListAndStartPoint, attset->value);
        srq.term_position = req->preferredPositionInResponse ?
            *req->preferredPositionInResponse : 1;
        if (!(srs = bend_scan(assoc->backend, &srq, 0)))