X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=d53606415ed88db93f2df5082cb40bd7cdbbbb4a;hp=04399f9eb4e317faeba17ad752f457372dfce0fa;hb=810bce66201f40acfd7e8577d3997e6ea385f1cf;hpb=62785c75e108df98df439f47c4429e098ba0fabc

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 04399f9..d536064 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,6 +1,6 @@
-/* $Id: zebraapi.c,v 1.78 2002-11-18 11:07:59 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: zebraapi.c,v 1.175 2005-06-09 10:39:53 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,10 +20,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <assert.h>
 #include <stdio.h>
+#include <limits.h>
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
@@ -33,18 +32,32 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #include <yaz/diagbib1.h>
+#include <yaz/pquery.h>
+#include <yaz/sortspec.h>
 #include "index.h"
 #include <charmap.h>
+#include <idzebra/api.h>
+
+/* simple asserts to validate the most essential input args */
+#define ASSERTZH assert(zh && zh->service)
+#define ASSERTZHRES assert(zh && zh->service && zh->res)
+#define ASSERTZS assert(zs)
+
+static int log_level = 0;
+static int log_level_initialized = 0;
 
 static Res zebra_open_res (ZebraHandle zh);
 static void zebra_close_res (ZebraHandle zh);
 
-static void zebra_chdir (ZebraService zh)
+static void zebra_chdir (ZebraService zs)
 {
-    const char *dir = res_get (zh->global_res, "chdir");
+    const char *dir ;
+    ASSERTZS;
+    yaz_log(log_level, "zebra_chdir");
+    dir = res_get (zs->global_res, "chdir");
     if (!dir)
 	return;
-    logf (LOG_DEBUG, "chdir %s", dir);
+    yaz_log (YLOG_DEBUG, "chdir %s", dir);
 #ifdef WIN32
     _chdir(dir);
 #else
@@ -54,10 +67,13 @@ static void zebra_chdir (ZebraService zh)
 
 static void zebra_flush_reg (ZebraHandle zh)
 {
+    ASSERTZH;
+    yaz_log(log_level, "zebra_flush_reg");
+    zebra_clearError(zh);
     zebraExplain_flush (zh->reg->zei, zh);
     
-    extract_flushWriteKeys (zh);
-    zebra_index_merge (zh);
+    extract_flushWriteKeys (zh, 1 /* final */);
+    zebra_index_merge (zh );
 }
 
 static struct zebra_register *zebra_register_open (ZebraService zs, 
@@ -71,12 +87,19 @@ ZebraHandle zebra_open (ZebraService zs)
 {
     ZebraHandle zh;
     const char *default_encoding;
+    if (!log_level_initialized)
+    {
+        log_level = yaz_log_module_level("zebraapi");
+        log_level_initialized = 1;
+    }
+
+    yaz_log(log_level, "zebra_open");
 
     if (!zs)
         return 0;
 
-    zh = (ZebraHandle) xmalloc (sizeof(*zh));
-    yaz_log (LOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh);
+    zh = (ZebraHandle) xmalloc(sizeof(*zh));
+    yaz_log (YLOG_DEBUG, "zebra_open zs=%p returns %p", zs, zh);
 
     zh->service = zs;
     zh->reg = 0;          /* no register attached yet */
@@ -85,35 +108,37 @@ ZebraHandle zebra_open (ZebraService zs)
     zh->errCode = 0;
     zh->errString = 0;
     zh->res = 0; 
+    zh->user_perm = 0;
 
     zh->reg_name = xstrdup ("");
     zh->path_reg = 0;
     zh->num_basenames = 0;
     zh->basenames = 0;
 
+    zh->approx_limit = 1000000000;
     zh->trans_no = 0;
+    zh->trans_w_no = 0;
 
     zh->lock_normal = 0;
     zh->lock_shadow = 0;
 
-    zh->admin_databaseName = 0;
-
     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",
+        yaz_log (YLOG_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",
+        yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported",
            default_encoding);
 
+    zh->record_encoding = 0;
+
     zebra_mutex_cond_lock (&zs->session_lock);
 
     zh->next = zs->sessions;
@@ -121,20 +146,40 @@ ZebraHandle zebra_open (ZebraService zs)
 
     zebra_mutex_cond_unlock (&zs->session_lock);
 
+    zh->store_data_buf = 0;
+
+    zh->m_limit = zebra_limit_create(1, 0);
+
+    zh->nmem_error = nmem_create();
+
     return zh;
 }
 
 ZebraService zebra_start (const char *configName)
 {
+    return zebra_start_res(configName, 0, 0);
+}
+
+ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
+{
     Res res;
 
-    yaz_log (LOG_LOG, "zebra_start %s", configName);
+    if (!log_level_initialized)
+    {
+        log_level = yaz_log_module_level("zebraapi");
+        log_level_initialized = 1;
+    }
 
-    if ((res = res_open (configName, 0)))
+    yaz_log(YLOG_LOG, "zebra_start %s %s",configName, ZEBRAVER);
+    assert(configName);
+
+    if ((res = res_open (configName, def_res, over_res)))
     {
-        ZebraService zh = xmalloc (sizeof(*zh));
+	const char *passwd_plain = 0;
+	const char *passwd_encrypt = 0;
+        ZebraService zh = xmalloc(sizeof(*zh));
 
-	yaz_log (LOG_DEBUG, "Read resources `%s'", configName);
+	yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
         
         zh->global_res = res;
         zh->configName = xstrdup(configName);
@@ -143,23 +188,68 @@ ZebraService zebra_start (const char *configName)
         zebra_chdir (zh);
         
         zebra_mutex_cond_init (&zh->session_lock);
-        if (!res_get (zh->global_res, "passwd"))
+	passwd_plain = res_get (zh->global_res, "passwd");
+	passwd_encrypt = res_get (zh->global_res, "passwd.c");
+
+        if (!passwd_plain && !passwd_encrypt)
             zh->passwd_db = NULL;
         else
         {
-            zh->passwd_db = passwd_db_open ();
+            zh->passwd_db = passwd_db_open();
             if (!zh->passwd_db)
-                logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed");
+                yaz_log (YLOG_WARN|YLOG_ERRNO, "passwd_db_open failed");
             else
-                passwd_db_file (zh->passwd_db,
-                                res_get (zh->global_res, "passwd"));
+	    {
+		if (passwd_plain)
+		    passwd_db_file_plain(zh->passwd_db, passwd_plain);
+		if (passwd_encrypt)
+		    passwd_db_file_crypt(zh->passwd_db, passwd_encrypt);
+	    }
         }
         zh->path_root = res_get (zh->global_res, "root");
+	zh->nmem = nmem_create();
+	zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
         return zh;
     }
     return 0;
 }
 
+void zebra_filter_info(ZebraService zs, void *cd,
+			void (*cb)(void *cd, const char *name))
+{
+    ASSERTZS;
+    assert(cb);
+    recTypeClass_info(zs->record_classes, cd, cb);
+}
+
+void zebra_pidfname(ZebraService zs, char *path)
+{
+    ASSERTZS;
+    zebra_lock_prefix (zs->global_res, path);
+    strcat(path, "zebrasrv.pid");
+}
+
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+		    int compact_flag, Res res)
+{
+    int page_size = 4096;
+    char resource_str[200];
+    const char *v;
+    sprintf (resource_str, "dict.%.100s.pagesize", name);
+    assert(bfs);
+    assert(name);
+
+    v = res_get(res, resource_str);
+    if (v)
+    {
+	page_size = atoi(v);
+	yaz_log(YLOG_LOG, "Using custom dictionary page size %d for %s",
+		page_size, name);
+    }
+    return dict_open(bfs, name, cache, rw, compact_flag, page_size);
+}
+
+
 static
 struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
                                             int rw, int useshadow, Res res,
@@ -167,9 +257,13 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 {
     struct zebra_register *reg;
     int record_compression = REC_COMPRESS_NONE;
-    char *recordCompression = 0;
+    const char *recordCompression = 0;
+    const char *profilePath;
+    char cwd[1024];
 
-    reg = xmalloc (sizeof(*reg));
+    ASSERTZS;
+    
+    reg = xmalloc(sizeof(*reg));
 
     assert (name);
     reg->name = xstrdup (name);
@@ -179,25 +273,40 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     assert (res);
 
-    yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p",
-             rw, useshadow, reg);
-
+    yaz_log (YLOG_DEBUG, "zebra_register_open rw=%d useshadow=%d p=%p n=%s rp=%s",
+             rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
+    
     reg->dh = data1_createx (DATA1_FLAG_XML);
     if (!reg->dh)
+    {
+	xfree(reg);
         return 0;
+    }
     reg->bfs = bfs_create (res_get (res, "register"), reg_path);
     if (!reg->bfs)
     {
         data1_destroy(reg->dh);
+	xfree(reg);
         return 0;
     }
     if (useshadow)
-        bf_cache (reg->bfs, res_get (res, "shadow"));
-    data1_set_tabpath (reg->dh, res_get_def(res, "profilePath",
-                                            DEFAULT_PROFILE_PATH));
+    {
+        if (bf_cache (reg->bfs, res_get (res, "shadow")) == ZEBRA_FAIL)
+	{
+	    bfs_destroy(reg->bfs);
+	    data1_destroy(reg->dh);
+	    xfree(reg);
+	    return 0;
+	}
+    }
+
+    getcwd(cwd, sizeof(cwd)-1);
+    profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH);
+    yaz_log(YLOG_DEBUG, "profilePath=%s cwd=%s", profilePath, cwd);
+
+    data1_set_tabpath (reg->dh, profilePath);
     data1_set_tabroot (reg->dh, reg_path);
-    reg->recTypes = recTypes_init (reg->dh);
-    recTypes_default_handlers (reg->recTypes);
+    reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
 
     reg->zebra_maps = zebra_maps_open (res, reg_path);
     reg->rank_classes = NULL;
@@ -206,21 +315,25 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->keys.buf_max = 0;
     reg->keys.buf = 0;
+    reg->keys.codec_handle = iscz1_start();
+
+    reg->sortKeys.buf = 0;
+    reg->sortKeys.buf_max = 0;
 
     reg->records = 0;
     reg->dict = 0;
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;
-    reg->isam = 0;
     reg->isamc = 0;
-    reg->isamd = 0;
     reg->isamb = 0;
     reg->zei = 0;
     reg->matchDict = 0;
     reg->key_file_no = 0;
+    reg->ptr_i = 0;
     
     zebraRankInstall (reg, rank1_class);
+    zebraRankInstall (reg, rankzv_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -230,21 +343,21 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     if (!(reg->records = rec_open (reg->bfs, rw, record_compression)))
     {
-	logf (LOG_WARN, "rec_open");
+	yaz_log (YLOG_WARN, "rec_open failed");
 	return 0;
     }
     if (rw)
     {
-        reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0);
+        reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res);
     }
