X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=a63546a390094a126cef8a832bbce1de602a8245;hb=efcd52e23097c5fa48a5c6eacd3e1f6edc0e8e32;hp=fabd5e4037ea7bacc54e0fe4ca741ab9a49c97c2;hpb=47ea1fc957c7b97bb30a26698f072109cae275e4;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index fabd5e4..a63546a 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,9 +1,26 @@ -/* - * Copyright (C) 1995-2002, Index Data - * All rights reserved. - * - * $Id: zebraapi.c,v 1.63 2002-07-25 13:06:43 adam Exp $ - */ +/* $Id: zebraapi.c,v 1.70 2002-09-06 10:28:02 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include @@ -59,7 +76,7 @@ ZebraHandle zebra_open (ZebraService zs) return 0; zh = (ZebraHandle) xmalloc (sizeof(*zh)); - yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh); + yaz_log (LOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; zh->reg = 0; /* no register attached yet */ @@ -85,18 +102,17 @@ ZebraHandle zebra_open (ZebraService zs) default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1"); zh->record_encoding = xstrdup (default_encoding); -#if HAVE_ICONV_H + zh->iconv_to_utf8 = - iconv_open ("UTF-8", default_encoding); - if (zh->iconv_to_utf8 == (iconv_t)(-1)) + yaz_iconv_open ("UTF-8", default_encoding); + if (zh->iconv_to_utf8 == 0) yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", default_encoding); zh->iconv_from_utf8 = - iconv_open (default_encoding, "UTF-8"); - if (zh->iconv_to_utf8 == (iconv_t)(-1)) + yaz_iconv_open (default_encoding, "UTF-8"); + if (zh->iconv_to_utf8 == 0) yaz_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", default_encoding); -#endif zebra_mutex_cond_lock (&zs->session_lock); @@ -114,13 +130,11 @@ ZebraService zebra_start (const char *configName) yaz_log (LOG_LOG, "zebra_start %s", configName); - if (!(res = res_open (configName, 0))) - yaz_log (LOG_WARN, "Cannot read resources `%s'", configName); - else + if ((res = res_open (configName, 0))) { ZebraService zh = xmalloc (sizeof(*zh)); - yaz_log (LOG_LOG, "Read resources `%s'", configName); + yaz_log (LOG_DEBUG, "Read resources `%s'", configName); zh->global_res = res; zh->configName = xstrdup(configName); @@ -165,10 +179,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, assert (res); - yaz_log (LOG_LOG, "zebra_register_open rw = %d useshadow=%d p=%p", + yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p", rw, useshadow, reg); - reg->dh = data1_create (); + reg->dh = data1_createx (DATA1_FLAG_XML); if (!reg->dh) return 0; reg->bfs = bfs_create (res_get (res, "register"), reg_path); @@ -313,7 +327,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } reg->active = 2; - yaz_log (LOG_LOG, "zebra_register_open ok p=%p", reg); + yaz_log (LOG_DEBUG, "zebra_register_open ok p=%p", reg); return reg; } @@ -334,7 +348,7 @@ void zebra_admin_start (ZebraHandle zh) static void zebra_register_close (ZebraService zs, struct zebra_register *reg) { - yaz_log(LOG_LOG, "zebra_register_close p=%p", reg); + yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg); reg->stop_flag = 0; zebra_chdir (zs); if (reg->records) @@ -366,7 +380,7 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) xfree (reg->key_buf); xfree (reg->name); xfree (reg); - yaz_log (LOG_LOG, "zebra_register_close 2"); + yaz_log(LOG_DEBUG, "zebra_register_close 2"); } void zebra_stop(ZebraService zs) @@ -403,7 +417,7 @@ void zebra_close (ZebraHandle zh) return; zs = zh->service; - yaz_log (LOG_LOG, "zebra_close zh=%p", zh); + yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh); if (!zh) return ; resultSetDestroy (zh, -1, 0, 0); @@ -414,12 +428,11 @@ void zebra_close (ZebraHandle zh) zebra_close_res (zh); xfree (zh->record_encoding); -#if HAVE_ICONV_H - if (zh->iconv_to_utf8 != (iconv_t) (-1)) - iconv_close (zh->iconv_to_utf8); - if (zh->iconv_from_utf8 != (iconv_t) (-1)) - iconv_close (zh->iconv_from_utf8); -#endif + + if (zh->iconv_to_utf8 != 0) + yaz_iconv_close (zh->iconv_to_utf8); + if (zh->iconv_from_utf8 != 0) + yaz_iconv_close (zh->iconv_from_utf8); xfree (zh->admin_databaseName); zebra_mutex_cond_lock (&zs->session_lock); @@ -677,6 +690,11 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, zh->errCode = 109; return -1; } + if (!zh->lock_normal || !zh->lock_shadow) + { + zh->errCode = 2; + return -1; + } return 0; } @@ -941,7 +959,7 @@ void zebra_set_state (ZebraHandle zh, int val, int seqno) fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname); f = fopen (fname, "w"); - yaz_log (LOG_LOG, "%c %d %ld", val, seqno, p); + yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p); fprintf (f, "%c %d %ld\n", val, seqno, p); fclose (f); xfree (fname); @@ -991,6 +1009,12 @@ int zebra_begin_read (ZebraHandle zh) zh->errCode = 109; return -1; } + if (!zh->lock_normal || !zh->lock_shadow) + { + (zh->trans_no)--; + zh->errCode = 2; + return -1; + } zebra_get_state (zh, &val, &seqno); if (val == 'd') val = 'o';