X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=ef44d788d44d59121162e997f907585d87680215;hb=dfc79a96b0ad352eb2b974c9d70c5e9fb8c6b79e;hp=dc0913fd30c32bb9b0731b947f6199c4a2da2c1c;hpb=7d4f4b37e1fb629e3fb04362394973c8aa01ef6c;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index dc0913f..ef44d78 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.67 2002-08-18 10:20:35 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 @@ -84,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; @@ -102,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); @@ -131,9 +130,7 @@ 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)); @@ -196,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); @@ -392,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) @@ -431,12 +426,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); @@ -867,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); @@ -915,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; @@ -927,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); } @@ -963,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); @@ -1184,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); @@ -1215,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) @@ -1362,3 +1400,14 @@ int zebra_record_encoding (ZebraHandle zh, const char *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); +}