-    if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0)))
+    if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
     {
-	logf (LOG_WARN, "dict_open");
+	yaz_log (YLOG_WARN, "dict_open failed");
 	return 0;
     }
     if (!(reg->sortIdx = sortIdx_open (reg->bfs, rw)))
     {
-	logf (LOG_WARN, "sortIdx_open");
+	yaz_log (YLOG_WARN, "sortIdx_open failed");
 	return 0;
     }
     if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
@@ -253,37 +366,17 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	if (!(reg->isams = isams_open (reg->bfs, FNAME_ISAMS, rw,
 				      key_isams_m(res, &isams_m))))
 	{
-	    logf (LOG_WARN, "isams_open");
-	    return 0;
-	}
-    }
-    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)))
-	{
-	    logf (LOG_WARN, "is_open");
+	    yaz_log (YLOG_WARN, "isams_open failed");
 	    return 0;
 	}
     }
     if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
     {
 	struct ISAMC_M_s isamc_m;
-	if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC,
+	if (!(reg->isamc = isamc_open (reg->bfs, FNAME_ISAMC,
 				    rw, key_isamc_m(res, &isamc_m))))
 	{
-	    logf (LOG_WARN, "isc_open");
-	    return 0;
-	}
-    }
-    if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
-    {
-	struct ISAMD_M_s isamd_m;
-	
-	if (!(reg->isamd = isamd_open (reg->bfs, FNAME_ISAMD,
-				      rw, key_isamd_m(res, &isamd_m))))
-	{
-	    logf (LOG_WARN, "isamd_open");
+	    yaz_log (YLOG_WARN, "isamc_open failed");
 	    return 0;
 	}
     }
@@ -294,7 +387,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
                                        rw, key_isamc_m(res, &isamc_m), 0)))
 	{
-	    logf (LOG_WARN, "isamb_open");
+	    yaz_log (YLOG_WARN, "isamb_open failed");
 	    return 0;
 	}
     }
@@ -305,7 +398,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
                                        rw, key_isamc_m(res, &isamc_m), 1)))
 	{
-	    logf (LOG_WARN, "isamb_open");
+	    yaz_log (YLOG_WARN, "isamb_open failed");
 	    return 0;
 	}
     }
@@ -316,7 +409,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
                                        rw, key_isamc_m(res, &isamc_m), -1)))
 	{
-	    logf (LOG_WARN, "isamb_open");
+	    yaz_log (YLOG_WARN, "isamb_open failed");
 	    return 0;
 	}
     }
@@ -325,32 +418,43 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
                                   explain_extract);
     if (!reg->zei)
     {
-	logf (LOG_WARN, "Cannot obtain EXPLAIN information");
+	yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
 	return 0;
     }
     reg->active = 2;
-    yaz_log (LOG_DEBUG, "zebra_register_open ok p=%p", reg);
+    yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
     return reg;
 }
 
-void zebra_admin_shutdown (ZebraHandle zh)
+ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 {
+    ASSERTZH;
+    yaz_log(log_level, "zebra_admin_shutdown");
+    zebra_clearError(zh);
+
     zebra_mutex_cond_lock (&zh->service->session_lock);
     zh->service->stop_flag = 1;
     zebra_mutex_cond_unlock (&zh->service->session_lock);
+    return ZEBRA_OK;
 }
 
-void zebra_admin_start (ZebraHandle zh)
+ZEBRA_RES zebra_admin_start (ZebraHandle zh)
 {
-    ZebraService zs = zh->service;
-    zh->errCode = 0;
+    ZebraService zs;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_admin_start");
+    zebra_clearError(zh);
+    zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
+    return ZEBRA_OK;
 }
 
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 {
-    yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
+    ASSERTZS;
+    assert(reg);
+    yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg);
     reg->stop_flag = 0;
     zebra_chdir (zs);
     if (reg->records)
@@ -362,12 +466,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 	sortIdx_close (reg->sortIdx);
 	if (reg->isams)
 	    isams_close (reg->isams);
-        if (reg->isam)
-            is_close (reg->isam);
         if (reg->isamc)
-            isc_close (reg->isamc);
-        if (reg->isamd)
-            isamd_close (reg->isamd);
+            isamc_close (reg->isamc);
         if (reg->isamb)
             isamb_close (reg->isamb);
         rec_close (&reg->records);
@@ -379,17 +479,20 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     bfs_destroy (reg->bfs);
     data1_destroy (reg->dh);
 
-    xfree (reg->key_buf);
-    xfree (reg->name);
-    xfree (reg);
-    yaz_log(LOG_DEBUG, "zebra_register_close 2");
+    xfree(reg->sortKeys.buf);
+    xfree(reg->keys.buf);
+    if (reg->keys.codec_handle)
+	iscz1_stop(reg->keys.codec_handle);
+    xfree(reg->key_buf);
+    xfree(reg->name);
+    xfree(reg);
 }
 
-void zebra_stop(ZebraService zs)
+ZEBRA_RES zebra_stop(ZebraService zs)
 {
     if (!zs)
-	return ;
-    yaz_log (LOG_LOG, "zebra_stop");
+        return ZEBRA_OK;
+    yaz_log (log_level, "zebra_stop");
 
     while (zs->sessions)
     {
@@ -401,39 +504,45 @@ void zebra_stop(ZebraService zs)
     if (zs->passwd_db)
 	passwd_db_close (zs->passwd_db);
 
+    recTypeClass_destroy(zs->record_classes);
+    nmem_destroy(zs->nmem);
     res_close (zs->global_res);
-    xfree (zs->configName);
-    xfree (zs->path_root);
-    xfree (zs);
+    xfree(zs->configName);
+    xfree(zs);
+    return ZEBRA_OK;
 }
 
-void zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close (ZebraHandle zh)
 {
     ZebraService zs;
     struct zebra_session **sp;
+    int i;
 
+    yaz_log(log_level, "zebra_close");
     if (!zh)
-        return;
-
+        return ZEBRA_OK;
+    ASSERTZH;
+    zh->errCode = 0;
+    
     zs = zh->service;
-    yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
-    if (!zh)
-	return ;
+    yaz_log (YLOG_DEBUG, "zebra_close zh=%p", zh);
     resultSetDestroy (zh, -1, 0, 0);
 
-
     if (zh->reg)
         zebra_register_close (zh->service, zh->reg);
     zebra_close_res (zh);
 
-    xfree (zh->record_encoding);
+    xfree(zh->record_encoding);
+
+    for (i = 0; i < zh->num_basenames; i++)
+        xfree(zh->basenames[i]);
+    xfree(zh->basenames);
 
     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);
     zebra_lock_destroy (zh->lock_shadow);
@@ -448,11 +557,18 @@ void zebra_close (ZebraHandle zh)
 	}
 	sp = &(*sp)->next;
     }
-//    if (!zs->sessions && zs->stop_flag)
-//	zebra_register_deactivate(zs);
     zebra_mutex_cond_unlock (&zs->session_lock);
