X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=d0f4e79aa112dfdb3403ae2c41653a473290b96a;hp=d1bf1a4bab61bef1d0540d14c912dac007062f51;hb=8ed385caafd1d9695a5a9c0783f0dbe2a53f3e80;hpb=7c0b61313a0a90e951305a24686746cfb71ba510

diff --git a/index/zebraapi.c b/index/zebraapi.c
index d1bf1a4..d0f4e79 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,6 +1,6 @@
-/* $Id: zebraapi.c,v 1.130 2004-09-09 10:41:42 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: zebraapi.c,v 1.153 2005-03-08 14:02:12 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -43,27 +43,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define ASSERTZHRES assert(zh && zh->service && zh->res)
 #define ASSERTZS assert(zs)
 
-/* A simple log macro */
-/* don't break with older yazen that lack log_app2 */
-#ifdef LOG_APP2
-#define LOG_API LOG_APP2
-#else
-#define LOG_API LOG_DEBUG
-#endif
+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 zs)
 {
     const char *dir ;
     ASSERTZS;
-    yaz_log(LOG_API,"zebra_chdir");
+    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
@@ -74,11 +68,11 @@ static void zebra_chdir (ZebraService zs)
 static void zebra_flush_reg (ZebraHandle zh)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_flush_reg");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_flush_reg");
+    zh->errCode = 0;
     zebraExplain_flush (zh->reg->zei, zh);
     
-    extract_flushWriteKeys (zh,1 /* final */);
+    extract_flushWriteKeys (zh, 1 /* final */);
     zebra_index_merge (zh );
 }
 
@@ -93,14 +87,19 @@ ZebraHandle zebra_open (ZebraService zs)
 {
     ZebraHandle zh;
     const char *default_encoding;
-    ASSERTZS;
-    yaz_log(LOG_API,"zebra_open");
+    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 */
@@ -125,19 +124,20 @@ ZebraHandle zebra_open (ZebraService zs)
     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;
@@ -157,13 +157,20 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 {
     Res res;
 
-    yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName);
+    if (!log_level_initialized)
+    {
+        log_level = yaz_log_module_level("zebraapi");
+        log_level_initialized = 1;
+    }
+
+    yaz_log(log_level, "zebra_start %s",configName);
+    assert(configName);
 
     if ((res = res_open (configName, def_res, over_res)))
     {
-        ZebraService zh = xmalloc (sizeof(*zh));
+        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);
@@ -178,20 +185,30 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
         {
             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"));
         }
         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");
 }
@@ -203,12 +220,14 @@ Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
     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(LOG_LOG, "Using custom dictionary page size %d for %s",
+	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);
@@ -228,7 +247,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     ASSERTZS;
     
-    reg = xmalloc (sizeof(*reg));
+    reg = xmalloc(sizeof(*reg));
 
     assert (name);
     reg->name = xstrdup (name);
@@ -238,7 +257,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     assert (res);
 
-    yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s",
+    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);
@@ -255,12 +274,11 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     getcwd(cwd, sizeof(cwd)-1);
     profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH);
-    yaz_log(LOG_LOG, "profilePath=%s cwd=%s", profilePath, cwd);
+    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;
@@ -269,9 +287,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->keys.buf_max = 0;
     reg->keys.buf = 0;
-#if IT_KEY_NEW
     reg->keys.codec_handle = iscz1_start();
-#endif
 
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
@@ -286,11 +302,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->zei = 0;
     reg->matchDict = 0;
     reg->key_file_no = 0;
-    reg->ptr_i=0;
+    reg->ptr_i = 0;
     
     zebraRankInstall (reg, rank1_class);
     zebraRankInstall (reg, rankzv_class);
-    zebraRankInstall (reg, rankliv_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -300,7 +315,7 @@ 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)
@@ -309,12 +324,12 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     }
     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))
@@ -323,7 +338,7 @@ 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");
+	    yaz_log (YLOG_WARN, "isams_open failed");
 	    return 0;
 	}
     }
@@ -333,7 +348,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC,
 				    rw, key_isamc_m(res, &isamc_m))))
 	{
-	    logf (LOG_WARN, "isc_open");
+	    yaz_log (YLOG_WARN, "isc_open failed");
 	    return 0;
 	}
     }
@@ -344,7 +359,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;
 	}
     }
@@ -355,7 +370,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;
 	}
     }
@@ -366,7 +381,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;
 	}
     }
@@ -375,19 +390,19 @@ 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;
 }
 
 int zebra_admin_shutdown (ZebraHandle zh)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_shutdown");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_admin_shutdown");
