X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=d419085e21b8e5653ab69d0650d12c8b90d78423;hb=593927cb1897c1e3163c284448eff7fee6ddad51;hp=8c49ad379927d9028d400cce0417c08d73d10e5c;hpb=a9e90f22d2cefbafc9d490a03a3bc7d1b75d57ee;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 8c49ad3..d419085 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.154 2005-03-09 12:14:42 adam Exp $
+/* $Id: zebraapi.c,v 1.192 2005-10-28 07:25:30 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -27,7 +27,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <io.h>
 #include <process.h>
 #include <direct.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -38,6 +39,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <charmap.h>
 #include <idzebra/api.h>
 
+#define DEFAULT_APPROX_LIMIT 2000000000
+
 /* simple asserts to validate the most essential input args */
 #define ASSERTZH assert(zh && zh->service)
 #define ASSERTZHRES assert(zh && zh->service && zh->res)
@@ -46,8 +49,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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_open_res(ZebraHandle zh);
+static void zebra_close_res(ZebraHandle zh);
 
 static void zebra_chdir (ZebraService zs)
 {
@@ -69,21 +72,21 @@ static void zebra_flush_reg (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_flush_reg");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     zebraExplain_flush (zh->reg->zei, zh);
     
     extract_flushWriteKeys (zh, 1 /* final */);
     zebra_index_merge (zh );
 }
 
-static struct zebra_register *zebra_register_open (ZebraService zs, 
-                                                   const char *name,
-                                                   int rw, int useshadow,
-                                                   Res res,
-                                                   const char *reg_path);
+static struct zebra_register *zebra_register_open(ZebraService zs, 
+						  const char *name,
+						  int rw, int useshadow,
+						  Res res,
+						  const char *reg_path);
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
 
-ZebraHandle zebra_open (ZebraService zs)
+ZebraHandle zebra_open(ZebraService zs, Res res)
 {
     ZebraHandle zh;
     const char *default_encoding;
@@ -108,13 +111,16 @@ ZebraHandle zebra_open (ZebraService zs)
     zh->errCode = 0;
     zh->errString = 0;
     zh->res = 0; 
+    zh->session_res = res_open(zs->global_res, res);
     zh->user_perm = 0;
+    zh->dbaccesslist = 0;
 
     zh->reg_name = xstrdup ("");
     zh->path_reg = 0;
     zh->num_basenames = 0;
     zh->basenames = 0;
 
+    zh->approx_limit = DEFAULT_APPROX_LIMIT;
     zh->trans_no = 0;
     zh->trans_w_no = 0;
 
@@ -122,8 +128,9 @@ ZebraHandle zebra_open (ZebraService zs)
     zh->lock_shadow = 0;
 
     zh->shadow_enable = 1;
+    zh->m_staticrank = 0;
 
-    default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
+    default_encoding = res_get_def(zh->session_res, "encoding", "ISO-8859-1");
 
     zh->iconv_to_utf8 =
         yaz_iconv_open ("UTF-8", default_encoding);
@@ -145,6 +152,12 @@ 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;
 }
 
@@ -162,34 +175,56 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
         log_level = yaz_log_module_level("zebraapi");
         log_level_initialized = 1;
     }
+    
+    yaz_log(YLOG_LOG, "zebra_start %s %s", ZEBRAVER,
+	    configName ? configName : "");
 
-    yaz_log(log_level, "zebra_start %s",configName);
-    assert(configName);
-
-    if ((res = res_open (configName, def_res, over_res)))
+    if ((res = res_open(def_res, over_res)))
     {
+	const char *passwd_plain = 0;
+	const char *passwd_encrypt = 0;
+	const char *dbaccess = 0;
         ZebraService zh = xmalloc(sizeof(*zh));
 
-	yaz_log (YLOG_DEBUG, "Read resources `%s'", configName);
-        
+	if (configName)
+	    res_read_file(res, configName);
+
         zh->global_res = res;
-        zh->configName = xstrdup(configName);
         zh->sessions = 0;
         
         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");
+	dbaccess = res_get (zh->global_res, "dbaccess");
+
+        if (!passwd_plain && !passwd_encrypt)
             zh->passwd_db = NULL;
-        else
+        else 
         {
-            zh->passwd_db = passwd_db_open ();
+            zh->passwd_db = passwd_db_open();
             if (!zh->passwd_db)
                 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);
+	    }
         }
+
+	if (!dbaccess)
+	    zh->dbaccess = NULL;
+	else {
+	    zh->dbaccess = res_open(NULL, NULL);
+	    if (res_read_file(zh->dbaccess, dbaccess) != ZEBRA_OK) {
+		yaz_log(YLOG_FATAL, "Failed to read %s", dbaccess);
+		return NULL;
+	    }
+	}
+
         zh->path_root = res_get (zh->global_res, "root");
 	zh->nmem = nmem_create();
 	zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
@@ -218,26 +253,20 @@ Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
 {
     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);
+    if (res_get_int(res, resource_str, &page_size) == ZEBRA_OK)
 	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,
