-/* $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.115 2004-05-05 16:22:18 mike Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
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"
static int bend_sort (void *handle, bend_sort_rr *rr);
r->errcode = 1;
return r;
}
+ r->handle = zh;
if (q->auth)
{
if (q->auth->which == Z_IdAuthentication_open)
}
xfree (openpass);
}
+ else if (q->auth->which == Z_IdAuthentication_idPass)
+ {
+ Z_IdPass *idPass = q->auth->u.idPass;
+
+ user = idPass->userId;
+ passwd = idPass->password;
+ }
}
if (zebra_auth (zh, user, passwd))
{
r->errcode = 222;
r->errstring = user;
- zebra_close (zh);
return r;
}
- r->handle = zh;
if (q->charneg_request) /* characater set and langauge negotiation? */
{
char **charsets = 0;
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 {
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)
zebra_result (zh, &r->errcode, &r->errstring);
return 0;
}
+ if (r->step_size != 0 && *r->step_size != 0) {
+ r->errcode = 205; /* "Only zero step size supported for Scan" */
+ r->errstring = 0;
+ return 0;
+ }
r->entries = (struct scan_entry *)
odr_malloc (r->stream, sizeof(*r->entries) * r->num_entries);
zebra_scan (zh, r->stream, r->term,
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);
{
Z_External *rec = notToKeep->elements[i]->record;
struct oident *oident = 0;
- Odr_oct *recid = notToKeep->elements[i]->u.opaque;
+ Odr_oct *opaque_recid = 0;
+ int sysno = 0;
- if (!recid)
- {
- rr->errcode = 224;
- rr->errstring = "record Id not supplied";
- break;
- }
- if (notToKeep->elements[i]->which !=
- Z_IUSuppliedRecords_elem_opaque)
- {
- rr->errcode = 224;
- rr->errstring = "only opaque record ID supported";
- break;
+ if (notToKeep->elements[i]->u.opaque)
+ {
+ switch(notToKeep->elements[i]->which)
+ {
+ case Z_IUSuppliedRecords_elem_opaque:
+ opaque_recid = notToKeep->elements[i]->u.opaque;
+ break; /* OK, recid already set */
+ case Z_IUSuppliedRecords_elem_number:
+ sysno = *notToKeep->elements[i]->u.number;
+ break;
+ }
}
-
if (rec->direct_reference)
{
oident = oid_getentbyoid(rec->direct_reference);
action = 3;
if (*toKeep->action ==
Z_IUOriginPartToKeep_specialUpdate)
- action = 1;
+ action = 4;
if (!action)
{
rr->errstring = "unsupported ES Update action";
break;
}
- else
- {
+ else if (opaque_recid)
+ {
int r = zebra_admin_exchange_record (
- zh, toKeep->databaseName,
+ zh,
rec->u.octet_aligned->buf,
rec->u.octet_aligned->len,
- recid->buf, recid->len,
+ opaque_recid->buf, opaque_recid->len,
action);
- if (r && *toKeep->action ==
- Z_IUOriginPartToKeep_specialUpdate)
- {
- r = zebra_admin_exchange_record (
- zh, toKeep->databaseName,
- rec->u.octet_aligned->buf,
- rec->u.octet_aligned->len,
- recid->buf, recid->len,
- 2);
- }
if (r)
{
rr->errcode = 224;
rr->errstring = "record exchange failed";
break;
}
- }
+ }
+ else
+ {
+ int r = -1;
+ switch(action) {
+ case 1:
+ r = zebra_insert_record(
+ zh,
+ 0, /* recordType */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ rec->u.octet_aligned->buf,
+ rec->u.octet_aligned->len);
+ if (r)
+ {
+ rr->errcode = 224;
+ rr->errstring = "insert_record failed";
+ }
+ break;
+ case 2:
+ case 4:
+ r = zebra_update_record(
+ zh,
+ 0, /* recordType */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ rec->u.octet_aligned->buf,
+ rec->u.octet_aligned->len,
+ 1);
+ if (r)
+ {
+ rr->errcode = 224;
+ rr->errstring = "update_record failed";
+ }
+ break;
+ case 3:
+ r = zebra_delete_record(
+ zh,
+ 0, /* recordType */
+ &sysno,
+ 0, /* match */
+ 0, /* fname */
+ rec->u.octet_aligned->buf,
+ rec->u.octet_aligned->len,
+ 0);
+ if (r)
+ {
+ rr->errcode = 224;
+ rr->errstring = "delete_record failed";
+ }
+ break;
+ }
+ }
}
}
zebra_end_trans (zh);
static void bend_start (struct statserv_options_block *sob)
{
+ if (sob->handle)
+ zebra_stop((ZebraService) sob->handle);
+ sob->handle = zebra_start(sob->configname, 0, 0);
+ 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)
#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)
{