-    xfree (zh->reg_name);
-    xfree (zh);
+    xfree(zh->reg_name);
+    xfree(zh->user_perm);
+    zh->service = 0; /* more likely to trigger an assert */
+
+    zebra_limit_destroy(zh->m_limit);
+
+    nmem_destroy(zh->nmem_error);
+
+    xfree(zh->path_reg);
+    xfree(zh);
+    return ZEBRA_OK;
 }
 
 struct map_baseinfo {
@@ -469,10 +585,13 @@ static Res zebra_open_res (ZebraHandle zh)
 {
     Res res = 0;
     char fname[512];
+    ASSERTZH;
+    zh->errCode = 0;
+
     if (zh->path_reg)
     {
         sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
-        res = res_open (fname, zh->service->global_res);
+        res = res_open (fname, zh->service->global_res, 0);
         if (!res)
             res = zh->service->global_res;
     }
@@ -482,7 +601,7 @@ static Res zebra_open_res (ZebraHandle zh)
     }
     else
     {
-        yaz_log (LOG_WARN, "no register root specified");
+        yaz_log (YLOG_WARN, "no register root specified");
         return 0;  /* no path for register - fail! */
     }
     return res;
@@ -490,15 +609,19 @@ static Res zebra_open_res (ZebraHandle zh)
 
 static void zebra_close_res (ZebraHandle zh)
 {
+    ASSERTZH;
+    zh->errCode = 0;
     if (zh->res != zh->service->global_res)
         res_close (zh->res);
     zh->res = 0;
 }
 
-static int zebra_select_register (ZebraHandle zh, const char *new_reg)
+static void zebra_select_register (ZebraHandle zh, const char *new_reg)
 {
+    ASSERTZH;
+    zh->errCode = 0;
     if (zh->res && strcmp (zh->reg_name, new_reg) == 0)
-        return 0;
+        return;
     if (!zh->res)
     {
         assert (zh->reg == 0);
@@ -514,14 +637,14 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
         }
         zebra_close_res(zh);
     }
-    xfree (zh->reg_name);
+    xfree(zh->reg_name);
     zh->reg_name = xstrdup (new_reg);
 
-    xfree (zh->path_reg);
+    xfree(zh->path_reg);
     zh->path_reg = 0;
     if (zh->service->path_root)
     {
-        zh->path_reg = xmalloc (strlen(zh->service->path_root) + 
+        zh->path_reg = xmalloc(strlen(zh->service->path_root) + 
                                 strlen(zh->reg_name) + 3);
         strcpy (zh->path_reg, zh->service->path_root);
         if (*zh->reg_name)
@@ -546,7 +669,7 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
         const char *lock_area  =res_get (zh->res, "lockDir");
         
         if (!lock_area && zh->path_reg)
-            res_put (zh->res, "lockDir", zh->path_reg);
+            res_set (zh->res, "lockDir", zh->path_reg);
         sprintf (fname, "norm.%s.LCK", zh->reg_name);
         zh->lock_normal =
             zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
@@ -555,8 +678,21 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
         zh->lock_shadow =
             zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
 
+	if (!zh->lock_normal || !zh->lock_shadow)
+	{
+	    if (zh->lock_normal)
+	    {
+		zebra_lock_destroy(zh->lock_normal);
+		zh->lock_normal = 0;
+	    }
+	    if (zh->lock_shadow)
+	    {
+		zebra_lock_destroy(zh->lock_shadow);
+		zh->lock_shadow = 0;
+	    }
+	    zebra_close_res(zh);
+	}
     }
-    return 1;
 }
 
 void map_basenames_func (void *vp, const char *name, const char *value)
@@ -564,6 +700,10 @@ void map_basenames_func (void *vp, const char *name, const char *value)
     struct map_baseinfo *p = (struct map_baseinfo *) vp;
     int i, no;
     char fromdb[128], todb[8][128];
+
+    assert(value);
+    assert(name);
+    assert(vp);
     
     no =
 	sscanf (value, "%127s %127s %127s %127s %127s %127s %127s %127s %127s",
@@ -573,7 +713,7 @@ void map_basenames_func (void *vp, const char *name, const char *value)
 	return ;
     no--;
     for (i = 0; i<p->num_bases; i++)
-	if (p->basenames[i] && !strcmp (p->basenames[i], fromdb))
+	if (p->basenames[i] && !STRCASECMP (p->basenames[i], fromdb))
 	{
 	    p->basenames[i] = 0;
 	    for (i = 0; i < no; i++)
@@ -587,14 +727,33 @@ void map_basenames_func (void *vp, const char *name, const char *value)
 	}
 }
 
+int zebra_select_default_database(ZebraHandle zh)
+{
+    if (!zh->res)
+    {
+	/* no database has been selected - so we select based on
+	   resource setting (including group)
+	*/
+	const char *group = res_get(zh->service->global_res, "group");
+	const char *v = res_get_prefix(zh->service->global_res,
+				       "database", group, "Default");
+	return zebra_select_database(zh, v);
+    }
+    return 0;
+}
+
 void map_basenames (ZebraHandle zh, ODR stream,
 		    int *num_bases, char ***basenames)
 {
     struct map_baseinfo info;
     struct map_baseinfo *p = &info;
     int i;
+    ASSERTZH;
+    yaz_log(log_level, "map_basenames ");
+    assert(stream);
 
     info.zh = zh;
+
     info.num_bases = *num_bases;
     info.basenames = *basenames;
     info.new_num_max = 128;
@@ -614,33 +773,42 @@ void map_basenames (ZebraHandle zh, ODR stream,
     *num_bases = info.new_num_bases;
     *basenames = info.new_basenames;
     for (i = 0; i<*num_bases; i++)
-	logf (LOG_LOG, "base %s", (*basenames)[i]);
+	yaz_log (YLOG_DEBUG, "base %s", (*basenames)[i]);
 }
 
-int zebra_select_database (ZebraHandle zh, const char *basename)
+ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename)
 {
+    ASSERTZH;
+    yaz_log(log_level, "zebra_select_database %s",basename);
+    assert(basename);
     return zebra_select_databases (zh, 1, &basename);
 }
 
-int zebra_select_databases (ZebraHandle zh, int num_bases,
-                            const char **basenames)
+ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases,
+				  const char **basenames)
 {
     int i;
     const char *cp;
     int len = 0;
     char *new_reg = 0;
+    ASSERTZH;
+    assert(basenames);
+
+    yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
+		    num_bases,basenames[0]);
+    zh->errCode = 0;
     
     if (num_bases < 1)
     {
-        zh->errCode = 23;
-        return -1;
+        zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+        return ZEBRA_FAIL;
     }
     for (i = 0; i < zh->num_basenames; i++)
-        xfree (zh->basenames[i]);
-    xfree (zh->basenames);
+        xfree(zh->basenames[i]);
+    xfree(zh->basenames);
     
     zh->num_basenames = num_bases;
-    zh->basenames = xmalloc (zh->num_basenames * sizeof(*zh->basenames));
+    zh->basenames = xmalloc(zh->num_basenames * sizeof(*zh->basenames));
     for (i = 0; i < zh->num_basenames; i++)
         zh->basenames[i] = xstrdup (basenames[i]);
 
@@ -648,7 +816,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     if (cp)
     {
         len = cp - basenames[0];
-        new_reg = xmalloc (len + 1);
+        new_reg = xmalloc(len + 1);
         memcpy (new_reg, basenames[0], len);
         new_reg[len] = '\0';
     }
@@ -663,13 +831,13 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
         {
             if (!cp1)
             {
-                zh->errCode = 23;
+                zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
                 return -1;
             }
             if (len != cp1 - basenames[i] ||
                 memcmp (basenames[i], new_reg, len))
             {
-                zh->errCode = 23;
+                zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
                 return -1;
             }
         }
@@ -677,71 +845,95 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
         {
             if (cp1)
             {
-                zh->errCode = 23;
-                return -1;
+                zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+                return ZEBRA_FAIL;
             }
         }
     }
     zebra_select_register (zh, new_reg);
-    xfree (new_reg);
+    xfree(new_reg);
     if (!zh->res)
     {
-        zh->errCode = 109;
-        return -1;
+        zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+        return ZEBRA_FAIL;
     }
     if (!zh->lock_normal || !zh->lock_shadow)
     {
-        zh->errCode = 2;
-	return -1;
+        zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+	return ZEBRA_FAIL;
     }
-    return 0;
+    return ZEBRA_OK;
 }
 
-void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
-		       Z_RPNQuery *query, const char *setname, int *hits)
+ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit)
 {
+    zh->approx_limit = approx_limit;
+    return ZEBRA_OK;
+}
+
+ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
+			   const char *setname, zint *hits)
+{
+    ZEBRA_RES r;
+    ASSERTZH;
+    assert(o);
+    assert(query);
+    assert(hits);
+    assert(setname);
+    yaz_log(log_level, "zebra_search_rpn");
+    zebra_clearError(zh);
     zh->hits = 0;
     *hits = 0;
 
-    if (zebra_begin_read (zh))
-	return;
-    resultSetAddRPN (zh, decode, stream, query, 
-                     zh->num_basenames, zh->basenames, setname);
-
-    zebra_end_read (zh);
+    if (zebra_begin_read(zh) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
 
+    r = resultSetAddRPN(zh, odr_extract_mem(o), query, 
+			zh->num_basenames, zh->basenames, setname);
+    zebra_end_read(zh);
     *hits = zh->hits;
+    return r;
 }
 
-void zebra_records_retrieve (ZebraHandle zh, ODR stream,
-			     const char *setname, Z_RecordComposition *comp,
-			     oid_value input_format, int num_recs,
-			     ZebraRetrievalRecord *recs)
+ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
+				 const char *setname,
+				 Z_RecordComposition *comp,
+				 oid_value input_format, int num_recs,
+				 ZebraRetrievalRecord *recs)
 {
-    ZebraPosSet poset;
-    int i, *pos_array;
+    ZebraMetaRecord *poset;
+    int i;
+    ZEBRA_RES ret = ZEBRA_OK;
+    zint *pos_array;
+    ASSERTZH;
+    assert(stream);
+    assert(setname);
+    assert(recs);
+    assert(num_recs>0);
 
+    yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
+
+    zebra_clearError(zh);
     if (!zh->res)
     {
-        zh->errCode = 30;
-        zh->errString = odr_strdup (stream, setname);
-        return;
+	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+		       setname);
+        return ZEBRA_FAIL;
     }
     
