X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=index%2Fzserver.c;h=ca01ed7c66ecdb05af5b91506225d3960f70a727;hb=4a3a97df9d47b8d099e403308f8015f130366994;hp=f187c17d8d511bb7c2e8971b172b19a7f1693f7a;hpb=b6830e77ae855c0be7fcf4352a5d88477f4c83b0;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index f187c17..ca01ed7 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,5 +1,5 @@ -/* $Id: zserver.c,v 1.109 2003-07-02 22:00:06 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 +/* $Id: zserver.c,v 1.116 2004-07-28 08:15:45 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -79,6 +79,7 @@ bend_initresult *bend_init (bend_initrequest *q) r->errcode = 1; return r; } + r->handle = zh; if (q->auth) { if (q->auth->which == Z_IdAuthentication_open) @@ -93,15 +94,20 @@ bend_initresult *bend_init (bend_initrequest *q) } 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; @@ -149,7 +155,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 { @@ -323,6 +329,11 @@ static int bend_scan (void *handle, bend_scan_rr *r) 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, @@ -527,22 +538,21 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { 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); @@ -593,7 +603,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) action = 3; if (*toKeep->action == Z_IUOriginPartToKeep_specialUpdate) - action = 1; + action = 4; if (!action) { @@ -601,31 +611,76 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) 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, + 0); + 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); @@ -657,20 +712,24 @@ static void bend_start (struct statserv_options_block *sob) #else if (!sob->inetd) { + char pidfname[4096]; struct flock area; - char *pidfile = "zebrasrv.pid"; - int fd = open (pidfile, O_EXCL|O_WRONLY|O_CREAT, 0666); + int fd; + + zebra_pidfname(sob->handle, pidfname); + + fd = open (pidfname, O_EXCL|O_WRONLY|O_CREAT, 0666); if (fd == -1) { if (errno != EEXIST) { - yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfile); + yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfname); exit(1); } - fd = open(pidfile, O_RDWR, 0666); + fd = open(pidfname, O_RDWR, 0666); if (fd == -1) { - yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfile); + yaz_log(LOG_FATAL|LOG_ERRNO, "lock file %s", pidfname); exit(1); } } @@ -698,8 +757,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) {