-                                            const char *reg_path)
+struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
+					   int rw, int useshadow, Res res,
+					   const char *reg_path)
 {
     struct zebra_register *reg;
     int record_compression = REC_COMPRESS_NONE;
@@ -262,15 +291,27 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     
     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"));
+    {
+        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);
@@ -285,12 +326,19 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->key_buf = 0;
 
+#if NEW_REC_KEYS
+    reg->keys = zebra_rec_keys_open();
+#else
     reg->keys.buf_max = 0;
     reg->keys.buf = 0;
     reg->keys.codec_handle = iscz1_start();
+#endif
 
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
+#if NATTR
+    reg->sortKeys.codec_handle = iscz1_start();
+#endif
 
     reg->records = 0;
     reg->dict = 0;
@@ -304,8 +352,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->key_file_no = 0;
     reg->ptr_i = 0;
     
-    zebraRankInstall (reg, rank1_class);
-    zebraRankInstall (reg, rankzv_class);
+    zebraRankInstall (reg, rank_1_class);
+    zebraRankInstall (reg, rank_zv_class);
+    zebraRankInstall (reg, rank_static_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -345,10 +394,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     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))))
 	{
-	    yaz_log (YLOG_WARN, "isc_open failed");
+	    yaz_log (YLOG_WARN, "isamc_open failed");
 	    return 0;
 	}
     }
@@ -398,28 +447,28 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     return reg;
 }
 
-int zebra_admin_shutdown (ZebraHandle zh)
+ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_shutdown");
-    zh->errCode = 0;
+    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 0;
+    return ZEBRA_OK;
 }
 
-int zebra_admin_start (ZebraHandle zh)
+ZEBRA_RES zebra_admin_start (ZebraHandle zh)
 {
     ZebraService zs;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_start");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
-    return 0;
+    return ZEBRA_OK;
 }
 
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
@@ -439,7 +488,7 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 	if (reg->isams)
 	    isams_close (reg->isams);
         if (reg->isamc)
-            isc_close (reg->isamc);
+            isamc_close (reg->isamc);
         if (reg->isamb)
             isamb_close (reg->isamb);
         rec_close (&reg->records);
@@ -452,18 +501,27 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     data1_destroy (reg->dh);
 
     xfree(reg->sortKeys.buf);
+#if NEW_REC_KEYS
+    zebra_rec_keys_close(reg->keys);
+#else
     xfree(reg->keys.buf);
     if (reg->keys.codec_handle)
 	iscz1_stop(reg->keys.codec_handle);
+#if NATTR
+    if (reg->sortKeys.codec_handle)
+	iscz1_stop(reg->sortKeys.codec_handle);
+#endif
+#endif
+
     xfree(reg->key_buf);
     xfree(reg->name);
     xfree(reg);
 }
 
-int zebra_stop(ZebraService zs)
+ZEBRA_RES zebra_stop(ZebraService zs)
 {
     if (!zs)
-        return 0;
+        return ZEBRA_OK;
     yaz_log (log_level, "zebra_stop");
 
     while (zs->sessions)
@@ -479,12 +537,11 @@ int zebra_stop(ZebraService zs)
     recTypeClass_destroy(zs->record_classes);
     nmem_destroy(zs->nmem);
     res_close (zs->global_res);
-    xfree(zs->configName);
     xfree(zs);
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close (ZebraHandle zh)
 {
     ZebraService zs;
     struct zebra_session **sp;
@@ -492,7 +549,7 @@ int zebra_close (ZebraHandle zh)
 
     yaz_log(log_level, "zebra_close");
     if (!zh)
-        return 0;
+        return ZEBRA_OK;
     ASSERTZH;
     zh->errCode = 0;
     
@@ -503,9 +560,12 @@ int zebra_close (ZebraHandle zh)
     if (zh->reg)
         zebra_register_close (zh->service, zh->reg);
     zebra_close_res (zh);
+    res_close(zh->session_res);
 
     xfree(zh->record_encoding);
 
+    xfree(zh->dbaccesslist);
+
     for (i = 0; i < zh->num_basenames; i++)
         xfree(zh->basenames[i]);
     xfree(zh->basenames);
@@ -533,9 +593,14 @@ int zebra_close (ZebraHandle 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 0;
+    return ZEBRA_OK;
 }
 
 struct map_baseinfo {
@@ -548,47 +613,43 @@ struct map_baseinfo {
     int new_num_max;
 };
 
-static Res zebra_open_res (ZebraHandle zh)
+static void 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, 0);
-        if (!res)
-            res = zh->service->global_res;
+        sprintf(fname, "%.200s/zebra.cfg", zh->path_reg);
+        zh->res = res_open(zh->session_res, 0);
+	res_read_file(zh->res, fname);
     }
     else if (*zh->reg_name == 0)
     {
-        res = zh->service->global_res;
+        zh->res = res_open(zh->session_res, 0);
     }
     else
     {
         yaz_log (YLOG_WARN, "no register root specified");
-        return 0;  /* no path for register - fail! */
+        zh->res = 0;  /* no path for register - fail! */
     }
-    return res;
 }
 
 static void zebra_close_res (ZebraHandle zh)
 {
     ASSERTZH;
     zh->errCode = 0;
-    if (zh->res != zh->service->global_res)
-        res_close (zh->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);
@@ -620,7 +681,7 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
             strcat (zh->path_reg, zh->reg_name);
         }
     }
