-/* $Id: zserver.c,v 1.101 2003-01-13 10:56:09 oleg 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.
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"
q->implementation_name = "Zebra Information Server";
q->implementation_version = "Zebra " ZEBRAVER;
- logf (LOG_DEBUG, "bend_init");
+ yaz_log (LOG_DEBUG, "bend_init");
sob = statserv_getcontrol ();
if (!(zh = zebra_open (sob->handle)))
int num_langs = 0;
int selected = 0;
int i;
- char *right_name;
+ NMEM nmem = nmem_create();
- NMEM nmem = nmem_create ();
yaz_log (LOG_LOG, "character set and language negotiation");
yaz_get_proposal_charneg (nmem, q->charneg_request,
&charsets, &num_charsets,
&langs, &num_langs, &selected);
-
- right_name = (char *)nmem_malloc(nmem, 32);
-
+
for (i = 0; i < num_charsets; i++)
{
- *right_name = '\0';
-
+ const char *right_name = "";
/*
* FIXME! It is like rudiment :-))
* We have to support this short names of character sets,
* because a lot servers in Russia to use own in during
* character set and language negotiation still.
*/
-
+
if (!yaz_matchstr(charsets[i], "win")) {
- strcpy(right_name, "WINDOWS-1251");
- } else if (!yaz_matchstr(charsets[i], "koi")) {
- strcpy(right_name, "KOI8-R");
+ right_name = "WINDOWS-1251";
+ } else if (!yaz_matchstr(charsets[i], "koi")) {
+ right_name = "KOI8-R";
} else if (!yaz_matchstr(charsets[i], "iso")) {
- strcpy(right_name, "ISO-8859-5");
+ right_name = "ISO-8859-5";
} else if (!yaz_matchstr(charsets[i], "dos")) {
- strcpy(right_name, "CP866");
- } else if (!yaz_matchstr(charsets[i], "uni")) {
- strcpy(right_name, "UTF-8");
- } else {
- strcpy(right_name, charsets[i]);
- }
-
- logf (LOG_LOG, "charset %d %s (right name is %s)", i,
- charsets[i], right_name);
-
- if (odr_set_charset (q->decode, "UTF-8", right_name) == 0)
- {
- odr_set_charset (q->stream, right_name, "UTF-8");
- if (selected)
- zebra_record_encoding (zh, right_name);
+ right_name = "CP866";
+ } else if (!yaz_matchstr(charsets[i], "uni")) {
+ right_name = "UTF-8";
+ } else {
+ right_name = charsets[i];
+ }
+ if (odr_set_charset (q->decode, "UTF-8", right_name) == 0)
+ {
+ yaz_log (LOG_LOG, "charset %d %s (proper name %s): OK", i,
+ charsets[i], right_name);
+ odr_set_charset (q->stream, right_name, "UTF-8");
+ 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 {
- yaz_log(LOG_LOG, "odr_set_charset(): charset name %s unsupported",
- right_name);
+ yaz_log (LOG_LOG, "charset %d %s (proper name %s): unsupported", i,
+ charsets[i], right_name);
}
}
- nmem_destroy (nmem);
+ nmem_destroy(nmem);
}
return r;
}
zebra_result (zh, &r->errcode, &r->errstring);
return 0;
}
- logf (LOG_LOG, "ResultSet '%s'", r->setname);
+ yaz_log (LOG_LOG, "ResultSet '%s'", r->setname);
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)
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);
- zebra_admin_create (zh, r->toKeep->databaseName);
+ zebra_create_database (zh, r->toKeep->databaseName);
break;
case Z_ESAdminOriginPartToKeep_import:
yaz_log(LOG_LOG, "adm-import");
if (notToKeep)
{
int i;
- zebra_begin_trans (zh);
+ zebra_begin_trans (zh, 1);
for (i = 0; i < notToKeep->num; i++)
{
Z_External *rec = notToKeep->elements[i]->record;
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)
- logf (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)
#ifdef WIN32
#else
- /*
- * Fixme! Why commets?, because the first chaild process to invoke bend_stop().
- *
-
- 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)
{
projects / idzebra-moved-to-github.git / blobdiff