-    zh->errCode = 0;
+    if (zebra_begin_read (zh) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
 
-    if (zebra_begin_read (zh))
-	return;
-
-    pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
+    pos_array = (zint *) xmalloc(num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
 	pos_array[i] = recs[i].position;
-    poset = zebraPosSetCreate (zh, setname, num_recs, pos_array);
+    poset = zebra_meta_records_create(zh, setname, num_recs, pos_array);
     if (!poset)
     {
-        logf (LOG_DEBUG, "zebraPosSetCreate error");
-        zh->errCode = 30;
-        zh->errString = nmem_strdup (stream->mem, setname);
+        yaz_log (YLOG_DEBUG, "zebraPosSetCreate error");
+	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+		       setname);
+	ret = ZEBRA_FAIL;
     }
     else
     {
@@ -757,72 +949,142 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
 	    }
 	    else if (poset[i].sysno)
 	    {
+		char *buf;
+		int len;
+		zebra_snippets *hit_snippet = zebra_snippets_create();
+
+		zebra_snippets_hit_vector(zh, setname, poset[i].sysno, 
+					  hit_snippet);
+
 		recs[i].errCode =
-		    zebra_record_fetch (zh, poset[i].sysno, poset[i].score,
-					stream, input_format, comp,
-					&recs[i].format, &recs[i].buf,
-					&recs[i].len,
-					&recs[i].base);
-		recs[i].errString = NULL;
+		    zebra_record_fetch(zh, poset[i].sysno, poset[i].score,
+				       hit_snippet,
+				       stream, input_format, comp,
+				       &recs[i].format, &buf, &len,
+				       &recs[i].base, &recs[i].errString);
+		
+		recs[i].len = len;
+		if (len > 0)
+		{
+		    recs[i].buf = (char*) odr_malloc(stream, len);
+		    memcpy(recs[i].buf, buf, len);
+		}
+		else
+		    recs[i].buf = buf;
+                recs[i].score = poset[i].score;
+                recs[i].sysno = poset[i].sysno;
+		zebra_snippets_destroy(hit_snippet);
 	    }
 	    else
 	    {
-	        char num_str[20];
-
-		sprintf (num_str, "%d", pos_array[i]);	
-		zh->errCode = 13;
-                zh->errString = odr_strdup (stream, num_str);
+		if (ret == ZEBRA_OK) /* only need to set it once */
+		    zebra_setError_zint(zh,
+					YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE,
+					pos_array[i]);
+		ret = ZEBRA_FAIL;
                 break;
 	    }
 	}
-	zebraPosSetDestroy (zh, poset, num_recs);
+	zebra_meta_records_destroy(zh, poset, num_recs);
     }
     zebra_end_read (zh);
-    xfree (pos_array);
+    xfree(pos_array);
+    return ret;
 }
 
-void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
-		 oid_value attributeset,
-		 int *position, int *num_entries, ZebraScanEntry **entries,
-		 int *is_partial)
+ZEBRA_RES zebra_scan_PQF(ZebraHandle zh, ODR stream, const char *query,
+			 int *position,
+			 int *num_entries, ZebraScanEntry **entries,
+			 int *is_partial)
 {
-    if (zebra_begin_read (zh))
+    YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
+    Z_AttributesPlusTerm *zapt;
+    int *attributeSet;
+    ZEBRA_RES res;
+    
+    if (!(zapt = yaz_pqf_scan(pqf_parser, stream, &attributeSet, query)))
+    {
+	res = ZEBRA_FAIL;
+	zh->errCode = YAZ_BIB1_SCAN_MALFORMED_SCAN;
+    }
+    else
+	res = zebra_scan(zh, stream, zapt, VAL_BIB1,
+			 position, num_entries, entries, is_partial);
+    yaz_pqf_destroy (pqf_parser);
+    return res;
+}
+
+ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
+		     oid_value attributeset,
+		     int *position,
+		     int *num_entries, ZebraScanEntry **entries,
+		     int *is_partial)
+{
+    ZEBRA_RES res;
+    ASSERTZH;
+    assert(stream);
+    assert(zapt);
+    assert(position);
+    assert(num_entries);
+    assert(is_partial);
+    assert(entries);
+    yaz_log(log_level, "zebra_scan");
+    zebra_clearError(zh);
+    if (zebra_begin_read (zh) == ZEBRA_FAIL)
     {
 	*entries = 0;
 	*num_entries = 0;
-	return;
+	return ZEBRA_FAIL;
     }
-    rpn_scan (zh, stream, zapt, attributeset,
-	      zh->num_basenames, zh->basenames, position,
-	      num_entries, entries, is_partial);
+    res = rpn_scan (zh, stream, zapt, attributeset,
+		    zh->num_basenames, zh->basenames, position,
+		    num_entries, entries, is_partial, 0, 0);
     zebra_end_read (zh);
+    return res;
 }
 
-void zebra_sort (ZebraHandle zh, ODR stream,
-		 int num_input_setnames, const char **input_setnames,
-		 const char *output_setname, Z_SortKeySpecList *sort_sequence,
-		 int *sort_status)
+ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream,
+		      int num_input_setnames, const char **input_setnames,
+		      const char *output_setname,
+		      Z_SortKeySpecList *sort_sequence,
+		      int *sort_status)
 {
-    if (zebra_begin_read (zh))
-	return;
-    resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
-		   output_setname, sort_sequence, sort_status);
+    ZEBRA_RES res;
+    ASSERTZH;
+    assert(stream);
+    assert(num_input_setnames>0);
+    assert(input_setnames);
+    assert(sort_sequence);
+    assert(sort_status);
+    yaz_log(log_level, "zebra_sort");
+    zebra_clearError(zh);
+    if (zebra_begin_read(zh) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
+    res = resultSetSort(zh, stream->mem, num_input_setnames, input_setnames,
+			output_setname, sort_sequence, sort_status);
     zebra_end_read(zh);
+    return res;
 }
 
-int zebra_deleleResultSet(ZebraHandle zh, int function,
+int zebra_deleteResultSet(ZebraHandle zh, int function,
 			  int num_setnames, char **setnames,
 			  int *statuses)
 {
     int i, status;
+    ASSERTZH;
+    assert(statuses);
+    yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
+    zebra_clearError(zh);;
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
     {
-    case Z_DeleteRequest_list:
+    case Z_DeleteResultSetRequest_list:
+	assert(num_setnames>0);
+	assert(setnames);
 	resultSetDestroy (zh, num_setnames, setnames, statuses);
 	break;
-    case Z_DeleteRequest_all:
+    case Z_DeleteResultSetRequest_all:
 	resultSetDestroy (zh, -1, 0, statuses);
 	break;
     }
@@ -836,114 +1098,180 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 
 int zebra_errCode (ZebraHandle zh)
 {
-    return zh->errCode;
+    if (zh)
+    {
+        yaz_log(log_level, "zebra_errCode: %d",zh->errCode);
+        return zh->errCode;
+    }
+    yaz_log(log_level, "zebra_errCode: o");
+    return 0; 
 }
 
 const char *zebra_errString (ZebraHandle zh)
 {
-    return diagbib1_str (zh->errCode);
+    const char *e = 0;
+    if (zh)
+        e= diagbib1_str (zh->errCode);
+    yaz_log(log_level, "zebra_errString: %s",e);
+    return e;
 }
 
 char *zebra_errAdd (ZebraHandle zh)
 {
-    return zh->errString;
+    char *a = 0;
+    if (zh)
+        a= zh->errString;
+    yaz_log(log_level, "zebra_errAdd: %s",a);
+    return a;
 }
 
-int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
+void zebra_clearError(ZebraHandle zh)
 {
-    ZebraService zs = zh->service;
-    if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
+    if (zh)
     {
-        logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS");
-	return 0;
+        zh->errCode = 0;
+        zh->errString = 0;
     }
+}
+
+ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
+{
+    const char *p;
+    char u[40];
+    ZebraService zs;
 
-    logf(LOG_APP,"AUTHFAIL:%s", user?user:"ANONYMOUS");
-    return 1;
+    ASSERTZH;
+    zebra_clearError(zh);
+    zs= zh->service;
+    
+    sprintf(u, "perm.%.30s", user ? user : "anonymous");
+    p = res_get(zs->global_res, u);
+    xfree(zh->user_perm);
+    zh->user_perm = xstrdup(p ? p : "r");
+
+    /* users that don't require a password .. */
+    if (zh->user_perm && strchr(zh->user_perm, 'a'))
+	return ZEBRA_OK;
+    
+    if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
+	return ZEBRA_OK;
+    return ZEBRA_FAIL;
 }
 
-void zebra_admin_import_begin (ZebraHandle zh, const char *database,
+ZEBRA_RES 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);
+    ASSERTZH;
+    yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
+		     database, record_type);
+    zebra_clearError(zh);
+    if (zebra_select_database(zh, database) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
+    return zebra_begin_trans(zh, 1);
 }
 
-void zebra_admin_import_end (ZebraHandle zh)
+ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 {
-    zebra_end_trans (zh);
+    ASSERTZH;
+    yaz_log(log_level, "zebra_admin_import_end");
+    zebra_clearError(zh);
+    return zebra_end_trans(zh);
 }
 
-void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
+ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 {
-    int sysno;
+    ZEBRA_RES res = ZEBRA_OK;
+    SYSNO sysno;
     int i;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_admin_import_segment");
+    zebra_clearError(zh);
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
-	const char *databaseName = npr->databaseName;
 
-	if (!databaseName)
-	    databaseName = zh->admin_databaseName;
-	printf ("--------------%d--------------------\n", i);
 	if (npr->which == Z_NamePlusRecord_intermediateFragment)
 	{
 	    Z_FragmentSyntax *fragment = npr->u.intermediateFragment;
 	    if (fragment->which == Z_FragmentSyntax_notExternallyTagged)
 	    {
 		Odr_oct *oct = fragment->u.notExternallyTagged;
-		printf ("%.*s", (oct->len > 100 ? 100 : oct->len) ,
-			oct->buf);
-		
 		sysno = 0;
-		extract_rec_in_mem (zh, "grs.sgml",
-				    oct->buf, oct->len,
-				    databaseName,
-				    0 /* delete_flag */,
-				    0 /* test_mode */,
-				    &sysno /* sysno */,
-				    1 /* store_keys */,
-				    1 /* store_data */,
-				    0 /* match criteria */);
+		
+		if ( zebra_update_record(zh, 
+					 0, /* record Type */
+					 &sysno,
+					 0, /* match */
+					 0, /* fname */
+					 oct->buf, oct->len,
+					 0) == ZEBRA_FAIL)
+		    res = ZEBRA_FAIL;
 	    }
 	}
     }
+    return res;
 }
 