-    zh->res = zebra_open_res (zh);
+    zebra_open_res(zh);
     
     if (zh->lock_normal)
         zebra_lock_destroy (zh->lock_normal);
@@ -633,7 +694,7 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
     if (zh->res)
     {
         char fname[512];
-        const char *lock_area  =res_get (zh->res, "lockDir");
+        const char *lock_area = res_get (zh->res, "lockDir");
         
         if (!lock_area && zh->path_reg)
             res_set (zh->res, "lockDir", zh->path_reg);
@@ -645,8 +706,34 @@ 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);
+	}
+    }
+    if (zh->res)
+    {
+	int approx = 0;
+	if (res_get_int(zh->res, "estimatehits", &approx) == ZEBRA_OK)
+	    zebra_set_approx_limit(zh, approx);
+    }
+    if (zh->res)
+    {
+	if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
+	    yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
+	else
+	    yaz_log(YLOG_LOG, "static rank unset");
     }
-    return 1;
 }
 
 void map_basenames_func (void *vp, const char *name, const char *value)
@@ -688,10 +775,10 @@ int zebra_select_default_database(ZebraHandle zh)
 	/* 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,
+	const char *group = res_get(zh->session_res, "group");
+	const char *v = res_get_prefix(zh->session_res,
 				       "database", group, "Default");
-	zebra_select_database(zh, v);
+	return zebra_select_database(zh, v);
     }
     return 0;
 }
@@ -706,8 +793,6 @@ void map_basenames (ZebraHandle zh, ODR stream,
     yaz_log(log_level, "map_basenames ");
     assert(stream);
 
-    zh->errCode = 0;
-
     info.zh = zh;
 
     info.num_bases = *num_bases;
@@ -718,7 +803,7 @@ void map_basenames (ZebraHandle zh, ODR stream,
 	odr_malloc (stream, sizeof(*info.new_basenames) * info.new_num_max);
     info.mem = stream->mem;
 
-    res_trav (zh->service->global_res, "mapdb", &info, map_basenames_func);
+    res_trav (zh->session_res, "mapdb", &info, map_basenames_func);
     
     for (i = 0; i<p->num_bases; i++)
 	if (p->basenames[i] && p->new_num_bases < p->new_num_max)
@@ -732,17 +817,16 @@ void map_basenames (ZebraHandle zh, ODR stream,
 	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);
-    zh->errCode = 0;
     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;
@@ -757,9 +841,35 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     
     if (num_bases < 1)
     {
-        zh->errCode = 23;
-        return -1;
+        zh->errCode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
+        return ZEBRA_FAIL;
+    }
+
+    /* Check if the user has access to all databases (Seb) */
+    /* You could argue that this should happen later, after we have
+     * determined that the database(s) exist. */
+    if (zh->dbaccesslist) {
+	for (i = 0; i < num_bases; i++) {
+	    const char *db = basenames[i];
+	    char *p, *pp;
+	    for (p = zh->dbaccesslist; p && *p; p = pp) {
+		int len;
+		if ((pp = strchr(p, '+'))) {
+		    len = pp - p;
+		    pp++;
+		}
+		else
+		    len = strlen(p);
+		if (len == strlen(db) && !strncmp(db, p, len))
+		    break;
+	    }
+	    if (!p) {
+		zh->errCode = YAZ_BIB1_ACCESS_TO_SPECIFIED_DATABASE_DENIED;
+		return ZEBRA_FAIL;
+	    }
+	}
     }
+
     for (i = 0; i < zh->num_basenames; i++)
         xfree(zh->basenames[i]);
     xfree(zh->basenames);
@@ -788,13 +898,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;
             }
         }
@@ -802,8 +912,8 @@ 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;
             }
         }
     }
@@ -811,64 +921,58 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     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;
 }
 
-int zebra_search_RPN (ZebraHandle zh, ODR o,
-		       Z_RPNQuery *query, const char *setname, zint *hits)
+ZEBRA_RES zebra_set_approx_limit(ZebraHandle zh, zint approx_limit)
 {
-    const char *max;
-    zint maxhits;
+    if (approx_limit == 0)
+	approx_limit = DEFAULT_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");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     zh->hits = 0;
     *hits = 0;
 
-    if (zebra_begin_read (zh))
-	return 1;
+    if (zebra_begin_read(zh) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
 
-    resultSetAddRPN (zh, odr_extract_mem(o), query, 
-                     zh->num_basenames, zh->basenames, setname);
-
-    zebra_end_read (zh);
-    max = res_get (zh->res, "maxhits");
-    if (max)
-	maxhits = atoi(max);
-    else {
-        int i = 0; 
-	maxhits = INT_MAX;  /* properly rounded, to make it look like a limit*/
-	while (maxhits>100) { maxhits/=10; i++;}
-	while (i--) maxhits *= 10;
-    }
-    if (zh->hits > maxhits) { /* too large for yaz to handle */
-        yaz_log(YLOG_DEBUG, "limiting hits to "ZINT_FORMAT, maxhits);
-	*hits = maxhits;  
-    }
-    else
-        *hits = zh->hits;
-    return 0;
+    r = resultSetAddRPN(zh, odr_extract_mem(o), query, 
+			zh->num_basenames, zh->basenames, setname);
+    zebra_end_read(zh);
+    *hits = zh->hits;
+    return r;
 }
 
-int 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)
 {
     ZebraMetaRecord *poset;
-    int i, ret = 0;
+    int i;
+    ZEBRA_RES ret = ZEBRA_OK;
     zint *pos_array;
     ASSERTZH;
     assert(stream);
@@ -876,20 +980,18 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     assert(recs);
     assert(num_recs>0);
 
-    yaz_log(log_level, "zebra_records_retrieve n=%d",num_recs);
-    zh->errCode = 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 -1;
+	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+		       setname);
+        return ZEBRA_FAIL;
     }
     