+    zh->errCode = 0;
 
     zebra_mutex_cond_lock (&zh->service->session_lock);
     zh->service->stop_flag = 1;
@@ -399,8 +414,8 @@ int zebra_admin_start (ZebraHandle zh)
 {
     ZebraService zs;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_start");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_admin_start");
+    zh->errCode = 0;
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
@@ -410,7 +425,8 @@ int zebra_admin_start (ZebraHandle zh)
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 {
     ASSERTZS;
-    yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg);
+    assert(reg);
+    yaz_log(YLOG_DEBUG, "zebra_register_close p=%p", reg);
     reg->stop_flag = 0;
     zebra_chdir (zs);
     if (reg->records)
@@ -435,23 +451,20 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
     bfs_destroy (reg->bfs);
     data1_destroy (reg->dh);
 
-    xfree (reg->sortKeys.buf);
-    xfree (reg->keys.buf);
-#if IT_KEY_NEW
+    xfree(reg->sortKeys.buf);
+    xfree(reg->keys.buf);
     if (reg->keys.codec_handle)
 	iscz1_stop(reg->keys.codec_handle);
-#endif
-
-    xfree (reg->key_buf);
-    xfree (reg->name);
-    xfree (reg);
+    xfree(reg->key_buf);
+    xfree(reg->name);
+    xfree(reg);
 }
 
 int zebra_stop(ZebraService zs)
 {
     if (!zs)
         return 0;
-    yaz_log (LOG_LOG|LOG_API, "zebra_stop");
+    yaz_log (log_level, "zebra_stop");
 
     while (zs->sessions)
     {
@@ -463,9 +476,11 @@ int 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);
+    xfree(zs->configName);
+    xfree(zs);
     return 0;
 }
 
@@ -475,25 +490,25 @@ int zebra_close (ZebraHandle zh)
     struct zebra_session **sp;
     int i;
 
-    yaz_log(LOG_API,"zebra_close");
+    yaz_log(log_level, "zebra_close");
     if (!zh)
         return 0;
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
     
     zs = zh->service;
-    yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
+    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);
+        xfree(zh->basenames[i]);
+    xfree(zh->basenames);
 
     if (zh->iconv_to_utf8 != 0)
         yaz_iconv_close (zh->iconv_to_utf8);
@@ -515,11 +530,11 @@ int zebra_close (ZebraHandle zh)
 	sp = &(*sp)->next;
     }
     zebra_mutex_cond_unlock (&zs->session_lock);
-    xfree (zh->reg_name);
-    xfree (zh->user_perm);
-    zh->service=0; /* more likely to trigger an assert */
-    xfree (zh->path_reg);
-    xfree (zh);
+    xfree(zh->reg_name);
+    xfree(zh->user_perm);
+    zh->service = 0; /* more likely to trigger an assert */
+    xfree(zh->path_reg);
+    xfree(zh);
     return 0;
 }
 
@@ -538,7 +553,7 @@ static Res zebra_open_res (ZebraHandle zh)
     Res res = 0;
     char fname[512];
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
 
     if (zh->path_reg)
     {
@@ -553,7 +568,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;
@@ -562,7 +577,7 @@ static Res zebra_open_res (ZebraHandle zh)
 static void zebra_close_res (ZebraHandle zh)
 {
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
     if (zh->res != zh->service->global_res)
         res_close (zh->res);
     zh->res = 0;
@@ -571,7 +586,7 @@ static void zebra_close_res (ZebraHandle zh)
 static int zebra_select_register (ZebraHandle zh, const char *new_reg)
 {
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
     if (zh->res && strcmp (zh->reg_name, new_reg) == 0)
         return 0;
     if (!zh->res)
@@ -589,14 +604,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)
@@ -639,6 +654,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",
@@ -662,6 +681,21 @@ 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");
+	zebra_select_database(zh, v);
+    }
+    return 0;
+}
+
 void map_basenames (ZebraHandle zh, ODR stream,
 		    int *num_bases, char ***basenames)
 {
@@ -669,10 +703,13 @@ void map_basenames (ZebraHandle zh, ODR stream,
     struct map_baseinfo *p = &info;
     int i;
     ASSERTZH;
-    yaz_log(LOG_API,"map_basenames ");
-    zh->errCode=0;
+    yaz_log(log_level, "map_basenames ");
+    assert(stream);
+
+    zh->errCode = 0;
 
     info.zh = zh;
+
     info.num_bases = *num_bases;
     info.basenames = *basenames;
     info.new_num_max = 128;
@@ -692,14 +729,15 @@ 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)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_select_database %s",basename);
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_select_database %s",basename);
+    assert(basename);
+    zh->errCode = 0;
     return zebra_select_databases (zh, 1, &basename);
 }
 
