X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=ef44d788d44d59121162e997f907585d87680215;hb=dfc79a96b0ad352eb2b974c9d70c5e9fb8c6b79e;hp=29ad2f4dc8513735e7cb9e2a07e7226c5938e694;hpb=ba1ca9cd76ff8e56daff04ee0e6c8fa21c7b04b6;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 29ad2f4..ef44d78 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.62 2002-07-15 11:50:45 adam Exp $ - */ +/* $Id: zebraapi.c,v 1.77 2002-11-07 09:07:07 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 @@ -53,12 +70,13 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg); 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 */ @@ -66,7 +84,7 @@ ZebraHandle zebra_open (ZebraService zs) zh->destroyed = 0; zh->errCode = 0; zh->errString = 0; - zh->res = 0; + zh->res = 0; zh->reg_name = xstrdup (""); zh->path_reg = 0; @@ -82,6 +100,20 @@ 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); + + zh->iconv_to_utf8 = + 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 = + 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); + zebra_mutex_cond_lock (&zs->session_lock); zh->next = zs->sessions; @@ -98,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); @@ -149,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); @@ -163,7 +193,8 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, } if (useshadow) bf_cache (reg->bfs, res_get (res, "shadow")); - data1_set_tabpath (reg->dh, res_get(res, "profilePath")); + data1_set_tabpath (reg->dh, res_get_def(res, "profilePath", + DEFAULT_PROFILE_PATH)); data1_set_tabroot (reg->dh, reg_path); reg->recTypes = recTypes_init (reg->dh); recTypes_default_handlers (reg->recTypes); @@ -297,7 +328,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; } @@ -318,7 +349,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) @@ -350,7 +381,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) @@ -359,14 +390,11 @@ void zebra_stop(ZebraService zs) return ; yaz_log (LOG_LOG, "zebra_stop"); - zebra_mutex_cond_lock (&zs->session_lock); while (zs->sessions) { zebra_close (zs->sessions); } - zebra_mutex_cond_unlock (&zs->session_lock); - zebra_mutex_cond_destroy (&zs->session_lock); if (zs->passwd_db) @@ -387,7 +415,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); @@ -397,6 +425,13 @@ void zebra_close (ZebraHandle zh) zebra_register_close (zh->service, zh->reg); zebra_close_res (zh); + xfree (zh->record_encoding); + + 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); zebra_lock_destroy (zh->lock_normal); @@ -653,6 +688,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; } @@ -821,8 +861,11 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass) return 1; } -void zebra_admin_import_begin (ZebraHandle zh, const char *database) +void zebra_admin_import_begin (ZebraHandle zh, const char *database, + const char *record_type) { + if (zebra_select_database(zh, database)) + return; zebra_begin_trans (zh); xfree (zh->admin_databaseName); zh->admin_databaseName = xstrdup(database); @@ -869,10 +912,54 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) } } +int zebra_admin_exchange_record (ZebraHandle zh, + const char *database, + const char *rec_buf, + size_t rec_len, + const char *recid_buf, size_t recid_len, + int action) +{ + int sysno = 0; + char *rinfo = 0; + char recid_z[256]; + + if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z)) + return -1; + memcpy (recid_z, recid_buf, recid_len); + recid_z[recid_len] = 0; + + rinfo = dict_lookup (zh->reg->matchDict, recid_z); + if (rinfo) + { + if (action == 1) /* fail if insert */ + return -1; + memcpy (&sysno, rinfo+1, sizeof(sysno)); + } + else + { + if (action == 2 || action == 3) /* fail if delete or update */ + return -1; + } + extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database, + action == 3 ? 1 : 0 /* delete flag */, + 0, &sysno, 1, 1, 0); + if (action == 1) + { + dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno); + } + else if (action == 3) + { + dict_delete (zh->reg->matchDict, recid_z); + } + return 0; +} + void zebra_admin_create (ZebraHandle zh, const char *database) { ZebraService zs; + if (zebra_select_database (zh, database)) + return; zebra_begin_trans (zh); zs = zh->service; @@ -881,7 +968,7 @@ void zebra_admin_create (ZebraHandle zh, const char *database) /* explainDatabase */)) { zh->errCode = 224; - zh->errString = "Database already exist"; + zh->errString = "database already exist"; } zebra_end_trans (zh); } @@ -917,7 +1004,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); @@ -967,6 +1054,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'; @@ -1132,7 +1225,6 @@ void zebra_end_trans (ZebraHandle 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); @@ -1163,10 +1255,8 @@ void zebra_end_trans (ZebraHandle zh) void zebra_repository_update (ZebraHandle zh) { - zebra_begin_trans (zh); logf (LOG_LOG, "updating %s", zh->rGroup.path); repositoryUpdate (zh); - zebra_end_trans (zh); } void zebra_repository_delete (ZebraHandle zh) @@ -1304,3 +1394,20 @@ 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; +} + +void zebra_set_resource(ZebraHandle zh, const char *name, const char *value) +{ + res_put(zh->res, name, value); +} + +const char *zebra_get_resource(ZebraHandle zh, + const char *name, const char *defaultvalue) +{ + return res_get_def( zh->res, name, (char *)defaultvalue); +}