-    zh->errCode = 0;
-
-    if (zebra_begin_read (zh))
-	return -1;
+    if (zebra_begin_read (zh) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
 
     pos_array = (zint *) xmalloc(num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
@@ -898,9 +1000,9 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     if (!poset)
     {
         yaz_log (YLOG_DEBUG, "zebraPosSetCreate error");
-        zh->errCode = 30;
-        zh->errString = nmem_strdup (stream->mem, setname);
-	ret = -1;
+	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+		       setname);
+	ret = ZEBRA_FAIL;
     }
     else
     {
@@ -918,11 +1020,18 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 	    {
 		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, &buf, &len,
-					&recs[i].base, &recs[i].errString);
+		    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)
 		{
@@ -933,16 +1042,24 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 		    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, ZINT_FORMAT, pos_array[i]);	
-		zh->errCode = 13;
-                zh->errString = odr_strdup (stream, num_str);
-		ret = -1;
-                break;
+	        /* only need to set it once */
+		if (pos_array[i] < zh->approx_limit && ret == ZEBRA_OK)
+		{
+		    zebra_setError_zint(zh,
+					YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE,
+					pos_array[i]);
+		    ret = ZEBRA_FAIL;
+		    break;
+		}
+		recs[i].buf = 0;  /* no record and no error issued */
+		recs[i].len = 0;
+		recs[i].errCode = 0;
+		recs[i].format = VAL_NONE;
+		recs[i].sysno = 0;
 	    }
 	}
 	zebra_meta_records_destroy(zh, poset, num_recs);
@@ -952,11 +1069,39 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     return ret;
 }
 
-int 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,
+			 const char *setname)
+{
+    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,
+			 setname);
+    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,
+		     const char *setname)
 {
+    ZEBRA_RES res;
+    RSET limit_rset = 0;
     ASSERTZH;
     assert(stream);
     assert(zapt);
@@ -965,25 +1110,39 @@ int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     assert(is_partial);
     assert(entries);
     yaz_log(log_level, "zebra_scan");
-    zh->errCode = 0;
-    if (zebra_begin_read (zh))
+    zebra_clearError(zh);
+    if (zebra_begin_read (zh) == ZEBRA_FAIL)
     {
 	*entries = 0;
 	*num_entries = 0;
-	return 1;
+	return ZEBRA_FAIL;
+    }
+    if (setname)
+    {
+	limit_rset = resultSetRef(zh, setname);
+	if (!limit_rset)
+	{
+	    zebra_setError(zh, 
+			   YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
+			   setname);
+	    zebra_end_read (zh);
+	    return ZEBRA_FAIL;
+	}
     }
-    rpn_scan (zh, stream, zapt, attributeset,
-	      zh->num_basenames, zh->basenames, position,
-	      num_entries, entries, is_partial, 0, 0);
+    res = rpn_scan (zh, stream, zapt, attributeset,
+		    zh->num_basenames, zh->basenames, position,
+		    num_entries, entries, is_partial, limit_rset, 0);
     zebra_end_read (zh);
-    return 0;
+    return res;
 }
 