@@ -711,9 +749,11 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     int len = 0;
     char *new_reg = 0;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s",
+    assert(basenames);
+
+    yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
 		    num_bases,basenames[0]);
-    zh->errCode=0;
+    zh->errCode = 0;
     
     if (num_bases < 1)
     {
@@ -721,11 +761,11 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
         return -1;
     }
     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]);
 
@@ -733,7 +773,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';
     }
@@ -768,7 +808,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
         }
     }
     zebra_select_register (zh, new_reg);
-    xfree (new_reg);
+    xfree(new_reg);
     if (!zh->res)
     {
         zh->errCode = 109;
@@ -783,37 +823,39 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
 }
 
 int zebra_search_RPN (ZebraHandle zh, ODR o,
-		       Z_RPNQuery *query, const char *setname, int *hits)
+		       Z_RPNQuery *query, const char *setname, zint *hits)
 {
     const char *max;
     zint maxhits;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_search_rpn");
-    zh->errCode=0;
+    assert(o);
+    assert(query);
+    assert(hits);
+    assert(setname);
+    yaz_log(log_level, "zebra_search_rpn");
+    zh->errCode = 0;
     zh->hits = 0;
     *hits = 0;
 
     if (zebra_begin_read (zh))
 	return 1;
 
-    zebra_livcode_transform(zh, query);
-
     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);
+	maxhits = atoi(max);
     else {
-        int i=0; 
-	maxhits=INT_MAX;
+        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 */
-        logf(LOG_LOG,"limiting hits to "ZINT_FORMAT, maxhits);
-	*hits=maxhits;  /* round it down to two digits, to look like rounded */
+        yaz_log(YLOG_DEBUG, "limiting hits to "ZINT_FORMAT, maxhits);
+	*hits = maxhits;  
     }
     else
         *hits = zh->hits;
@@ -821,20 +863,26 @@ int zebra_search_RPN (ZebraHandle zh, ODR o,
 }
 
 int zebra_records_retrieve (ZebraHandle zh, ODR stream,
-			     const char *setname, Z_RecordComposition *comp,
-			     oid_value input_format, int num_recs,
-			     ZebraRetrievalRecord *recs)
+			    const char *setname, Z_RecordComposition *comp,
+			    oid_value input_format, int num_recs,
+			    ZebraRetrievalRecord *recs)
 {
-    ZebraPosSet poset;
-    int i, *pos_array, ret = 0;
+    ZebraMetaRecord *poset;
+    int i, ret = 0;
+    zint *pos_array;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
-    zh->errCode=0;
+    assert(stream);
+    assert(setname);
+    assert(recs);
+    assert(num_recs>0);
+
+    yaz_log(log_level, "zebra_records_retrieve n=%d",num_recs);
+    zh->errCode = 0;
 
     if (!zh->res)
     {
         zh->errCode = 30;
-        zh->errString = odr_strdup (stream, setname);
+        zh->errString = odr_strdup(stream, setname);
         return -1;
     }
     
@@ -843,13 +891,13 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     if (zebra_begin_read (zh))
 	return -1;
 
-    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");
+        yaz_log (YLOG_DEBUG, "zebraPosSetCreate error");
         zh->errCode = 30;
         zh->errString = nmem_strdup (stream->mem, setname);
 	ret = -1;
@@ -868,29 +916,39 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 	    }
 	    else if (poset[i].sysno)
 	    {
+		char *buf;
+		int len;
 		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;
+					&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;
 	    }
 	    else
 	    {
 	        char num_str[20];
 
-		sprintf (num_str, "%d", pos_array[i]);	
+		sprintf (num_str, ZINT_FORMAT, pos_array[i]);	
 		zh->errCode = 13;
                 zh->errString = odr_strdup (stream, num_str);
 		ret = -1;
                 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;
 }
 