-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)
+ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
+				       const char *rec_buf,
+				       size_t rec_len,
+				       const char *recid_buf, size_t recid_len,
+				       int action)
+    /* 1 = insert. Fail it already exists */
+    /* 2 = replace. Fail it does not exist */
+    /* 3 = delete. Fail if does not exist */
+    /* 4 = update. Insert/replace */
 {
-    int sysno = 0;
+    ZEBRA_RES res;
+    SYSNO sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
+    ASSERTZH;
+    assert(action>0 && action <=4);
+    assert(rec_buf);
+
+    yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
+    zebra_clearError(zh);
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
-        return -1;
+        return ZEBRA_FAIL;
+
     memcpy (recid_z, recid_buf, recid_len);
     recid_z[recid_len] = 0;
 
+    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
+
     rinfo = dict_lookup (zh->reg->matchDict, recid_z);
     if (rinfo)
     {
         if (action == 1)  /* fail if insert */
-            return -1;
+        {
+	     zebra_end_trans(zh);
+	     return ZEBRA_FAIL;
+	}
+
         memcpy (&sysno, rinfo+1, sizeof(sysno));
     }
     else
     {
         if (action == 2 || action == 3) /* fail if delete or update */
-            return -1;
+        {
+	    zebra_end_trans(zh);
+            return ZEBRA_FAIL;
+	}
+	action = 1;  /* make it an insert (if it's an update).. */
     }
-    extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
-                        action == 3 ? 1 : 0 /* delete flag */,
-                        0, &sysno, 1, 1, 0);
+    res = buffer_extract_record (zh, rec_buf, rec_len,
+				 action == 3 ? 1 : 0 /* delete flag */,
+				 0, /* test mode */
+				 0, /* recordType */
+				 &sysno, 
+				 0, /* match */
+				 0, /* fname */
+			   0, /* force update */
+				 1  /* allow update */
+	);
     if (action == 1)
     {
         dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
@@ -952,26 +1280,87 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     {
         dict_delete (zh->reg->matchDict, recid_z);
     }
+    zebra_end_trans(zh);
+    return res;
+}
+
+int delete_w_handle(const char *info, void *handle)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
+    ISAM_P pos;
+    ASSERTZH;
+
+    if (*info == sizeof(pos))
+    {
+	memcpy (&pos, info+1, sizeof(pos));
+	isamb_unlink(zh->reg->isamb, pos);
+    }
     return 0;
 }
 