-int 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)
 {
+    ZEBRA_RES res;
     ASSERTZH;
     assert(stream);
     assert(num_input_setnames>0);
@@ -991,13 +1150,13 @@ int zebra_sort (ZebraHandle zh, ODR stream,
     assert(sort_sequence);
     assert(sort_status);
     yaz_log(log_level, "zebra_sort");
-    zh->errCode = 0;
-    if (zebra_begin_read (zh))
-	return 1;
-    resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
-		   output_setname, sort_sequence, sort_status);
+    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 0;
+    return res;
 }
 
 int zebra_deleteResultSet(ZebraHandle zh, int function,
@@ -1008,7 +1167,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function,
     ASSERTZH;
     assert(statuses);
     yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
-    zh->errCode = 0;
+    zebra_clearError(zh);;
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
@@ -1043,7 +1202,7 @@ int zebra_errCode (ZebraHandle zh)
 
 const char *zebra_errString (ZebraHandle zh)
 {
-    const char *e="";
+    const char *e = 0;
     if (zh)
         e= diagbib1_str (zh->errCode);
     yaz_log(log_level, "zebra_errString: %s",e);
@@ -1052,7 +1211,7 @@ const char *zebra_errString (ZebraHandle zh)
 
 char *zebra_errAdd (ZebraHandle zh)
 {
-    char *a="";
+    char *a = 0;
     if (zh)
         a= zh->errString;
     yaz_log(log_level, "zebra_errAdd: %s",a);
@@ -1064,18 +1223,19 @@ void zebra_clearError(ZebraHandle zh)
     if (zh)
     {
         zh->errCode = 0;
-        zh->errString="";
+        zh->errString = 0;
     }
 }
 
-int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
+ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 {
     const char *p;
+    const char *astring;
     char u[40];
     ZebraService zs;
 
     ASSERTZH;
-    zh->errCode = 0;
+    zebra_clearError(zh);
     zs= zh->service;
     
     sprintf(u, "perm.%.30s", user ? user : "anonymous");
@@ -1083,85 +1243,87 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     xfree(zh->user_perm);
     zh->user_perm = xstrdup(p ? p : "r");
 
+    /* Determine database access list */
+    astring = res_get(zs->dbaccess, user ? user : "anonymous");
+    if (astring)
+	zh->dbaccesslist = xstrdup(astring);
+    else
+	zh->dbaccesslist = 0;
+
     /* users that don't require a password .. */
     if (zh->user_perm && strchr(zh->user_perm, 'a'))
-	return 0;
+	return ZEBRA_OK;
     
     if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
-	return 0;
-    return 1;
+	return ZEBRA_OK;
+    return ZEBRA_FAIL;
 }
 
-int zebra_admin_import_begin (ZebraHandle zh, const char *database,
+ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
                                const char *record_type)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
 		     database, record_type);
-    zh->errCode = 0;
-    if (zebra_select_database(zh, database))
-        return 1;
-    if (zebra_begin_trans (zh, 1))
-	return 1;
-    return 0;
+    zebra_clearError(zh);
+    if (zebra_select_database(zh, database) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
+    return zebra_begin_trans(zh, 1);
 }
 
-int zebra_admin_import_end (ZebraHandle zh)
+ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_end");
-    zh->errCode = 0;
-    zebra_end_trans (zh);
-    return 0;
+    zebra_clearError(zh);
+    return zebra_end_trans(zh);
 }
 
-int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
+ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 {
+    ZEBRA_RES res = ZEBRA_OK;
     SYSNO sysno;
     int i;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_segment");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
 
-	printf ("--------------%d--------------------\n", i);
-        /* FIXME - What! printing on stdout ??? */
 	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;
 		
-		zebra_update_record(zh, 
-				    0, /* record Type */
-				    &sysno,
-				    0, /* match */
-				    0, /* fname */
-				    oct->buf, oct->len,
-				    0);
+		if (zebra_update_record(zh, 
+					0, /* record Type */
+					&sysno,
+					0, /* match */
+					0, /* fname */
+					(const char *) oct->buf, oct->len,
+					0) == ZEBRA_FAIL)
+		    res = ZEBRA_FAIL;
 	    }
 	}
     }
-    return 0;
+    return res;
 }
 
-int zebra_admin_exchange_record (ZebraHandle zh,
-                                 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 */
 {
+    ZEBRA_RES res;
     SYSNO sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
@@ -1170,15 +1332,16 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     assert(rec_buf);
 
     yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
-    zh->errCode = 0;
+    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))
-	return -1;
+    if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
+	return ZEBRA_FAIL;
 
     rinfo = dict_lookup (zh->reg->matchDict, recid_z);
     if (rinfo)
@@ -1186,7 +1349,7 @@ int zebra_admin_exchange_record (ZebraHandle zh,
         if (action == 1)  /* fail if insert */
         {
 	     zebra_end_trans(zh);
-	     return -1;
+	     return ZEBRA_FAIL;
 	}
 
         memcpy (&sysno, rinfo+1, sizeof(sysno));
@@ -1196,19 +1359,19 @@ int zebra_admin_exchange_record (ZebraHandle zh,
         if (action == 2 || action == 3) /* fail if delete or update */
         {
 	    zebra_end_trans(zh);
-            return -1;
+            return ZEBRA_FAIL;
 	}
 	action = 1;  /* make it an insert (if it's an update).. */
     }
-    buffer_extract_record (zh, rec_buf, rec_len,
-			   action == 3 ? 1 : 0 /* delete flag */,
-			   0, /* test mode */
-			   0, /* recordType */
-			   &sysno, 
-			   0, /* match */
-			   0, /* fname */
+    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 */
+				 1  /* allow update */
 	);
     if (action == 1)
     {
@@ -1219,13 +1382,13 @@ int zebra_admin_exchange_record (ZebraHandle zh,
         dict_delete (zh->reg->matchDict, recid_z);
     }
     zebra_end_trans(zh);
-    return 0;
+    return res;
 }
 
 int delete_w_handle(const char *info, void *handle)
 {
     ZebraHandle zh = (ZebraHandle) handle;
-    ISAMC_P pos;
+    ISAM_P pos;
     ASSERTZH;
 
     if (*info == sizeof(pos))
@@ -1251,20 +1414,20 @@ static int delete_SU_handle(void *handle, int ord)
     return 0;
 }
 
-int zebra_drop_database  (ZebraHandle zh, const char *database)
+ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
 {
-    int ret = 0;
+    ZEBRA_RES ret = ZEBRA_OK;
     ASSERTZH;
-    yaz_log(log_level, "zebra_drop_database");
-    zh->errCode = 0;
+    yaz_log(log_level, "zebra_drop_database %s", db);
+    zebra_clearError(zh);
 
-    if (zebra_select_database (zh, database))
-        return -1;
-    if (zebra_begin_trans (zh, 1))
-        return -1;
+    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, database);
+	zebraExplain_curDatabase (zh->reg->zei, db);
 	
 	zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
 	zebraExplain_removeDatabase(zh->reg->zei, zh);
@@ -1272,35 +1435,33 @@ int zebra_drop_database  (ZebraHandle zh, const char *database)
     else
     {
 	yaz_log(YLOG_WARN, "drop database only supported for isam:b");
-	ret = -1;
+	ret = ZEBRA_FAIL;
     }
     zebra_end_trans (zh);
     return ret;
 }
 