@@ -900,8 +958,14 @@ int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		 int *is_partial)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_scan");
-    zh->errCode=0;
+    assert(stream);
+    assert(zapt);
+    assert(position);
+    assert(num_entries);
+    assert(is_partial);
+    assert(entries);
+    yaz_log(log_level, "zebra_scan");
+    zh->errCode = 0;
     if (zebra_begin_read (zh))
     {
 	*entries = 0;
@@ -921,8 +985,13 @@ int zebra_sort (ZebraHandle zh, ODR stream,
 		 int *sort_status)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_sort");
-    zh->errCode=0;
+    assert(stream);
+    assert(num_input_setnames>0);
+    assert(input_setnames);
+    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,
@@ -931,19 +1000,22 @@ int zebra_sort (ZebraHandle zh, ODR stream,
     return 0;
 }
 
-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;
-    yaz_log(LOG_API,"zebra_deleleResultSet n=%d",num_setnames);
-    zh->errCode=0;
+    assert(statuses);
+    yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
+    zh->errCode = 0;
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
     {
     case Z_DeleteResultSetRequest_list:
+	assert(num_setnames>0);
+	assert(setnames);
 	resultSetDestroy (zh, num_setnames, setnames, statuses);
 	break;
     case Z_DeleteResultSetRequest_all:
@@ -962,10 +1034,10 @@ int zebra_errCode (ZebraHandle zh)
 {
     if (zh)
     {
-        yaz_log(LOG_API,"zebra_errCode: %d",zh->errCode);
+        yaz_log(log_level, "zebra_errCode: %d",zh->errCode);
         return zh->errCode;
     }
-    yaz_log(LOG_API,"zebra_errCode: o");
+    yaz_log(log_level, "zebra_errCode: o");
     return 0; 
 }
 
@@ -974,7 +1046,7 @@ const char *zebra_errString (ZebraHandle zh)
     const char *e="";
     if (zh)
         e= diagbib1_str (zh->errCode);
-    yaz_log(LOG_API,"zebra_errString: %s",e);
+    yaz_log(log_level, "zebra_errString: %s",e);
     return e;
 }
 
@@ -983,7 +1055,7 @@ char *zebra_errAdd (ZebraHandle zh)
     char *a="";
     if (zh)
         a= zh->errString;
-    yaz_log(LOG_API,"zebra_errAdd: %s",a);
+    yaz_log(log_level, "zebra_errAdd: %s",a);
     return a;
 }
 
@@ -991,7 +1063,7 @@ void zebra_clearError(ZebraHandle zh)
 {
     if (zh)
     {
-        zh->errCode=0;
+        zh->errCode = 0;
         zh->errString="";
     }
 }
@@ -1003,12 +1075,12 @@ int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     ZebraService zs;
 
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
     zs= zh->service;
     
     sprintf(u, "perm.%.30s", user ? user : "anonymous");
     p = res_get(zs->global_res, u);
-    xfree (zh->user_perm);
+    xfree(zh->user_perm);
     zh->user_perm = xstrdup(p ? p : "r");
 
     /* users that don't require a password .. */
@@ -1024,9 +1096,9 @@ int zebra_admin_import_begin (ZebraHandle zh, const char *database,
                                const char *record_type)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_import_begin db=%s rt=%s", 
+    yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
 		     database, record_type);
-    zh->errCode=0;
+    zh->errCode = 0;
     if (zebra_select_database(zh, database))
         return 1;
     if (zebra_begin_trans (zh, 1))
@@ -1037,8 +1109,8 @@ int zebra_admin_import_begin (ZebraHandle zh, const char *database,
 int zebra_admin_import_end (ZebraHandle zh)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_import_end");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_admin_import_end");
+    zh->errCode = 0;
     zebra_end_trans (zh);
     return 0;
 }
@@ -1048,13 +1120,14 @@ int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     SYSNO sysno;
     int i;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_import_segment");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_admin_import_segment");
+    zh->errCode = 0;
     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;
@@ -1093,8 +1166,11 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     char *rinfo = 0;
     char recid_z[256];
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action);
-    zh->errCode=0;
+    assert(action>0 && action <=4);
+    assert(rec_buf);
+
+    yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
+    zh->errCode = 0;
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
         return -1;