-void zebra_admin_create (ZebraHandle zh, const char *database)
+static int delete_SU_handle(void *handle, int ord)
 {
-    ZebraService zs;
+    ZebraHandle zh = (ZebraHandle) handle;
+    char ord_buf[20];
+    int ord_len;
 
-    if (zebra_select_database (zh, database))
-        return;
-    zebra_begin_trans (zh);
+    ord_len = key_SU_encode (ord, ord_buf);
+    ord_buf[ord_len] = '\0';
+
+    assert (zh->reg->isamb);
+    dict_delete_subtree(zh->reg->dict, ord_buf,
+			zh, delete_w_handle);
+    return 0;
+}
+
+ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
+{
+    ZEBRA_RES ret = ZEBRA_OK;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_drop_database %s", db);
+    zebra_clearError(zh);
+
+    if (zebra_select_database (zh, db) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
+    if (zebra_begin_trans (zh, 1) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
+    if (zh->reg->isamb)
+    {
+	zebraExplain_curDatabase (zh->reg->zei, db);
+	
+	zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
+	zebraExplain_removeDatabase(zh->reg->zei, zh);
+    }
+    else
+    {
+	yaz_log(YLOG_WARN, "drop database only supported for isam:b");
+	ret = ZEBRA_FAIL;
+    }
+    zebra_end_trans (zh);
+    return ret;
+}
+
+ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_create_database %s", db);
+    assert(db);
+    zebra_clearError(zh);
+
+    if (zebra_select_database (zh, db) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
+    if (zebra_begin_trans (zh, 1))
+        return ZEBRA_FAIL;
 
-    zs = zh->service;
     /* announce database */
-    if (zebraExplain_newDatabase (zh->reg->zei, database, 0 
+    if (zebraExplain_newDatabase (zh->reg->zei, db, 0 
                                   /* explainDatabase */))
     {
-	zh->errCode = 224;
-	zh->errString = "database already exist";
+        zebra_end_trans (zh);
+	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db);
+	return ZEBRA_FAIL;
     }
-    zebra_end_trans (zh);
+    return zebra_end_trans (zh);
 }
 
 int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
@@ -979,6 +1368,11 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 		       char *output_str, int output_len)
 {
     WRBUF wrbuf;
+    ASSERTZH;
+    assert(input_str);
+    assert(output_str);
+    yaz_log(log_level, "zebra_string_norm ");
+    zebra_clearError(zh);
     if (!zh->reg->zebra_maps)
 	return -1;
     wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@ -993,30 +1387,35 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
     return wrbuf_len(wrbuf);
 }
 
-
-void zebra_set_state (ZebraHandle zh, int val, int seqno)
+static void zebra_set_state (ZebraHandle zh, int val, int seqno)
 {
     char state_fname[256];
     char *fname;
     long p = getpid();
     FILE *f;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
+    zebra_clearError(zh);
 
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
     f = fopen (fname, "w");
 
-    yaz_log (LOG_DEBUG, "%c %d %ld", val, seqno, p);
+    yaz_log (YLOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p);
     fprintf (f, "%c %d %ld\n", val, seqno, p);
     fclose (f);
-    xfree (fname);
+    xfree(fname);
 }
 
-void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
+static void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
 {
     char state_fname[256];
     char *fname;
     FILE *f;
 
+    ASSERTZH;
+    yaz_log(log_level, "zebra_get_state ");
+    zebra_clearError(zh);
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
     f = fopen (fname, "r");
@@ -1028,266 +1427,406 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
         fscanf (f, "%c %d", val, seqno);
         fclose (f);
     }
-    xfree (fname);
+    xfree(fname);
 }
 
-int zebra_begin_read (ZebraHandle zh)
+ZEBRA_RES zebra_begin_read (ZebraHandle zh)
 {
-    int dirty = 0;
-    char val;
-    int seqno;
-
-    assert (zh->res);
-
-    (zh->trans_no)++;
-
-    if (zh->trans_no != 1)
-    {
-        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';
+    return zebra_begin_trans(zh, 0);
+}
 
-    if (!zh->reg)
-        dirty = 1;
-    else if (seqno != zh->reg->seqno)
-    {
-        yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d",
-                 seqno, zh->reg->seqno);
-        dirty = 1;
-    }
-    else if (zh->reg->last_val != val)
-    {
-        yaz_log (LOG_LOG, "reopen last cur/old %d/%d",
-                 val, zh->reg->last_val);
-        dirty = 1;
-    }
-    if (!dirty)
-        return 0;
+ZEBRA_RES zebra_end_read (ZebraHandle zh)
+{
+    return zebra_end_trans(zh);
+}
 
-    if (val == 'c')
-        zebra_lock_r (zh->lock_shadow);
-    else
-        zebra_lock_r (zh->lock_normal);
+static void read_res_for_transaction(ZebraHandle zh)
+{
+    const char *group = res_get(zh->res, "group");
+    const char *v;
+    /* FIXME - do we still use groups ?? */
     
-    if (zh->reg)
-        zebra_register_close (zh->service, zh->reg);
-    zh->reg = zebra_register_open (zh->service, zh->reg_name,
-                                   0, val == 'c' ? 1 : 0,
-                                   zh->res, zh->path_reg);
-    if (!zh->reg)
-    {
-        zh->errCode = 109;
-        return -1;
-    }
-    zh->reg->last_val = val;
-    zh->reg->seqno = seqno;
+    zh->m_group = group;
+    v = res_get_prefix(zh->res, "followLinks", group, "1");
+    zh->m_follow_links = atoi(v);
 
-    return 0;
-}
+    zh->m_record_id = res_get_prefix(zh->res, "recordId", group, 0);
+    zh->m_record_type = res_get_prefix(zh->res, "recordType", group, 0);
 
-void zebra_end_read (ZebraHandle zh)
-{
-    (zh->trans_no)--;
+    v = res_get_prefix(zh->res, "storeKeys", group, "1");
+    zh->m_store_keys = atoi(v);
 
-    if (zh->trans_no != 0)
-        return;
+    v = res_get_prefix(zh->res, "storeData", group, "1");
+    zh->m_store_data = atoi(v);
 
-#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));
+    v = res_get_prefix(zh->res, "explainDatabase", group, "0");
+    zh->m_explain_database = atoi(v);
 
-#endif
+    v = res_get_prefix(zh->res, "openRW", group, "1");
+    zh->m_flag_rw = atoi(v);
 
-    zebra_unlock (zh->lock_normal);
-    zebra_unlock (zh->lock_shadow);
+    v = res_get_prefix(zh->res, "fileVerboseLimit", group, "100000");
+    zh->m_file_verbose_limit = atoi(v);
 }
 
-void zebra_begin_trans (ZebraHandle zh)
+ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
 {
-    int pass;
-    int seqno = 0;
-    char val = '?';
-    const char *rval = 0;
-
-    assert (zh->res);
-
-    (zh->trans_no++);
-    if (zh->trans_no != 1)
+    ASSERTZH;
+    zebra_select_default_database(zh);
+    if (!zh->res)
     {
-        return;
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+		       "zebra_begin_trans: no database selected");
+        return ZEBRA_FAIL;
     }
-    
-    yaz_log (LOG_LOG, "zebra_begin_trans");
+    ASSERTZHRES;
+    yaz_log(log_level, "zebra_begin_trans rw=%d",rw);
 
-    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
-    
-    /* lock */
-    if (zh->shadow_enable)
-        rval = res_get (zh->res, "shadow");
+    if (zh->user_perm)
+    {
+	if (rw && !strchr(zh->user_perm, 'w'))
+	{
+	    zebra_setError(
+		zh,
+		YAZ_BIB1_ES_PERMISSION_DENIED_ON_ES_CANNOT_MODIFY_OR_DELETE,
+		0);
+	    return ZEBRA_FAIL;
+	}
+    }
 
-    for (pass = 0; pass < 2; pass++)
+    assert (zh->res);
+    if (rw)
     {
-        if (rval)
-        {
-            zebra_lock_r (zh->lock_normal);
-            zebra_lock_w (zh->lock_shadow);
-        }
-        else
-        {
-            zebra_lock_w (zh->lock_normal);
-            zebra_lock_w (zh->lock_shadow);
-        }
+        int pass;
+        int seqno = 0;
+        char val = '?';
+        const char *rval = 0;
         
-        zebra_get_state (zh, &val, &seqno);
-        if (val == 'c')
+        (zh->trans_no++);
+        if (zh->trans_w_no)
+	{
+	    read_res_for_transaction(zh);
+            return 0;
+	}
+        if (zh->trans_no != 1)
         {
-            yaz_log (LOG_LOG, "previous transaction didn't finish commit");
-            zebra_unlock (zh->lock_shadow);
-            zebra_unlock (zh->lock_normal);
-            zebra_commit (zh);
-            continue;
+	    zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+			   "zebra_begin_trans: no write trans within read");
+            return ZEBRA_FAIL;
         }
-        else if (val == 'd')
+        if (zh->reg)
+	{
+            resultSetInvalidate (zh);
+            zebra_register_close (zh->service, zh->reg);
+	}
+        zh->trans_w_no = zh->trans_no;
+
+	zebra_clearError(zh);
+        
+        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
+        /* lock */
+        if (zh->shadow_enable)
+            rval = res_get (zh->res, "shadow");
+        
+        for (pass = 0; pass < 2; pass++)
         {
             if (rval)
             {
-                BFiles bfs = bfs_create (res_get (zh->res, "shadow"),
-                                         zh->path_reg);
-                yaz_log (LOG_LOG, "previous transaction didn't reach commit");
-                bf_commitClean (bfs, rval);
-                bfs_destroy (bfs);
+                zebra_lock_r (zh->lock_normal);
+                zebra_lock_w (zh->lock_shadow);
             }
             else
             {
-                yaz_log (LOG_WARN, "your previous transaction didn't finish");
+                zebra_lock_w (zh->lock_normal);
+                zebra_lock_w (zh->lock_shadow);
             }
+            
+            zebra_get_state (zh, &val, &seqno);
+            if (val == 'c')
+            {
+                yaz_log (YLOG_WARN, "previous transaction didn't finish commit");
+                zebra_unlock (zh->lock_shadow);
+                zebra_unlock (zh->lock_normal);
+                zebra_commit (zh);
+                continue;
+            }
+            else if (val == 'd')
+            {
+                if (rval)
+                {
+                    BFiles bfs = bfs_create (res_get (zh->res, "shadow"),
+                                             zh->path_reg);
+                    yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
+                    bf_commitClean (bfs, rval);
+                    bfs_destroy (bfs);
+            }
+                else
+                {
+                    yaz_log (YLOG_WARN, "your previous transaction didn't finish");
+                }
+            }
+            break;
+        }
+        if (pass == 2)
+        {
+            yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit");
+            abort();
+            return ZEBRA_FAIL;
+        }
+        zebra_set_state (zh, 'd', seqno);
+        
+        zh->reg = zebra_register_open (zh->service, zh->reg_name,
+                                       1, rval ? 1 : 0, zh->res,
+                                       zh->path_reg);
+        if (zh->reg)
+            zh->reg->seqno = seqno;
+        else
+        {
+            zebra_set_state (zh, 'o', seqno);
+            
+            zebra_unlock (zh->lock_shadow);
+            zebra_unlock (zh->lock_normal);
+
+            zh->trans_no--;
+            zh->trans_w_no = 0;
+
+	    zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+			   "zebra_begin_trans: cannot open register");
+            yaz_log(YLOG_FATAL, "%s", zh->errString);
+            return ZEBRA_FAIL;
         }
-        break;
     }
-    if (pass == 2)
+    else
     {
-        yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit");
-        abort();
-        return;
+        int dirty = 0;
+        char val;
+        int seqno;
+        
+        (zh->trans_no)++;
+        
+        if (zh->trans_no != 1)
+        {
+            zebra_flush_reg (zh);
+            return ZEBRA_OK;
+        }
+	zebra_clearError(zh);
+#if HAVE_SYS_TIMES_H
+        times (&zh->tms1);
+#endif
+        if (!zh->res)
+        {
+            (zh->trans_no)--;
+            zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            return ZEBRA_FAIL;
+        }
+        if (!zh->lock_normal || !zh->lock_shadow)
+        {
+            (zh->trans_no)--;
+            zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+            return ZEBRA_FAIL;
+        }
+        zebra_get_state (zh, &val, &seqno);
+        if (val == 'd')
+            val = 'o';
+        
+        if (!zh->reg)
+            dirty = 1;
+        else if (seqno != zh->reg->seqno)
+        {
+            yaz_log (YLOG_DEBUG, "reopen seqno cur/old %d/%d",
+                     seqno, zh->reg->seqno);
+            dirty = 1;
+        }
+        else if (zh->reg->last_val != val)
+        {
+            yaz_log (YLOG_DEBUG, "reopen last cur/old %d/%d",
+                     val, zh->reg->last_val);
+            dirty = 1;
+        }
+        if (!dirty)
+            return ZEBRA_OK;
+        
+        if (val == 'c')
+            zebra_lock_r (zh->lock_shadow);
+        else
+            zebra_lock_r (zh->lock_normal);
+        
+        if (zh->reg)
+	{
+            resultSetInvalidate (zh);
+            zebra_register_close (zh->service, zh->reg);
+	}
+        zh->reg = zebra_register_open (zh->service, zh->reg_name,
+                                       0, val == 'c' ? 1 : 0,
+                                       zh->res, zh->path_reg);
+        if (!zh->reg)
+        {
+            zebra_unlock (zh->lock_normal);
+            zebra_unlock (zh->lock_shadow);
+            zh->trans_no--;
+            zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            return ZEBRA_FAIL;
+        }
+        zh->reg->last_val = val;
+        zh->reg->seqno = seqno;
     }