-int zebra_create_database (ZebraHandle zh, const char *database)
+ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
 {
     ASSERTZH;
-    yaz_log(log_level, "zebra_create_database %s",database);
-    assert(database);
-    zh->errCode = 0;
+    yaz_log(log_level, "zebra_create_database %s", db);
+    assert(db);
+    zebra_clearError(zh);
 
-    if (zebra_select_database (zh, database))
-        return -1;
+    if (zebra_select_database (zh, db) == ZEBRA_FAIL)
+        return ZEBRA_FAIL;
     if (zebra_begin_trans (zh, 1))
-        return -1;
+        return ZEBRA_FAIL;
 
     /* announce database */
-    if (zebraExplain_newDatabase (zh->reg->zei, database, 0 
+    if (zebraExplain_newDatabase (zh->reg->zei, db, 0 
                                   /* explainDatabase */))
     {
         zebra_end_trans (zh);
-	zh->errCode = 224;
-	zh->errString = "database already exist";
-	return -1;
+	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db);
+	return ZEBRA_FAIL;
     }
-    zebra_end_trans (zh);
-    return 0;
+    return zebra_end_trans (zh);
 }
 
 int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
@@ -1312,7 +1473,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
     assert(input_str);
     assert(output_str);
     yaz_log(log_level, "zebra_string_norm ");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     if (!zh->reg->zebra_maps)
 	return -1;
     wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@ -1327,9 +1488,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
     return wrbuf_len(wrbuf);
 }
 
-
-int zebra_set_state (ZebraHandle zh, int val, int seqno)
-    /* FIXME - zint seqno ?? */
+static void zebra_set_state (ZebraHandle zh, int val, int seqno)
 {
     char state_fname[256];
     char *fname;
@@ -1337,7 +1496,7 @@ int zebra_set_state (ZebraHandle zh, int val, int seqno)
     FILE *f;
     ASSERTZH;
     yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
-    zh->errCode = 0;
+    zebra_clearError(zh);
 
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
@@ -1347,10 +1506,9 @@ int zebra_set_state (ZebraHandle zh, int val, int seqno)
     fprintf (f, "%c %d %ld\n", val, seqno, p);
     fclose (f);
     xfree(fname);
-    return 0;
 }
 
-int 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;
@@ -1358,7 +1516,7 @@ int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
 
     ASSERTZH;
     yaz_log(log_level, "zebra_get_state ");
-    zh->errCode = 0;
+    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");
@@ -1371,15 +1529,14 @@ int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
         fclose (f);
     }
     xfree(fname);
-    return 0;
 }
 
-int zebra_begin_read (ZebraHandle zh)
+ZEBRA_RES zebra_begin_read (ZebraHandle zh)
 {
     return zebra_begin_trans(zh, 0);
 }
 
-int zebra_end_read (ZebraHandle zh)
+ZEBRA_RES zebra_end_read (ZebraHandle zh)
 {
     return zebra_end_trans(zh);
 }
@@ -1413,15 +1570,15 @@ static void read_res_for_transaction(ZebraHandle zh)
     zh->m_file_verbose_limit = atoi(v);
 }
 
-int zebra_begin_trans (ZebraHandle zh, int rw)
+ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
 {
     ASSERTZH;
     zebra_select_default_database(zh);
     if (!zh->res)
     {
-        zh->errCode = 2;
-        zh->errString = "zebra_begin_trans: no database selected";
-        return -1;
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+		       "zebra_begin_trans: no database selected");
+        return ZEBRA_FAIL;
     }
     ASSERTZHRES;
     yaz_log(log_level, "zebra_begin_trans rw=%d",rw);
@@ -1430,9 +1587,11 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
     {
 	if (rw && !strchr(zh->user_perm, 'w'))
 	{
-	    zh->errCode = 223;
-	    zh->errString = 0;
-	    return -1;
+	    zebra_setError(
+		zh,
+		YAZ_BIB1_ES_PERMISSION_DENIED_ON_ES_CANNOT_MODIFY_OR_DELETE,
+		0);
+	    return ZEBRA_FAIL;
 	}
     }
 
@@ -1452,9 +1611,9 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 	}
         if (zh->trans_no != 1)
         {
-            zh->errCode = 2;
-            zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
-            return -1;
+	    zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+			   "zebra_begin_trans: no write trans within read");
+            return ZEBRA_FAIL;
         }
         if (zh->reg)
 	{
@@ -1463,7 +1622,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 	}
         zh->trans_w_no = zh->trans_no;
 
-        zh->errCode = 0;
+	zebra_clearError(zh);
         
         zh->records_inserted = 0;
         zh->records_updated = 0;