@@ -1150,6 +1226,7 @@ int delete_w_handle(const char *info, void *handle)
 {
     ZebraHandle zh = (ZebraHandle) handle;
     ISAMC_P pos;
+    ASSERTZH;
 
     if (*info == sizeof(pos))
     {
@@ -1178,7 +1255,7 @@ int zebra_drop_database  (ZebraHandle zh, const char *database)
 {
     int ret = 0;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_drop_database");
+    yaz_log(log_level, "zebra_drop_database");
     zh->errCode = 0;
 
     if (zebra_select_database (zh, database))
@@ -1194,7 +1271,7 @@ int zebra_drop_database  (ZebraHandle zh, const char *database)
     }
     else
     {
-	yaz_log(LOG_WARN, "drop database only supported for isam:b");
+	yaz_log(YLOG_WARN, "drop database only supported for isam:b");
 	ret = -1;
     }
     zebra_end_trans (zh);
@@ -1204,8 +1281,9 @@ int zebra_drop_database  (ZebraHandle zh, const char *database)
 int zebra_create_database (ZebraHandle zh, const char *database)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_create_database");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_create_database %s",database);
+    assert(database);
+    zh->errCode = 0;
 
     if (zebra_select_database (zh, database))
         return -1;
@@ -1231,8 +1309,10 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 {
     WRBUF wrbuf;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_string_norm ");
-    zh->errCode=0;
+    assert(input_str);
+    assert(output_str);
+    yaz_log(log_level, "zebra_string_norm ");
+    zh->errCode = 0;
     if (!zh->reg->zebra_maps)
 	return -1;
     wrbuf = zebra_replace(zh->reg->zebra_maps, reg_id, "",
@@ -1249,23 +1329,24 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 
 
 int zebra_set_state (ZebraHandle zh, int val, int seqno)
+    /* FIXME - zint seqno ?? */
 {
     char state_fname[256];
     char *fname;
     long p = getpid();
     FILE *f;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_set_state v=%d seq=%d", val, seqno);
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
+    zh->errCode = 0;
 
     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);
     return 0;
 }
 
@@ -1276,8 +1357,8 @@ int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
     FILE *f;
 
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_get_state ");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_get_state ");
+    zh->errCode = 0;
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
     f = fopen (fname, "r");
@@ -1289,7 +1370,7 @@ int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
         fscanf (f, "%c %d", val, seqno);
         fclose (f);
     }
-    xfree (fname);
+    xfree(fname);
     return 0;
 }
 
@@ -1307,6 +1388,7 @@ 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 ?? */
     
     zh->m_group = group;
     v = res_get_prefix(zh->res, "followLinks", group, "1");
@@ -1333,6 +1415,8 @@ static void read_res_for_transaction(ZebraHandle zh)
 
 int zebra_begin_trans (ZebraHandle zh, int rw)
 {
+    ASSERTZH;
+    zebra_select_default_database(zh);
     if (!zh->res)
     {
         zh->errCode = 2;
@@ -1340,7 +1424,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         return -1;
     }
     ASSERTZHRES;
-    yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw);
+    yaz_log(log_level, "zebra_begin_trans rw=%d",rw);
 
     if (zh->user_perm)
     {
@@ -1379,7 +1463,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 	}
         zh->trans_w_no = zh->trans_no;
 
-        zh->errCode=0;
+        zh->errCode = 0;
         
         zh->records_inserted = 0;
         zh->records_updated = 0;
@@ -1409,7 +1493,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             zebra_get_state (zh, &val, &seqno);
             if (val == 'c')
             {
-                yaz_log (LOG_LOG, "previous transaction didn't finish commit");
+                yaz_log (YLOG_WARN, "previous transaction didn't finish commit");
                 zebra_unlock (zh->lock_shadow);
                 zebra_unlock (zh->lock_normal);
                 zebra_commit (zh);
@@ -1421,20 +1505,20 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
                 {
                     BFiles bfs = bfs_create (res_get (zh->res, "shadow"),
                                              zh->path_reg);
-                    yaz_log (LOG_LOG, "previous transaction didn't reach commit");
+                    yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
                     bf_commitClean (bfs, rval);
                     bfs_destroy (bfs);
             }
                 else
                 {
-                    yaz_log (LOG_WARN, "your previous transaction didn't finish");
+                    yaz_log (YLOG_WARN, "your previous transaction didn't finish");
                 }
             }
             break;
         }
         if (pass == 2)
         {
-            yaz_log (LOG_FATAL, "zebra_begin_trans couldn't finish commit");
+            yaz_log (YLOG_FATAL, "zebra_begin_trans couldn't finish commit");
             abort();
             return -1;
         }
@@ -1457,7 +1541,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 
             zh->errCode = 2;
             zh->errString = "zebra_begin_trans: cannot open register";
-            yaz_log(LOG_FATAL, zh->errString);
+            yaz_log(YLOG_FATAL, zh->errString);
             return -1;
         }
     }
@@ -1474,7 +1558,7 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             zebra_flush_reg (zh);
             return 0;
         }
-        zh->errCode=0;
+        zh->errCode = 0;
 #if HAVE_SYS_TIMES_H
         times (&zh->tms1);
 #endif