-    zebra_set_state (zh, 'd', seqno);
-
-    zh->reg = zebra_register_open (zh->service, zh->reg_name,
-                                   1, rval ? 1 : 0, zh->res,
-                                   zh->path_reg);
+    read_res_for_transaction(zh);
+    return ZEBRA_OK;
+}
 
-    zh->reg->seqno = seqno;
+ZEBRA_RES zebra_end_trans (ZebraHandle zh)
+{
+    ZebraTransactionStatus dummy;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_end_trans");
+    return zebra_end_transaction(zh, &dummy);
 }
 
-void zebra_end_trans (ZebraHandle zh)
+ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
 {
     char val;
     int seqno;
     const char *rval;
 
-    zh->trans_no--;
-    if (zh->trans_no != 0)
-        return;
+    ASSERTZH;
+    assert(status);
+    yaz_log(log_level, "zebra_end_transaction");
 
-    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;
+    status->processed = 0;
+    status->inserted  = 0;
+    status->updated   = 0;
+    status->deleted   = 0;
+    status->utime     = 0;
+    status->stime     = 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')
+    if (!zh->res || !zh->reg)
     {
-        BFiles bfs = bfs_create (rval, zh->path_reg);
-        yaz_log (LOG_LOG, "deleting shadow stuff val=%c", val);
-        bf_commitClean (bfs, rval);
-        bfs_destroy (bfs);
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+		       "zebra_end_trans: no open transaction");
+        return ZEBRA_FAIL;
     }
-    if (!rval)
-        seqno++;
-    zebra_set_state (zh, 'o', seqno);
+    if (zh->trans_no != zh->trans_w_no)
+    {
+        zh->trans_no--;
+        if (zh->trans_no != 0)
+            return ZEBRA_OK;
 
-    zebra_unlock (zh->lock_shadow);
-    zebra_unlock (zh->lock_normal);
+        /* release read lock */
 
+        zebra_unlock (zh->lock_normal);
+        zebra_unlock (zh->lock_shadow);
+    }
+    else
+    {   /* release write lock */
+        zh->trans_no--;
+        zh->trans_w_no = 0;
+        
+        yaz_log (YLOG_DEBUG, "zebra_end_trans");
+        rval = res_get (zh->res, "shadow");
+        
+        zebraExplain_runNumberIncrement (zh->reg->zei, 1);
+        
+        zebra_flush_reg (zh);
+        
+        resultSetInvalidate (zh);
+
+        zebra_register_close (zh->service, zh->reg);
+        zh->reg = 0;
+        
+        yaz_log (YLOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+			ZINT_FORMAT"/"ZINT_FORMAT"/"ZINT_FORMAT, 
+                 zh->records_processed, zh->records_inserted,
+                 zh->records_updated, zh->records_deleted);
+        
+        status->processed = (int) zh->records_processed;
+        status->inserted = (int) zh->records_inserted;
+        status->updated = (int) zh->records_updated;
+        status->deleted = (int) zh->records_deleted;
+        
+        zebra_get_state (zh, &val, &seqno);
+        if (val != 'd')
+        {
+            BFiles bfs = bfs_create (rval, zh->path_reg);
+            yaz_log (YLOG_DEBUG, "deleting shadow val=%c", val);
+            bf_commitClean (bfs, rval);
+            bfs_destroy (bfs);
+        }
+        if (!rval)
+            seqno++;
+        zebra_set_state (zh, 'o', seqno);
+        
+        zebra_unlock (zh->lock_shadow);
+        zebra_unlock (zh->lock_normal);
+        
+    }
 #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));
-
+    yaz_log (log_level, "user/system: %ld/%ld",
+          (long) (zh->tms2.tms_utime - zh->tms1.tms_utime),
+          (long) (zh->tms2.tms_stime - zh->tms1.tms_stime));
+    
+    status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime);
+    status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime);
 #endif
+    return ZEBRA_OK;
 }
 
-void zebra_repository_update (ZebraHandle zh)
+int zebra_repository_update (ZebraHandle zh, const char *path)
 {
-    logf (LOG_LOG, "updating %s", zh->rGroup.path);
-    repositoryUpdate (zh);    
+    ASSERTZH;
+    assert(path);
+    zebra_clearError(zh);
+    yaz_log (log_level, "updating %s", path);
+    repositoryUpdate (zh, path);
+    return zh->errCode;
 }
 
-void zebra_repository_delete (ZebraHandle zh)
+int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
-    logf (LOG_LOG, "deleting %s", zh->rGroup.path);
-    repositoryDelete (zh);
+    ASSERTZH;
+    assert(path);
+    zebra_clearError(zh);
+    yaz_log (log_level, "deleting %s", path);
+    repositoryDelete (zh, path);
+    return zh->errCode;
 }
 
-void zebra_repository_show (ZebraHandle zh)
+int zebra_repository_show (ZebraHandle zh, const char *path)
 {
-    repositoryShow (zh);
+    ASSERTZH;
+    assert(path);
+    yaz_log(log_level, "zebra_repository_show");
+    zebra_clearError(zh);
+    repositoryShow (zh, path);
+    return zh->errCode;
 }
 
-int zebra_commit (ZebraHandle zh)
+static int zebra_commit_ex(ZebraHandle zh, int clean_only)
 {
     int seqno;
     char val;
     const char *rval;
     BFiles bfs;
+    ASSERTZH;
+    zebra_clearError(zh);
 
+    zebra_select_default_database(zh);
     if (!zh->res)
     {
-        zh->errCode = 109;
+        zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
         return -1;
     }
     rval = res_get (zh->res, "shadow");    
     if (!rval)
     {
-        logf (LOG_WARN, "Cannot perform commit");
-        logf (LOG_WARN, "No shadow area defined");
+        yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
         return 0;
     }
 
@@ -1302,21 +1841,26 @@ int zebra_commit (ZebraHandle zh)
         bf_cache (bfs, rval);
     if (bf_commitExists (bfs))
     {
-        zebra_set_state (zh, 'c', seqno);
-
-        logf (LOG_LOG, "commit start");
-        bf_commitExec (bfs);
+        if (clean_only)
+            zebra_set_state (zh, 'd', seqno);
+        else
+        {
+            zebra_set_state (zh, 'c', seqno);
+            
+            yaz_log (YLOG_DEBUG, "commit start");
+            bf_commitExec (bfs);
 #ifndef WIN32
-        sync ();
+            sync ();
 #endif
-        logf (LOG_LOG, "commit clean");
+        }
+        yaz_log (YLOG_DEBUG, "commit clean");
         bf_commitClean (bfs, rval);
         seqno++;
         zebra_set_state (zh, 'o', seqno);
     }
     else
     {
-        logf (LOG_LOG, "nothing to commit");
+        yaz_log (log_level, "nothing to commit");
     }
     bfs_destroy (bfs);
 
@@ -1325,90 +1869,400 @@ int zebra_commit (ZebraHandle zh)
     return 0;
 }
 
-int zebra_init (ZebraHandle zh)
+ZEBRA_RES zebra_clean(ZebraHandle zh)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_clean");
+    return zebra_commit_ex(zh, 1);
+}
+
+ZEBRA_RES zebra_commit(ZebraHandle zh)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_commit");
+    return zebra_commit_ex(zh, 0);
+}
+
+ZEBRA_RES zebra_init(ZebraHandle zh)
 {
     const char *rval;
     BFiles bfs = 0;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_init");
+    zebra_clearError(zh);
 
+    zebra_select_default_database(zh);
     if (!zh->res)
     {
-        zh->errCode = 109;
-        return -1;
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+		       "cannot select default database");
+	return ZEBRA_FAIL;
     }
     rval = res_get (zh->res, "shadow");
 
-    bfs = bfs_create (res_get (zh->service->global_res, "register"),
-                      zh->path_reg);
+    bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
+    if (!bfs)
+    {
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "bfs_create");
+	return ZEBRA_FAIL;
+    }
     if (rval && *rval)
         bf_cache (bfs, rval);
     
     bf_reset (bfs);
     bfs_destroy (bfs);
     zebra_set_state (zh, 'o', 0);
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_compact (ZebraHandle zh)
+ZEBRA_RES zebra_compact(ZebraHandle zh)
 {
     BFiles bfs;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_compact");
+    zebra_clearError(zh);
     if (!zh->res)
     {
-        zh->errCode = 109;
-        return -1;
+        zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+        return ZEBRA_FAIL;
     }
     bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
     inv_compact (bfs);
     bfs_destroy (bfs);
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
+void zebra_result(ZebraHandle zh, int *code, char **addinfo)
 {
-    int sysno = 0;
-    zebra_begin_trans (zh);
-    extract_rec_in_mem (zh, "grs.sgml",
-                        buf, len,
-                        "Default",  /* database */
-                        0 /* delete_flag */,
-                        0 /* test_mode */,
-                        &sysno /* sysno */,
-                        1 /* store_keys */,
-                        1 /* store_data */,
-                        0 /* match criteria */);
-    zebra_end_trans (zh);
-    return sysno;
+    ASSERTZH;
+    yaz_log(log_level, "zebra_result");
+    *code = zh->errCode;
+    *addinfo = zh->errString;
 }
 
-void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
+void zebra_shadow_enable(ZebraHandle zh, int value)
 {
-    memcpy (&zh->rGroup, rg, sizeof(*rg));
+    ASSERTZH;
+    yaz_log(log_level, "zebra_shadow_enable");
+    zebra_clearError(zh);
+    zh->shadow_enable = value;
 }
 
-void zebra_result (ZebraHandle zh, int *code, char **addinfo)
+ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 {
-    *code = zh->errCode;
-    *addinfo = zh->errString;
+    ASSERTZH;
+    assert(encoding);
+    yaz_log(log_level, "zebra_octet_term_encoding");
+    zebra_clearError(zh);
+
+    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);
+    
+    zh->iconv_to_utf8 =
+        yaz_iconv_open ("UTF-8", encoding);
+    if (zh->iconv_to_utf8 == 0)
+        yaz_log (YLOG_WARN, "iconv: %s to UTF-8 unsupported", encoding);
+    zh->iconv_from_utf8 =
+        yaz_iconv_open (encoding, "UTF-8");
+    if (zh->iconv_to_utf8 == 0)
+        yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding);
+
+    return ZEBRA_OK;
 }
 