@@ -1520,13 +1679,13 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         {
             yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit");
             abort();
-            return -1;
+            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);
+        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
@@ -1539,10 +1698,10 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             zh->trans_no--;
             zh->trans_w_no = 0;
 
-            zh->errCode = 2;
-            zh->errString = "zebra_begin_trans: cannot open register";
-            yaz_log(YLOG_FATAL, zh->errString);
-            return -1;
+	    zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+			   "zebra_begin_trans: cannot open register");
+            yaz_log(YLOG_FATAL, "%s", zh->errString);
+            return ZEBRA_FAIL;
         }
     }
     else
@@ -1556,23 +1715,23 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         if (zh->trans_no != 1)
         {
             zebra_flush_reg (zh);
-            return 0;
+            return ZEBRA_OK;
         }
-        zh->errCode = 0;
+	zebra_clearError(zh);
 #if HAVE_SYS_TIMES_H
         times (&zh->tms1);
 #endif
         if (!zh->res)
         {
             (zh->trans_no)--;
-            zh->errCode = 109;
-            return -1;
+            zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            return ZEBRA_FAIL;
         }
         if (!zh->lock_normal || !zh->lock_shadow)
         {
             (zh->trans_no)--;
-            zh->errCode = 2;
-            return -1;
+            zh->errCode = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+            return ZEBRA_FAIL;
         }
         zebra_get_state (zh, &val, &seqno);
         if (val == 'd')
@@ -1593,7 +1752,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             dirty = 1;
         }
         if (!dirty)
-            return 0;
+            return ZEBRA_OK;
         
         if (val == 'c')
             zebra_lock_r (zh->lock_shadow);
@@ -1605,25 +1764,25 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             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);
+        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 = 109;
-            return -1;
+            zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
+            return ZEBRA_FAIL;
         }
         zh->reg->last_val = val;
         zh->reg->seqno = seqno;
     }
     read_res_for_transaction(zh);
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_end_trans (ZebraHandle zh)
+ZEBRA_RES zebra_end_trans (ZebraHandle zh)
 {
     ZebraTransactionStatus dummy;
     ASSERTZH;
@@ -1631,7 +1790,7 @@ int zebra_end_trans (ZebraHandle zh)
     return zebra_end_transaction(zh, &dummy);
 }
 
-int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
+ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
 {
     char val;
     int seqno;
@@ -1650,15 +1809,15 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
 
     if (!zh->res || !zh->reg)
     {
-        zh->errCode = 2;
-        zh->errString = "zebra_end_trans: no open transaction";
-        return -1;
+	zebra_setError(zh, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR,
+		       "zebra_end_trans: no open transaction");
+        return ZEBRA_FAIL;
     }
     if (zh->trans_no != zh->trans_w_no)
     {
         zh->trans_no--;
         if (zh->trans_no != 0)
-            return 0;
+            return ZEBRA_OK;
 
         /* release read lock */
 
@@ -1717,14 +1876,14 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime);
     status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime);
 #endif
-    return 0;
+    return ZEBRA_OK;
 }
 
 int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zh->errCode = 0;
+    zebra_clearError(zh);
     yaz_log (log_level, "updating %s", path);
     repositoryUpdate (zh, path);
     return zh->errCode;
@@ -1734,7 +1893,7 @@ int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zh->errCode = 0;
+    zebra_clearError(zh);
     yaz_log (log_level, "deleting %s", path);
     repositoryDelete (zh, path);
     return zh->errCode;
@@ -1745,24 +1904,24 @@ int zebra_repository_show (ZebraHandle zh, const char *path)
     ASSERTZH;
     assert(path);
     yaz_log(log_level, "zebra_repository_show");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     repositoryShow (zh, path);
     return zh->errCode;
 }
 
-static int zebra_commit_ex (ZebraHandle zh, int clean_only)
+static int zebra_commit_ex(ZebraHandle zh, int clean_only)
 {
     int seqno;
     char val;
     const char *rval;
     BFiles bfs;
     ASSERTZH;
-    zh->errCode = 0;
+    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");    
@@ -1811,89 +1970,91 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
     return 0;
 }
 
-int zebra_clean (ZebraHandle zh)
+ZEBRA_RES zebra_clean(ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_clean");
     return zebra_commit_ex(zh, 1);
 }
 
-int zebra_commit (ZebraHandle zh)
+ZEBRA_RES zebra_commit(ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_commit");
     return zebra_commit_ex(zh, 0);
 }
 
-int zebra_init (ZebraHandle zh)
+ZEBRA_RES zebra_init(ZebraHandle zh)
 {
     const char *rval;
     BFiles bfs = 0;
     ASSERTZH;
     yaz_log(log_level, "zebra_init");
-    zh->errCode = 0;
+    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->res, "register"), zh->path_reg);
     if (!bfs)
-	return -1;
+    {
+	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");
-    zh->errCode = 0;
+    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_result (ZebraHandle zh, int *code, char **addinfo)
+void zebra_result(ZebraHandle zh, int *code, char **addinfo)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_result");
     *code = zh->errCode;
     *addinfo = zh->errString;
-    return 0;
 }
 