@@ -1498,13 +1582,13 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             dirty = 1;
         else if (seqno != zh->reg->seqno)
         {
-            yaz_log (LOG_LOG, "reopen seqno cur/old %d/%d",
+            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 (LOG_LOG, "reopen last cur/old %d/%d",
+            yaz_log (YLOG_DEBUG, "reopen last cur/old %d/%d",
                      val, zh->reg->last_val);
             dirty = 1;
         }
@@ -1542,7 +1626,8 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
 int zebra_end_trans (ZebraHandle zh)
 {
     ZebraTransactionStatus dummy;
-    yaz_log(LOG_API,"zebra_end_trans");
+    ASSERTZH;
+    yaz_log(log_level, "zebra_end_trans");
     return zebra_end_transaction(zh, &dummy);
 }
 
@@ -1553,7 +1638,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     const char *rval;
 
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_end_transaction");
+    assert(status);
+    yaz_log(log_level, "zebra_end_transaction");
 
     status->processed = 0;
     status->inserted  = 0;
@@ -1584,7 +1670,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         zh->trans_no--;
         zh->trans_w_no = 0;
         
-        yaz_log (LOG_LOG, "zebra_end_trans");
+        yaz_log (YLOG_DEBUG, "zebra_end_trans");
         rval = res_get (zh->res, "shadow");
         
         zebraExplain_runNumberIncrement (zh->reg->zei, 1);
@@ -1596,21 +1682,21 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         zebra_register_close (zh->service, zh->reg);
         zh->reg = 0;
         
-        yaz_log (LOG_LOG, "Records: "ZINT_FORMAT" i/u/d "
+        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 = zh->records_processed;
-        status->inserted = zh->records_inserted;
-        status->updated = zh->records_updated;
-        status->deleted = 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 (LOG_LOG, "deleting shadow stuff val=%c", val);
+            yaz_log (YLOG_DEBUG, "deleting shadow val=%c", val);
             bf_commitClean (bfs, rval);
             bfs_destroy (bfs);
         }
@@ -1624,7 +1710,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     }
 #if HAVE_SYS_TIMES_H
     times (&zh->tms2);
-    logf (LOG_LOG, "user/system: %ld/%ld",
+    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));
     
@@ -1637,8 +1723,9 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
 int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
-    zh->errCode=0;
-    logf (LOG_LOG|LOG_API, "updating %s", path);
+    assert(path);
+    zh->errCode = 0;
+    yaz_log (log_level, "updating %s", path);
     repositoryUpdate (zh, path);
     return zh->errCode;
 }
@@ -1646,8 +1733,9 @@ int zebra_repository_update (ZebraHandle zh, const char *path)
 int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
-    zh->errCode=0;
-    logf (LOG_LOG|LOG_API, "deleting %s", path);
+    assert(path);
+    zh->errCode = 0;
+    yaz_log (log_level, "deleting %s", path);
     repositoryDelete (zh, path);
     return zh->errCode;
 }
@@ -1655,8 +1743,9 @@ int zebra_repository_delete (ZebraHandle zh, const char *path)
 int zebra_repository_show (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_repository_show");
-    zh->errCode=0;
+    assert(path);
+    yaz_log(log_level, "zebra_repository_show");
+    zh->errCode = 0;
     repositoryShow (zh, path);
     return zh->errCode;
 }
@@ -1668,8 +1757,9 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
     const char *rval;
     BFiles bfs;
     ASSERTZH;
-    zh->errCode=0;
+    zh->errCode = 0;
 
+    zebra_select_default_database(zh);
     if (!zh->res)
     {
         zh->errCode = 109;
@@ -1678,8 +1768,7 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
     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;
     }
 
@@ -1700,20 +1789,20 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
         {
             zebra_set_state (zh, 'c', seqno);
             
-            logf (LOG_LOG, "commit start");
+            yaz_log (YLOG_DEBUG, "commit start");
             bf_commitExec (bfs);
 #ifndef WIN32
             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);
 
@@ -1724,13 +1813,15 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
 
 int zebra_clean (ZebraHandle zh)
 {
-    yaz_log(LOG_API,"zebra_clean");
+    ASSERTZH;
+    yaz_log(log_level, "zebra_clean");
     return zebra_commit_ex(zh, 1);
 }
 
 int zebra_commit (ZebraHandle zh)
 {
-    yaz_log(LOG_API,"zebra_commit");
+    ASSERTZH;
+    yaz_log(log_level, "zebra_commit");
     return zebra_commit_ex(zh, 0);
 }
 