-void zebra_shadow_enable (ZebraHandle zh, int value)
+ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
+    ASSERTZH;
+    yaz_log(log_level, "zebra_record_encoding");
+    zebra_clearError(zh);
+    xfree(zh->record_encoding);
+    zh->record_encoding = 0;
+    if (encoding)
+	zh->record_encoding = xstrdup (encoding);
+    return ZEBRA_OK;
+}
+
+void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
+{
+    ASSERTZH;
+    assert(name);
+    assert(value);
+    yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+    zebra_clearError(zh);
+    res_set(zh->res, name, value);
+}
+
+const char *zebra_get_resource(ZebraHandle zh,
+                               const char *name, const char *defaultvalue)
+{
+    const char *v;
+    ASSERTZH;
+    assert(name);
+    assert(defaultvalue);
+    v = res_get_def (zh->res, name, (char *)defaultvalue);
+    zebra_clearError(zh);
+    yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
+    return v;
+}
+
+/* moved from zebra_api_ext.c by pop */
+/* FIXME: Should this really be public??? -Heikki */
+
+int zebra_trans_no (ZebraHandle zh)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_trans_no");
+    return zh->trans_no;
+}
+
+int zebra_get_shadow_enable (ZebraHandle zh)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_get_shadow_enable");
+    return zh->shadow_enable;
+}
+
+void zebra_set_shadow_enable (ZebraHandle zh, int value)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_set_shadow_enable %d",value);
     zh->shadow_enable = value;
 }
 
-int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
+   so that it's identicical to the original api_records_retrieve */
+void api_records_retrieve (ZebraHandle zh, ODR stream,
+			   const char *setname, Z_RecordComposition *comp,
+			   oid_value input_format, int num_recs,
+			   ZebraRetrievalRecord *recs)
+{
+    zebra_records_retrieve(zh, stream, setname, comp, input_format,
+			   num_recs, recs);
+}
+
+/* ---------------------------------------------------------------------------
+  Record insert(=update), delete 
+
+  If sysno is provided, then it's used to identify the record.
+  If not, and match_criteria is provided, then sysno is guessed
+  If not, and a record is provided, then sysno is got from there
+NOTE: Now returns 0 at success and updates sysno, which is an int*
+  20-jun-2003 Heikki
+*/
+
+int zebra_add_record(ZebraHandle zh,
+		     const char *buf, int buf_size)
+{
+    SYSNO sysno = 0;
+    return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
+}
+
+ZEBRA_RES zebra_insert_record (ZebraHandle zh, 
+			       const char *recordType,
+			       SYSNO *sysno, const char *match,
+			       const char *fname,
+			       const char *buf, int buf_size, int force_update)
+{
+    ZEBRA_RES res;
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+    yaz_log(log_level, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
+
+    if (buf_size < 1)
+	buf_size = strlen(buf);
+
+    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
+    res = buffer_extract_record (zh, buf, buf_size, 
+				 0, /* delete_flag  */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,   
+				 match, fname,
+				 0, 
+				 0); /* allow_update */
+    zebra_end_trans(zh); 
+    return res; 
+}
+
+ZEBRA_RES zebra_update_record (ZebraHandle zh, 
+			       const char *recordType,
+			       SYSNO* sysno, const char *match,
+			       const char *fname,
+			       const char *buf, int buf_size,
+			       int force_update)
+{
+    ZEBRA_RES res;
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+
+    yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
+
+    if (buf_size < 1) buf_size = strlen(buf);
+
+    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
+    res = buffer_extract_record (zh, buf, buf_size, 
+				 0, /* delete_flag */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,   
+				 match, fname,
+				 force_update, 
+				 1); /* allow_update */
+    zebra_end_trans(zh); 
+    return res; 
+}
+
+ZEBRA_RES zebra_delete_record (ZebraHandle zh, 
+			       const char *recordType,
+			       SYSNO *sysno, const char *match,
+			       const char *fname,
+			       const char *buf, int buf_size,
+			       int force_update) 
+{
+    ZEBRA_RES res;
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+    yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+
+    if (buf_size < 1) buf_size = strlen(buf);
+
+    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
+    res = buffer_extract_record (zh, buf, buf_size,
+				 1, /* delete_flag */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,
+				 match,fname,
+				 force_update,
+				 1); /* allow_update */
+    zebra_end_trans(zh);
+    return res;
+}
+
+/* ---------------------------------------------------------------------------
+  Searching 
+*/
+
+ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query,
+			   const char *setname, zint *hits)
 {
-    xfree (zh->record_encoding);
-    zh->record_encoding = xstrdup (encoding);
+    zint lhits = 0;
+    ZEBRA_RES res = ZEBRA_OK;
+    Z_RPNQuery *query;
+    ODR odr = odr_createmem(ODR_ENCODE);
+    ASSERTZH;
+    assert(pqf_query);
+    assert(setname);
+
+    yaz_log(log_level, "zebra_search_PQF s=%s q=%s", setname, pqf_query);
+    
+    query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
+    
+    if (!query)
+    {
+        yaz_log (YLOG_WARN, "bad query %s\n", pqf_query);
+	zh->errCode = YAZ_BIB1_MALFORMED_QUERY;
+	res = ZEBRA_FAIL;
+    }
+    else
+        res = zebra_search_RPN(zh, odr, query, setname, &lhits);
+    
+    odr_destroy(odr);
+
+    yaz_log(log_level, "Hits: " ZINT_FORMAT, lhits);
+
+    if (hits)
+	*hits = lhits;
+
+    return res;
+}
+
+/* ---------------------------------------------------------------------------
+  Sort - a simplified interface, with optional read locks.
+*/
+int zebra_sort_by_specstr (ZebraHandle zh, ODR stream,
+			   const char *sort_spec,
+			   const char *output_setname,
+			   const char **input_setnames) 
+{
+    int num_input_setnames = 0;
+    int sort_status = 0;
+    Z_SortKeySpecList *sort_sequence;
+    ASSERTZH;
+    assert(stream);
+    assert(sort_spec);
+    assert(output_setname);
+    assert(input_setnames);
+    sort_sequence = yaz_sort_spec (stream, sort_spec);
+    yaz_log(log_level, "sort (FIXME) ");
+    if (!sort_sequence)
+    {
+        yaz_log(YLOG_WARN, "invalid sort specs '%s'", sort_spec);
+        zh->errCode = YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE;
+	return -1;
+    }
+    
+    /* we can do this, since the perl typemap code for char** will 
+       put a NULL at the end of list */
+    while (input_setnames[num_input_setnames]) num_input_setnames++;
+
+    if (zebra_begin_read (zh))
+        return -1;
+    
+    resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
+                   output_setname, sort_sequence, &sort_status);
+    
+    zebra_end_read(zh);
+    return sort_status;
+}
+
+/* ---------------------------------------------------------------------------
+  Get BFS for Zebra system (to make alternative storage methods)
+*/
+struct BFiles_struct *zebra_get_bfs(ZebraHandle zh)
+{
+    if (zh && zh->reg)
+	return zh->reg->bfs;
     return 0;
 }
 
-void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
+
+/* ---------------------------------------------------------------------------
+  Set limit for search/scan
+*/
+ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
 {
-    res_put(zh->res, name, value);
+    ASSERTZH;
+    zebra_limit_destroy(zh->m_limit);
+    zh->m_limit = zebra_limit_create(complement_flag, ids);
+    return ZEBRA_OK;
 }
 
-const char *zebra_get_resource(ZebraHandle zh,
-		                const char *name, const char *defaultvalue)
+/*
+  Set Error code + addinfo
+*/
+void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
 {
-    return res_get_def( zh->res, name, (char *)defaultvalue);
+    zh->errCode = code;
+    nmem_reset(zh->nmem_error);
+    zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
 }
+
+void zebra_setError_zint(ZebraHandle zh, int code, zint i)
+{
+    char vstr[60];
+    sprintf(vstr, ZINT_FORMAT, i);
+
+    zh->errCode = code;
+    nmem_reset(zh->nmem_error);
+    zh->errString = nmem_strdup(zh->nmem_error, vstr);
+}
+