X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=dc0913fd30c32bb9b0731b947f6199c4a2da2c1c;hp=7d1eac2d119a7eab293b3d2ea2a99111f3637f83;hb=7d4f4b37e1fb629e3fb04362394973c8aa01ef6c;hpb=7d9280e88954e1abd67db88bfed1096ce30814d1 diff --git a/index/zebraapi.c b/index/zebraapi.c index 7d1eac2..dc0913f 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.55 2002-04-15 13:48:11 adam Exp $ - */ +/* $Id: zebraapi.c,v 1.67 2002-08-18 10:20:35 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 @@ -37,7 +54,7 @@ static void zebra_chdir (ZebraService zh) static void zebra_flush_reg (ZebraHandle zh) { - zebraExplain_flush (zh->reg->zei, 1, zh); + zebraExplain_flush (zh->reg->zei, zh); extract_flushWriteKeys (zh); zebra_index_merge (zh); @@ -50,18 +67,16 @@ static struct zebra_register *zebra_register_open (ZebraService zs, const char *reg_path); static void zebra_register_close (ZebraService zs, struct zebra_register *reg); -static int zebra_begin_read (ZebraHandle zh); -static void zebra_end_read (ZebraHandle zh); - ZebraHandle zebra_open (ZebraService zs) { ZebraHandle zh; + const char *default_encoding; if (!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,6 +100,21 @@ ZebraHandle zebra_open (ZebraService zs) zh->shadow_enable = 1; + 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_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_log (LOG_WARN, "iconv: UTF-8 to %s unsupported", + default_encoding); +#endif + zebra_mutex_cond_lock (&zs->session_lock); zh->next = zs->sessions; @@ -107,7 +137,7 @@ ZebraService zebra_start (const char *configName) { 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); @@ -152,10 +182,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); @@ -187,6 +217,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->isam = 0; reg->isamc = 0; reg->isamd = 0; + reg->isamb = 0; reg->zei = 0; reg->matchDict = 0; @@ -227,7 +258,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } - else if (res_get_match (res, "isam", "i", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "i", ISAM_DEFAULT)) { if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw, sizeof (struct it_key), res))) @@ -236,7 +267,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } - else if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC, @@ -246,7 +277,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } - else if (res_get_match (res, "isam", "d", ISAM_DEFAULT)) + if (res_get_match (res, "isam", "d", ISAM_DEFAULT)) { struct ISAMD_M_s isamd_m; @@ -257,6 +288,39 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } + if (res_get_match (res, "isam", "b", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 0))) + { + logf (LOG_WARN, "isamb_open"); + return 0; + } + } + if (res_get_match (res, "isam", "bc", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), 1))) + { + logf (LOG_WARN, "isamb_open"); + return 0; + } + } + if (res_get_match (res, "isam", "null", ISAM_DEFAULT)) + { + struct ISAMC_M_s isamc_m; + + if (!(reg->isamb = isamb_open (reg->bfs, "isamb", + rw, key_isamc_m(res, &isamc_m), -1))) + { + logf (LOG_WARN, "isamb_open"); + return 0; + } + } reg->zei = zebraExplain_open (reg->records, reg->dh, res, rw, reg, explain_extract); @@ -266,7 +330,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; } @@ -287,12 +351,12 @@ 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) { - zebraExplain_close (reg->zei, 0); + zebraExplain_close (reg->zei); dict_close (reg->dict); if (reg->matchDict) dict_close (reg->matchDict); @@ -305,6 +369,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) isc_close (reg->isamc); if (reg->isamd) isamd_close (reg->isamd); + if (reg->isamb) + isamb_close (reg->isamb); rec_close (®->records); } @@ -317,7 +383,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) @@ -354,7 +420,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); @@ -364,6 +430,14 @@ void zebra_close (ZebraHandle zh) zebra_register_close (zh->service, zh->reg); 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 + xfree (zh->admin_databaseName); zebra_mutex_cond_lock (&zs->session_lock); zebra_lock_destroy (zh->lock_normal); @@ -384,7 +458,7 @@ void zebra_close (ZebraHandle zh) zebra_mutex_cond_unlock (&zs->session_lock); xfree (zh->reg_name); xfree (zh); - yaz_log (LOG_LOG, "zebra_close zh=%p end", zh);} +} struct map_baseinfo { ZebraHandle zh; @@ -620,6 +694,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; } @@ -653,6 +732,8 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, zh->errString = odr_strdup (stream, setname); return; } + + zh->errCode = 0; if (zebra_begin_read (zh)) return; @@ -908,7 +989,7 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno) xfree (fname); } -static int zebra_begin_read (ZebraHandle zh) +int zebra_begin_read (ZebraHandle zh) { int dirty = 0; char val; @@ -923,12 +1004,21 @@ static int zebra_begin_read (ZebraHandle zh) zebra_flush_reg (zh); return 0; } +#if HAVE_SYS_TIMES_H + times (&zh->tms1); +#endif if (!zh->res) { (zh->trans_no)--; 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'; @@ -971,13 +1061,21 @@ static int zebra_begin_read (ZebraHandle zh) return 0; } -static void zebra_end_read (ZebraHandle zh) +void zebra_end_read (ZebraHandle zh) { (zh->trans_no)--; if (zh->trans_no != 0) return; +#if HAVE_SYS_TIMES_H + times (&zh->tms2); + logf (LOG_LOG, "user/system: %ld/%ld", + (long) (zh->tms2.tms_utime - zh->tms1.tms_utime), + (long) (zh->tms2.tms_stime - zh->tms1.tms_stime)); + +#endif + zebra_unlock (zh->lock_normal); zebra_unlock (zh->lock_shadow); } @@ -998,6 +1096,12 @@ void zebra_begin_trans (ZebraHandle zh) } yaz_log (LOG_LOG, "zebra_begin_trans"); + + zh->records_inserted = 0; + zh->records_updated = 0; + zh->records_deleted = 0; + zh->records_processed = 0; + #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif @@ -1073,11 +1177,18 @@ void zebra_end_trans (ZebraHandle zh) yaz_log (LOG_LOG, "zebra_end_trans"); rval = res_get (zh->res, "shadow"); + zebraExplain_runNumberIncrement (zh->reg->zei, 1); + zebra_flush_reg (zh); zebra_register_close (zh->service, zh->reg); zh->reg = 0; + + yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", + zh->records_processed, zh->records_inserted, + zh->records_updated, zh->records_deleted); + zebra_get_state (zh, &val, &seqno); if (val != 'd') { @@ -1155,9 +1266,6 @@ int zebra_commit (ZebraHandle zh) zebra_set_state (zh, 'c', seqno); logf (LOG_LOG, "commit start"); -#ifndef WIN32 - sleep (2); -#endif bf_commitExec (bfs); #ifndef WIN32 sync (); @@ -1248,3 +1356,9 @@ void zebra_shadow_enable (ZebraHandle zh, int value) zh->shadow_enable = value; } +int zebra_record_encoding (ZebraHandle zh, const char *encoding) +{ + xfree (zh->record_encoding); + zh->record_encoding = xstrdup (encoding); + return 0; +}