@@ -1739,9 +1830,10 @@ int zebra_init (ZebraHandle zh)
     const char *rval;
     BFiles bfs = 0;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_init");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_init");
+    zh->errCode = 0;
 
+    zebra_select_default_database(zh);
     if (!zh->res)
     {
         zh->errCode = 109;
@@ -1749,8 +1841,7 @@ int zebra_init (ZebraHandle zh)
     }
     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)
 	return -1;
     if (rval && *rval)
@@ -1766,8 +1857,8 @@ int zebra_compact (ZebraHandle zh)
 {
     BFiles bfs;
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_compact");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_compact");
+    zh->errCode = 0;
     if (!zh->res)
     {
         zh->errCode = 109;
@@ -1782,7 +1873,7 @@ int zebra_compact (ZebraHandle zh)
 int zebra_result (ZebraHandle zh, int *code, char **addinfo)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_result");
+    yaz_log(log_level, "zebra_result");
     *code = zh->errCode;
     *addinfo = zh->errString;
     return 0;
@@ -1791,50 +1882,55 @@ int zebra_result (ZebraHandle zh, int *code, char **addinfo)
 int zebra_shadow_enable (ZebraHandle zh, int value)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_shadow_enable");
-    zh->errCode=0;
+    yaz_log(log_level, "zebra_shadow_enable");
+    zh->errCode = 0;
     zh->shadow_enable = value;
     return 0;
 }
 
-int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+int zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_record_encoding");
-    zh->errCode=0;
-    xfree (zh->record_encoding);
-
-    /*
-     * Fixme!
-     * Something about charset aliases. Oleg???
-     */
+    assert(encoding);
+    yaz_log(log_level, "zebra_octet_term_encoding");
+    zh->errCode = 0;
 
     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->record_encoding = xstrdup (encoding);
-    
-    logf(LOG_DEBUG, "Reset record encoding: %s", encoding);
-    
     zh->iconv_to_utf8 =
         yaz_iconv_open ("UTF-8", encoding);
     if (zh->iconv_to_utf8 == 0)
-        yaz_log (LOG_WARN, "iconv: %s to UTF-8 unsupported", encoding);
+        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 (LOG_WARN, "iconv: UTF-8 to %s unsupported", encoding);
+        yaz_log (YLOG_WARN, "iconv: UTF-8 to %s unsupported", encoding);
 
     return 0;
 }
 
+int zebra_record_encoding (ZebraHandle zh, const char *encoding)
+{
+    ASSERTZH;
+    yaz_log(log_level, "zebra_record_encoding");
+    zh->errCode = 0;
+    xfree(zh->record_encoding);
+    zh->record_encoding = 0;
+    if (encoding)
+	zh->record_encoding = xstrdup (encoding);
+    return 0;
+}
+
 int zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value);
-    zh->errCode=0;
+    assert(name);
+    assert(value);
+    yaz_log(log_level, "zebra_set_resource %s:%s",name,value);
+    zh->errCode = 0;
     res_set(zh->res, name, value);
     return 0;
 }
@@ -1844,9 +1940,11 @@ 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_API,"zebra_get_resource %s:%s",name,v);
+    zh->errCode = 0;
+    yaz_log(log_level, "zebra_get_resource %s:%s",name,v);
     return v;
 }
 
@@ -1856,105 +1954,36 @@ const char *zebra_get_resource(ZebraHandle zh,
 int zebra_trans_no (ZebraHandle zh)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_trans_no");
+    yaz_log(log_level, "zebra_trans_no");
     return zh->trans_no;
 }
 
 int zebra_get_shadow_enable (ZebraHandle zh)
 {
-    yaz_log(LOG_API,"zebra_get_shadow_enable");
+    ASSERTZH;
+    yaz_log(log_level, "zebra_get_shadow_enable");
     return (zh->shadow_enable);
 }
 
 int zebra_set_shadow_enable (ZebraHandle zh, int value)
 {
-    yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
+    ASSERTZH;
+    yaz_log(log_level, "zebra_set_shadow_enable %d",value);
     zh->shadow_enable = value;
     return 0;
 }
 