-int zebra_shadow_enable (ZebraHandle zh, int value)
+void zebra_shadow_enable(ZebraHandle zh, int value)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_shadow_enable");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     zh->shadow_enable = value;
-    return 0;
 }
 
-int zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
+ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
     assert(encoding);
-    yaz_log(log_level, "zebra_octet_term_encoding");
-    zh->errCode = 0;
+    yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
+    zebra_clearError(zh);
 
     if (zh->iconv_to_utf8 != 0)
         yaz_iconv_close(zh->iconv_to_utf8);
@@ -1909,30 +2070,29 @@ int zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
     if (zh->iconv_to_utf8 == 0)
         yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding);
 
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_record_encoding");
-    zh->errCode = 0;
+    zebra_clearError(zh);
     xfree(zh->record_encoding);
     zh->record_encoding = 0;
     if (encoding)
 	zh->record_encoding = xstrdup (encoding);
-    return 0;
+    return ZEBRA_OK;
 }
 
-int zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
+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);
-    zh->errCode = 0;
+    yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+    zebra_clearError(zh);
     res_set(zh->res, name, value);
-    return 0;
 }
 
 const char *zebra_get_resource(ZebraHandle zh,
@@ -1941,10 +2101,9 @@ const char *zebra_get_resource(ZebraHandle zh,
     const char *v;
     ASSERTZH;
     assert(name);
-    assert(defaultvalue);
-    v= res_get_def( zh->res, name, (char *)defaultvalue);
-    zh->errCode = 0;
-    yaz_log(log_level, "zebra_get_resource %s:%s",name,v);
+    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;
 }
 
@@ -1962,15 +2121,14 @@ int zebra_get_shadow_enable (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_get_shadow_enable");
-    return (zh->shadow_enable);
+    return zh->shadow_enable;
 }
 
-int zebra_set_shadow_enable (ZebraHandle zh, int value)
+void zebra_set_shadow_enable (ZebraHandle zh, int value)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_set_shadow_enable %d",value);
     zh->shadow_enable = value;
-    return 0;
 }
 
 /* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
@@ -2001,12 +2159,13 @@ int zebra_add_record(ZebraHandle zh,
     return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
 }
 
-int 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 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)
 {
-    int res;
+    ZEBRA_RES res;
     ASSERTZH;
     assert(sysno);
     assert(buf);
@@ -2015,8 +2174,8 @@ int zebra_insert_record (ZebraHandle zh,
     if (buf_size < 1)
 	buf_size = strlen(buf);
 
-    if (zebra_begin_trans(zh, 1))
-	return 1;
+    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 */
@@ -2029,13 +2188,14 @@ int zebra_insert_record (ZebraHandle zh,
     return res; 
 }
 
-int 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 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)
 {
-    int res;
+    ZEBRA_RES res;
     ASSERTZH;
     assert(sysno);
     assert(buf);
@@ -2044,8 +2204,8 @@ int zebra_update_record (ZebraHandle zh,
 
     if (buf_size < 1) buf_size = strlen(buf);
 
-    if (zebra_begin_trans(zh, 1))
-	return 1;
+    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 */
@@ -2058,13 +2218,14 @@ int zebra_update_record (ZebraHandle zh,
     return res; 
 }
 
-int 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 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) 
 {
-    int res;
+    ZEBRA_RES res;
     ASSERTZH;
     assert(sysno);
     assert(buf);
@@ -2072,8 +2233,8 @@ int zebra_delete_record (ZebraHandle zh,
 
     if (buf_size < 1) buf_size = strlen(buf);
 
-    if (zebra_begin_trans(zh, 1))
-	return 1;
+    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 */
@@ -2083,39 +2244,43 @@ int zebra_delete_record (ZebraHandle zh,
 				 force_update,
 				 1); /* allow_update */
     zebra_end_trans(zh);
-    return res;   
+    return res;
 }
 
 /* ---------------------------------------------------------------------------
   Searching 
 */
 
-int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
-		      const char *setname, zint *numhits)
+ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query,
+			   const char *setname, zint *hits)
 {
-    zint hits = 0;
-    int res = -1;
+    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);
+    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, &hits);
+        res = zebra_search_RPN(zh, odr, query, setname, &lhits);
     
     odr_destroy(odr);
 
-    yaz_log(log_level, "Hits: " ZINT_FORMAT, hits);
+    yaz_log(log_level, "Hits: " ZINT_FORMAT, lhits);
 
-    if (numhits)
-	*numhits = hits;
+    if (hits)
+	*hits = lhits;
 
     return res;
 }
@@ -2141,7 +2306,7 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream,
     if (!sort_sequence)
     {
         yaz_log(YLOG_WARN, "invalid sort specs '%s'", sort_spec);
-        zh->errCode = 207;
+        zh->errCode = YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE;
 	return -1;
     }
     
@@ -2159,3 +2324,45 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream,
     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;
+}
+
+
+/* ---------------------------------------------------------------------------
+  Set limit for search/scan
+*/
+ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
+{
+    ASSERTZH;
+    zebra_limit_destroy(zh->m_limit);
+    zh->m_limit = zebra_limit_create(complement_flag, ids);
+    return ZEBRA_OK;
+}
+
+/*
+  Set Error code + addinfo
+*/
+void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
+{
+    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);
+}
+