-/* $Id: zebraapi.c,v 1.67 2002-08-18 10:20:35 adam Exp $
+/* $Id: zebraapi.c,v 1.72 2002-09-13 11:40:35 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
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);
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));
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);
void zebra_admin_import_begin (ZebraHandle zh, const char *database)
{
+ if (zebra_select_database(zh, database))
+ return;
zebra_begin_trans (zh);
xfree (zh->admin_databaseName);
zh->admin_databaseName = xstrdup(database);
{
ZebraService zs;
+ if (zebra_select_database (zh, database))
+ return;
zebra_begin_trans (zh);
zs = zh->service;
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);
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)