-/*
- * Copyright (C) 1995-2002, Index Data
- * All rights reserved.
- *
- * $Id: zebraapi.c,v 1.57 2002-04-16 22:31:42 adam Exp $
- */
+/* $Id: zebraapi.c,v 1.65 2002-08-02 19:26:55 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 <assert.h>
#include <stdio.h>
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);
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->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;
yaz_log (LOG_LOG, "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);
struct ISAMC_M_s isamc_m;
if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
- rw, key_isamc_m(res, &isamc_m))))
+ 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;
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);
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);
zh->errString = odr_strdup (stream, setname);
return;
}
+
+ zh->errCode = 0;
if (zebra_begin_read (zh))
return;
xfree (fname);
}
-static int zebra_begin_read (ZebraHandle zh)
+int zebra_begin_read (ZebraHandle zh)
{
int dirty = 0;
char val;
zebra_flush_reg (zh);
return 0;
}
+#if HAVE_SYS_TIMES_H
+ times (&zh->tms1);
+#endif
if (!zh->res)
{
(zh->trans_no)--;
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);
}
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);
zebra_set_state (zh, 'c', seqno);
logf (LOG_LOG, "commit start");
-#ifndef WIN32
- sleep (2);
-#endif
bf_commitExec (bfs);
#ifndef WIN32
sync ();
zh->shadow_enable = value;
}
+int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+{
+ xfree (zh->record_encoding);
+ zh->record_encoding = xstrdup (encoding);
+ return 0;
+}