X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=55789598709401e46af00f8b3ab01e94fcf36a91;hb=84e7aa0b86a8a2841f9a379129d0de24d9803463;hp=c73c02cb4926cc512b6671089ad8ea2f7de497d3;hpb=b547f7eb4e4ae29d08a2c0fb7e2108b22ade3dd7;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index c73c02c..5578959 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,5 +1,5 @@
-/* $Id: zserver.c,v 1.105 2003-05-20 12:52:50 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zserver.c,v 1.112 2003-11-09 11:48:16 oleg Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,22 +20,24 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <fcntl.h>
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
+#include <sys/locking.h>
 #else
 #include <unistd.h>
 #endif
 
+#include <errno.h>
 #include <yaz/log.h>
 #include <yaz/ill.h>
 #include <yaz/yaz-util.h>
 
+#include <sys/types.h>
+
 #include "zserver.h"
 
 static int bend_sort (void *handle, bend_sort_rr *rr);
@@ -147,7 +149,7 @@ bend_initresult *bend_init (bend_initrequest *q)
                 if (selected)
                     zebra_record_encoding (zh, right_name);
         	q->charneg_response =
-        	    yaz_set_response_charneg (q->stream, right_name,
+        	    yaz_set_response_charneg (q->stream, charsets[i],
                                               0, selected);
         	break;
             } else {
@@ -262,7 +264,7 @@ int bend_search (void *handle, bend_search_rr *r)
     switch (r->query->which)
     {
     case Z_Query_type_1: case Z_Query_type_101:
-	zebra_search_rpn (zh, r->decode, r->stream, r->query->u.type_1,
+	zebra_search_RPN (zh, r->stream, r->query->u.type_1,
 			  r->setname, &r->hits);
         zebra_result (zh, &r->errcode, &r->errstring);
         if (!r->errcode)
@@ -380,6 +382,7 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
 	break;
     case Z_ESAdminOriginPartToKeep_drop:
 	yaz_log(LOG_LOG, "adm-drop");
+	zebra_drop_database (zh, r->toKeep->databaseName);
 	break;
     case Z_ESAdminOriginPartToKeep_create:
 	yaz_log(LOG_LOG, "adm-create %s", r->toKeep->databaseName);
@@ -641,33 +644,57 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr)
 
 static void bend_start (struct statserv_options_block *sob)
 {
+    if (sob->handle)
+	zebra_stop((ZebraService) sob->handle);
+    sob->handle = zebra_start(sob->configname);
+    if (!sob->handle)
+    {
+	yaz_log (LOG_FATAL, "Failed to read config `%s'", sob->configname);
+	exit (1);
+    }
 #ifdef WIN32
     
 #else
     if (!sob->inetd) 
     {
-        char *pidfile = "zebrasrv.pid";
-        int fd = creat (pidfile, 0666);
+	char pidfname[4096];
+        struct flock area;
+	int fd;
+
+	zebra_pidfname(sob->handle, pidfname);
+
+        fd = open (pidfname, O_EXCL|O_WRONLY|O_CREAT, 0666);
         if (fd == -1)
-            yaz_log (LOG_WARN|LOG_ERRNO, "creat %s", pidfile);
+        {
+            if (errno != EEXIST)
+            {
+                yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfname);
+                exit(1);
+            }
+            fd = open(pidfname, O_RDWR, 0666);
+            if (fd == -1)
+            {
+                yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfname);
+                exit(1);
+            }
+        }
+        area.l_type = F_WRLCK;
+        area.l_whence = SEEK_SET;
+        area.l_len = area.l_start = 0L;
+        if (fcntl (fd, F_SETLK, &area) == -1)
+        {
+            yaz_log(LOG_ERRNO|LOG_FATAL, "Zebra server already running");
+            exit(1);
+        }
         else
         {
 	    char pidstr[30];
 	
 	    sprintf (pidstr, "%ld", (long) getpid ());
 	    write (fd, pidstr, strlen(pidstr));
-	    close (fd);
         }
     }
 #endif
-    if (sob->handle)
-	zebra_stop((ZebraService) sob->handle);
-    sob->handle = zebra_start(sob->configname);
-    if (!sob->handle)
-    {
-	yaz_log (LOG_FATAL, "Failed to read config `%s'", sob->configname);
-	exit (1);
-    }
 }
 
 static void bend_stop(struct statserv_options_block *sob)
@@ -675,8 +702,12 @@ static void bend_stop(struct statserv_options_block *sob)
 #ifdef WIN32
 
 #else
-    if (!sob->inetd) 
-        unlink ("zebrasrv.pid");
+    if (!sob->inetd && sob->handle) 
+    {
+	char pidfname[4096];
+	zebra_pidfname(sob->handle, pidfname);
+        unlink (pidfname);
+    }
 #endif
     if (sob->handle)
     {