-/* almost the same as zebra_records_retrieve ... but how did it work? 
-   I mean for multiple records ??? CHECK ??? */
+/* 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)
 {
-    ZebraPosSet poset;
-    int i, *pos_array;
-    yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs);
-
-    if (!zh->res)
-    {
-        zh->errCode = 30;
-        zh->errString = odr_strdup (stream, setname);
-        return;
-    }
-    
-    zh->errCode = 0; 
-
-    if (zebra_begin_read (zh))
-	return;
-
-    pos_array = (int *) 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);
-    if (!poset)
-    {
-        logf (LOG_DEBUG, "zebraPosSetCreate error");
-        zh->errCode = 30;
-        zh->errString = nmem_strdup (stream->mem, setname);
-    }
-    else
-    {
-	for (i = 0; i<num_recs; i++)
-	{
-	    if (poset[i].term)
-	    {
-		recs[i].errCode = 0;
-		recs[i].format = VAL_SUTRS;
-		recs[i].len = strlen(poset[i].term);
-		recs[i].buf = poset[i].term;
-		recs[i].base = poset[i].db;
-		recs[i].sysno = 0;
-	    
-	    }
-	    else if (poset[i].sysno)
-	    {
-	      /* changed here ??? CHECK ??? */
-	      char *b;
-		recs[i].errCode =
-		    zebra_record_fetch (zh, poset[i].sysno, poset[i].score,
-					stream, input_format, comp,
-					&recs[i].format, 
-					&b,
-					&recs[i].len,
-					&recs[i].base);
-		recs[i].buf = (char *) odr_malloc(stream,recs[i].len);
-		memcpy(recs[i].buf, b, recs[i].len);
-		recs[i].errString = 0; /* Hmmm !!! we should get this */ 
-		recs[i].sysno = poset[i].sysno;
-		recs[i].score = poset[i].score;
-	    }
-	    else
-	    {
-	        char num_str[20];
-
-		sprintf (num_str, "%d", pos_array[i]);	
-		zh->errCode = 13;
-                zh->errString = odr_strdup (stream, num_str);
-                break;
-	    }
-
-	}
-	zebraPosSetDestroy (zh, poset, num_recs);
-    }
-    zebra_end_read (zh);
-    xfree (pos_array);
+    zebra_records_retrieve(zh, stream, setname, comp, input_format,
+			   num_recs, recs);
 }
 
-
 /* ---------------------------------------------------------------------------
   Record insert(=update), delete 
 
@@ -1978,9 +2007,13 @@ int zebra_insert_record (ZebraHandle zh,
 			 const char *buf, int buf_size, int force_update)
 {
     int res;
-    yaz_log(LOG_API,"zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
+    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 (buf_size < 1)
+	buf_size = strlen(buf);
 
     if (zebra_begin_trans(zh, 1))
 	return 1;
@@ -2003,8 +2036,11 @@ int zebra_update_record (ZebraHandle zh,
 			 int force_update)
 {
     int res;
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
 
-    yaz_log(LOG_API,"zebra_update_record sysno=" ZINT_FORMAT, *sysno);
+    yaz_log(log_level, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
@@ -2029,7 +2065,10 @@ int zebra_delete_record (ZebraHandle zh,
 			 int force_update) 
 {
     int res;
-    yaz_log(LOG_API,"zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+    yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
@@ -2052,28 +2091,31 @@ int zebra_delete_record (ZebraHandle zh,
 */
 
 int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
-		      const char *setname, int *numhits)
+		      const char *setname, zint *numhits)
 {
-    int hits = 0;
-    int res=-1;
+    zint hits = 0;
+    int res = -1;
     Z_RPNQuery *query;
     ODR odr = odr_createmem(ODR_ENCODE);
+    ASSERTZH;
+    assert(pqf_query);
+    assert(setname);
 
-    yaz_log(LOG_API,"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 (LOG_WARN, "bad query %s\n", pqf_query);
+        yaz_log (YLOG_WARN, "bad query %s\n", pqf_query);
     else
-        res=zebra_search_RPN (zh, odr, query, setname, &hits);
+        res = zebra_search_RPN (zh, odr, query, setname, &hits);
     
     odr_destroy(odr);
 
-    yaz_log(LOG_API,"Hits: %d",hits);
+    yaz_log(log_level, "Hits: %d",hits);
 
     if (numhits)
-	*numhits=hits;
+	*numhits = hits;
 
     return res;
 }
@@ -2081,19 +2123,24 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.
 */
-int zebra_sort_by_specstr (ZebraHandle zh, 
-			   ODR stream,
+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 = yaz_sort_spec (stream, sort_spec);
-    yaz_log(LOG_API,"sort (FIXME) ");
+    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)
     {
-        logf(LOG_WARN,"invalid sort specs '%s'", sort_spec);
+        yaz_log(YLOG_WARN, "invalid sort specs '%s'", sort_spec);
         zh->errCode = 207;
 	return -1;
     }