X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=e97e27c79f86208333f9a7cb93cba7ec82e5ce54;hb=73bedd5ba9152c9c107b502fae65723b551aff09;hp=31c7a9ce0c58d81e41d630771c93cd203f1c95c9;hpb=6a395dd488e0f34f54ea44bafcde9c959292c252;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 31c7a9c..e97e27c 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,5 +1,5 @@
-/* $Id: zebraapi.c,v 1.109 2003-06-30 19:37:12 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: zebraapi.c,v 1.137 2004-10-26 15:32:11 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,10 +20,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <assert.h>
 #include <stdio.h>
+#include <limits.h>
 #ifdef WIN32
 #include <io.h>
 #include <process.h>
@@ -37,20 +36,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/sortspec.h>
 #include "index.h"
 #include <charmap.h>
-#include "zebraapi.h"
+#include <idzebra/api.h>
 
 /* simple asserts to validate the most essential input args */
 #define ASSERTZH assert(zh && zh->service)
 #define ASSERTZHRES assert(zh && zh->service && zh->res)
 #define ASSERTZS assert(zs)
 
-/* 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 Res zebra_open_res (ZebraHandle zh);
 static void zebra_close_res (ZebraHandle zh);
@@ -79,8 +72,8 @@ static void zebra_flush_reg (ZebraHandle zh)
     zh->errCode=0;
     zebraExplain_flush (zh->reg->zei, zh);
     
-    extract_flushWriteKeys (zh);
-    zebra_index_merge (zh);
+    extract_flushWriteKeys (zh,1 /* final */);
+    zebra_index_merge (zh );
 }
 
 static struct zebra_register *zebra_register_open (ZebraService zs, 
@@ -94,7 +87,6 @@ ZebraHandle zebra_open (ZebraService zs)
 {
     ZebraHandle zh;
     const char *default_encoding;
-    ASSERTZS;
     yaz_log(LOG_API,"zebra_open");
 
     if (!zs)
@@ -110,6 +102,7 @@ ZebraHandle zebra_open (ZebraService zs)
     zh->errCode = 0;
     zh->errString = 0;
     zh->res = 0; 
+    zh->user_perm = 0;
 
     zh->reg_name = xstrdup ("");
     zh->path_reg = 0;
@@ -122,8 +115,6 @@ ZebraHandle zebra_open (ZebraService zs)
     zh->lock_normal = 0;
     zh->lock_shadow = 0;
 
-    zh->admin_databaseName = 0;
-
     zh->shadow_enable = 1;
 
     default_encoding = res_get_def(zs->global_res, "encoding", "ISO-8859-1");
@@ -152,11 +143,17 @@ ZebraHandle zebra_open (ZebraService zs)
 
 ZebraService zebra_start (const char *configName)
 {
+    return zebra_start_res(configName, 0, 0);
+}
+
+ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
+{
     Res res;
 
-    yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName);
+    yaz_log(LOG_API,"zebra_start %s",configName);
+    assert(configName);
 
-    if ((res = res_open (configName, 0)))
+    if ((res = res_open (configName, def_res, over_res)))
     {
         ZebraService zh = xmalloc (sizeof(*zh));
 
@@ -181,11 +178,49 @@ ZebraService zebra_start (const char *configName)
                                 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");
+}
+
+Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw,
+		    int compact_flag, Res res)
+{
+    int page_size = 4096;
+    char resource_str[200];
+    const char *v;
+    sprintf (resource_str, "dict.%.100s.pagesize", name);
+    assert(bfs);
+    assert(name);
+
+    v = res_get(res, resource_str);
+    if (v)
+    {
+	page_size = atoi(v);
+	yaz_log(LOG_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,
@@ -193,7 +228,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 {
     struct zebra_register *reg;
     int record_compression = REC_COMPRESS_NONE;
-    char *recordCompression = 0;
+    const char *recordCompression = 0;
+    const char *profilePath;
+    char cwd[1024];
 
     ASSERTZS;
     
@@ -207,7 +244,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 (LOG_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);
@@ -221,11 +258,14 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     }
     if (useshadow)
         bf_cache (reg->bfs, res_get (res, "shadow"));
-    data1_set_tabpath (reg->dh, res_get_def(res, "profilePath",
-                                            DEFAULT_PROFILE_PATH));
+
+    getcwd(cwd, sizeof(cwd)-1);
+    profilePath = res_get_def(res, "profilePath", DEFAULT_PROFILE_PATH);
+    yaz_log(LOG_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;
@@ -234,6 +274,8 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     reg->keys.buf_max = 0;
     reg->keys.buf = 0;
+    reg->keys.codec_handle = iscz1_start();
+
     reg->sortKeys.buf = 0;
     reg->sortKeys.buf_max = 0;
 
@@ -242,17 +284,18 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     reg->sortIdx = 0;
     reg->isams = 0;
     reg->matchDict = 0;
-    reg->isam = 0;
     reg->isamc = 0;
-    reg->isamd = 0;
     reg->isamb = 0;
     reg->zei = 0;
     reg->matchDict = 0;
     reg->key_file_no = 0;
+    reg->ptr_i=0;
     
     zebraRankInstall (reg, rank1_class);
+#ifdef SKIPTHIS /* FIXME - those ranks not yet converted to new interface */
     zebraRankInstall (reg, rankzv_class);
     zebraRankInstall (reg, rankliv_class);
+#endif
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -267,9 +310,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     }
     if (rw)
     {
-        reg->matchDict = dict_open (reg->bfs, GMATCH_DICT, 20, 1, 0);
+        reg->matchDict = dict_open_res (reg->bfs, GMATCH_DICT, 20, 1, 0, res);
     }
-    if (!(reg->dict = dict_open (reg->bfs, FNAME_DICT, 40, rw, 0)))
+    if (!(reg->dict = dict_open_res (reg->bfs, FNAME_DICT, 40, rw, 0, res)))
     {
 	logf (LOG_WARN, "dict_open");
 	return 0;
@@ -289,15 +332,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
-    if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
-    {
-	if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
-				  sizeof (struct it_key), res)))
-	{
-	    logf (LOG_WARN, "is_open");
-	    return 0;
-	}
-    }
     if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
     {
 	struct ISAMC_M_s isamc_m;
@@ -308,17 +342,6 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 	    return 0;
 	}
     }
-    if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
-    {
-	struct ISAMD_M_s isamd_m;
-	
-	if (!(reg->isamd = isamd_open (reg->bfs, FNAME_ISAMD,
-				      rw, key_isamd_m(res, &isamd_m))))
-	{
-	    logf (LOG_WARN, "isamd_open");
-	    return 0;
-	}
-    }
     if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
     {
 	struct ISAMC_M_s isamc_m;
@@ -392,7 +415,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(LOG_DEBUG, "zebra_register_close p=%p", reg);
     reg->stop_flag = 0;
     zebra_chdir (zs);
     if (reg->records)
@@ -404,12 +428,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 	sortIdx_close (reg->sortIdx);
 	if (reg->isams)
 	    isams_close (reg->isams);
-        if (reg->isam)
-            is_close (reg->isam);
         if (reg->isamc)
             isc_close (reg->isamc);
-        if (reg->isamd)
-            isamd_close (reg->isamd);
         if (reg->isamb)
             isamb_close (reg->isamb);
         rec_close (&reg->records);
@@ -423,7 +443,8 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 
     xfree (reg->sortKeys.buf);
     xfree (reg->keys.buf);
-
+    if (reg->keys.codec_handle)
+	iscz1_stop(reg->keys.codec_handle);
     xfree (reg->key_buf);
     xfree (reg->name);
     xfree (reg);
@@ -433,7 +454,7 @@ int zebra_stop(ZebraService zs)
 {
     if (!zs)
         return 0;
-    yaz_log (LOG_LOG|LOG_API, "zebra_stop");
+    yaz_log (LOG_API, "zebra_stop");
 
     while (zs->sessions)
     {
@@ -445,9 +466,10 @@ 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->path_root);
     xfree (zs);
     return 0;
 }
@@ -483,7 +505,6 @@ int zebra_close (ZebraHandle zh)
     if (zh->iconv_from_utf8 != 0)
         yaz_iconv_close (zh->iconv_from_utf8);
 
-    xfree (zh->admin_databaseName);
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_lock_destroy (zh->lock_normal);
     zebra_lock_destroy (zh->lock_shadow);
@@ -500,7 +521,9 @@ int zebra_close (ZebraHandle zh)
     }
     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);
     return 0;
 }
@@ -525,7 +548,7 @@ static Res zebra_open_res (ZebraHandle zh)
     if (zh->path_reg)
     {
         sprintf (fname, "%.200s/zebra.cfg", zh->path_reg);
-        res = res_open (fname, zh->service->global_res);
+        res = res_open (fname, zh->service->global_res, 0);
         if (!res)
             res = zh->service->global_res;
     }
@@ -603,7 +626,7 @@ static int zebra_select_register (ZebraHandle zh, const char *new_reg)
         const char *lock_area  =res_get (zh->res, "lockDir");
         
         if (!lock_area && zh->path_reg)
-            res_put (zh->res, "lockDir", zh->path_reg);
+            res_set (zh->res, "lockDir", zh->path_reg);
         sprintf (fname, "norm.%s.LCK", zh->reg_name);
         zh->lock_normal =
             zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
@@ -621,6 +644,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",
@@ -652,6 +679,8 @@ void map_basenames (ZebraHandle zh, ODR stream,
     int i;
     ASSERTZH;
     yaz_log(LOG_API,"map_basenames ");
+    assert(stream);
+
     zh->errCode=0;
 
     info.zh = zh;
@@ -674,13 +703,14 @@ 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]);
+	logf (LOG_DEBUG, "base %s", (*basenames)[i]);
 }
 
 int zebra_select_database (ZebraHandle zh, const char *basename)
 {
     ASSERTZH;
     yaz_log(LOG_API,"zebra_select_database %s",basename);
+    assert(basename);
     zh->errCode=0;
     return zebra_select_databases (zh, 1, &basename);
 }
@@ -693,6 +723,8 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     int len = 0;
     char *new_reg = 0;
     ASSERTZH;
+    assert(basenames);
+
     yaz_log(LOG_API,"zebra_select_databases n=%d [0]=%s",
 		    num_bases,basenames[0]);
     zh->errCode=0;
@@ -767,7 +799,13 @@ 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)
 {
+    const char *max;
+    zint maxhits;
     ASSERTZH;
+    assert(o);
+    assert(query);
+    assert(hits);
+    assert(setname);
     yaz_log(LOG_API,"zebra_search_rpn");
     zh->errCode=0;
     zh->hits = 0;
@@ -776,14 +814,29 @@ int zebra_search_RPN (ZebraHandle zh, ODR o,
     if (zebra_begin_read (zh))
 	return 1;
 
+#ifdef SKIPTHIS /* FIXME - livcode rank not yet available */
     zebra_livcode_transform(zh, query);
+#endif
 
     resultSetAddRPN (zh, odr_extract_mem(o), query, 
                      zh->num_basenames, zh->basenames, setname);
 
     zebra_end_read (zh);
-
-    *hits = zh->hits;
+    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 */
+        logf(LOG_DEBUG,"limiting hits to "ZINT_FORMAT, maxhits);
+	*hits=maxhits;  
+    }
+    else
+        *hits = zh->hits;
     return 0;
 }
 
@@ -793,8 +846,13 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 			     ZebraRetrievalRecord *recs)
 {
     ZebraPosSet poset;
-    int i, *pos_array;
+    int i, *pos_array, ret = 0;
     ASSERTZH;
+    assert(stream);
+    assert(setname);
+    assert(recs);
+    assert(num_recs>0);
+
     yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
     zh->errCode=0;
 
@@ -802,13 +860,13 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     {
         zh->errCode = 30;
         zh->errString = odr_strdup (stream, setname);
-        return 1;
+        return -1;
     }
     
     zh->errCode = 0;
 
     if (zebra_begin_read (zh))
-	return 1;
+	return -1;
 
     pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
@@ -819,6 +877,7 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
         logf (LOG_DEBUG, "zebraPosSetCreate error");
         zh->errCode = 30;
         zh->errString = nmem_strdup (stream->mem, setname);
+	ret = -1;
     }
     else
     {
@@ -849,6 +908,7 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 		sprintf (num_str, "%d", pos_array[i]);	
 		zh->errCode = 13;
                 zh->errString = odr_strdup (stream, num_str);
+		ret = -1;
                 break;
 	    }
 	}
@@ -856,7 +916,7 @@ int zebra_records_retrieve (ZebraHandle zh, ODR stream,
     }
     zebra_end_read (zh);
     xfree (pos_array);
-    return 0;
+    return ret;
 }
 
 int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
@@ -865,6 +925,12 @@ int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		 int *is_partial)
 {
     ASSERTZH;
+    assert(stream);
+    assert(zapt);
+    assert(position);
+    assert(num_entries);
+    assert(is_partial);
+    assert(entries);
     yaz_log(LOG_API,"zebra_scan");
     zh->errCode=0;
     if (zebra_begin_read (zh))
@@ -886,6 +952,11 @@ int zebra_sort (ZebraHandle zh, ODR stream,
 		 int *sort_status)
 {
     ASSERTZH;
+    assert(stream);
+    assert(num_input_setnames>0);
+    assert(input_setnames);
+    assert(sort_sequence);
+    assert(sort_status);
     yaz_log(LOG_API,"zebra_sort");
     zh->errCode=0;
     if (zebra_begin_read (zh))
@@ -902,16 +973,19 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 {
     int i, status;
     ASSERTZH;
+    assert(num_setnames>0);
+    assert(setnames);
+    assert(statuses);
     yaz_log(LOG_API,"zebra_deleleResultSet n=%d",num_setnames);
     zh->errCode=0;
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
     {
-    case Z_DeleteRequest_list:
+    case Z_DeleteResultSetRequest_list:
 	resultSetDestroy (zh, num_setnames, setnames, statuses);
 	break;
-    case Z_DeleteRequest_all:
+    case Z_DeleteResultSetRequest_all:
 	resultSetDestroy (zh, -1, 0, statuses);
 	break;
     }
@@ -963,18 +1037,25 @@ void zebra_clearError(ZebraHandle zh)
 
 int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 {
+    const char *p;
+    char u[40];
     ZebraService zs;
+
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_auth u=%s p=%s",user,pass);
     zh->errCode=0;
     zs= zh->service;
+    
+    sprintf(u, "perm.%.30s", user ? user : "anonymous");
+    p = res_get(zs->global_res, u);
+    xfree (zh->user_perm);
+    zh->user_perm = xstrdup(p ? p : "r");
+
+    /* users that don't require a password .. */
+    if (zh->user_perm && strchr(zh->user_perm, 'a'))
+	return 0;
+    
     if (!zs->passwd_db || !passwd_db_auth (zs->passwd_db, user, pass))
-    {
-        logf(LOG_APP,"AUTHOK:%s", user?user:"ANONYMOUS");
 	return 0;
-    }
-
-    logf(LOG_APP,"AUTHFAIL:%s", user?user:"ANONYMOUS");
     return 1;
 }
 
@@ -987,9 +1068,8 @@ int zebra_admin_import_begin (ZebraHandle zh, const char *database,
     zh->errCode=0;
     if (zebra_select_database(zh, database))
         return 1;
-    zebra_begin_trans (zh, 1);
-    xfree (zh->admin_databaseName);
-    zh->admin_databaseName = xstrdup(database);
+    if (zebra_begin_trans (zh, 1))
+	return 1;
     return 0;
 }
 
@@ -1004,7 +1084,7 @@ int zebra_admin_import_end (ZebraHandle zh)
 
 int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 {
-    int sysno;
+    SYSNO sysno;
     int i;
     ASSERTZH;
     yaz_log(LOG_API,"zebra_admin_import_segment");
@@ -1012,11 +1092,9 @@ int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
-	const char *databaseName = npr->databaseName;
 
-	if (!databaseName)
-	    databaseName = zh->admin_databaseName;
 	printf ("--------------%d--------------------\n", i);
+        /* FIXME - What! printing on stdout ??? */
 	if (npr->which == Z_NamePlusRecord_intermediateFragment)
 	{
 	    Z_FragmentSyntax *fragment = npr->u.intermediateFragment;
@@ -1027,15 +1105,14 @@ int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 			oct->buf);
 		
 		sysno = 0;
-		extract_rec_in_mem (zh, "grs.sgml",
+		
+		zebra_update_record(zh, 
+				    0, /* record Type */
+				    &sysno,
+				    0, /* match */
+				    0, /* fname */
 				    oct->buf, oct->len,
-				    databaseName,
-				    0 /* delete_flag */,
-				    0 /* test_mode */,
-				    &sysno /* sysno */,
-				    1 /* store_keys */,
-				    1 /* store_data */,
-				    0 /* match criteria */);
+				    0);
 	    }
 	}
     }
@@ -1043,18 +1120,23 @@ int zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
 }
 
 int zebra_admin_exchange_record (ZebraHandle zh,
-                                 const char *database,
                                  const char *rec_buf,
                                  size_t rec_len,
                                  const char *recid_buf, size_t recid_len,
                                  int action)
+    /* 1 = insert. Fail it already exists */
+    /* 2 = replace. Fail it does not exist */
+    /* 3 = delete. Fail if does not exist */
+    /* 4 = update. Insert/replace */
 {
-    int sysno = 0;
+    SYSNO sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_admin_exchange_record db=%s ac=%d",
-		    database, action);
+    assert(action>0 && action <=4);
+    assert(rec_buf);
+
+    yaz_log(LOG_API,"zebra_admin_exchange_record ac=%d", action);
     zh->errCode=0;
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
@@ -1062,7 +1144,8 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     memcpy (recid_z, recid_buf, recid_len);
     recid_z[recid_len] = 0;
 
-    zebra_begin_trans(zh,1);
+    if (zebra_begin_trans(zh, 1))
+	return -1;
 
     rinfo = dict_lookup (zh->reg->matchDict, recid_z);
     if (rinfo)
@@ -1082,10 +1165,18 @@ int zebra_admin_exchange_record (ZebraHandle zh,
 	    zebra_end_trans(zh);
             return -1;
 	}
-    }
-    extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
-                        action == 3 ? 1 : 0 /* delete flag */,
-                        0, &sysno, 1, 1, 0);
+	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 */
+			   0, /* force update */
+			   1  /* allow update */
+	);
     if (action == 1)
     {
         dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
@@ -1102,6 +1193,7 @@ int delete_w_handle(const char *info, void *handle)
 {
     ZebraHandle zh = (ZebraHandle) handle;
     ISAMC_P pos;
+    ASSERTZH;
 
     if (*info == sizeof(pos))
     {
@@ -1128,6 +1220,7 @@ static int delete_SU_handle(void *handle, int ord)
 
 int zebra_drop_database  (ZebraHandle zh, const char *database)
 {
+    int ret = 0;
     ASSERTZH;
     yaz_log(LOG_API,"zebra_drop_database");
     zh->errCode = 0;
@@ -1143,14 +1236,20 @@ int zebra_drop_database  (ZebraHandle zh, const char *database)
 	zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
 	zebraExplain_removeDatabase(zh->reg->zei, zh);
     }
+    else
+    {
+	yaz_log(LOG_WARN, "drop database only supported for isam:b");
+	ret = -1;
+    }
     zebra_end_trans (zh);
-    return 0;
+    return ret;
 }
 
 int zebra_create_database (ZebraHandle zh, const char *database)
 {
     ASSERTZH;
-    yaz_log(LOG_API,"zebra_create_database");
+    yaz_log(LOG_API,"zebra_create_database %s",database);
+    assert(database);
     zh->errCode=0;
 
     if (zebra_select_database (zh, database))
@@ -1177,6 +1276,8 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 {
     WRBUF wrbuf;
     ASSERTZH;
+    assert(input_str);
+    assert(output_str);
     yaz_log(LOG_API,"zebra_string_norm ");
     zh->errCode=0;
     if (!zh->reg->zebra_maps)
@@ -1195,6 +1296,7 @@ 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;
@@ -1208,7 +1310,7 @@ int zebra_set_state (ZebraHandle zh, int val, int seqno)
     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 (LOG_DEBUG, "zebra_set_state: %c %d %ld", val, seqno, p);
     fprintf (f, "%c %d %ld\n", val, seqno, p);
     fclose (f);
     xfree (fname);
@@ -1249,9 +1351,38 @@ int zebra_end_read (ZebraHandle zh)
     return zebra_end_trans(zh);
 }
 
+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");
+    zh->m_follow_links = atoi(v);
+
+    zh->m_record_id = res_get_prefix(zh->res, "recordId", group, 0);
+    zh->m_record_type = res_get_prefix(zh->res, "recordType", group, 0);
+
+    v = res_get_prefix(zh->res, "storeKeys", group, "1");
+    zh->m_store_keys = atoi(v);
+
+    v = res_get_prefix(zh->res, "storeData", group, "1");
+    zh->m_store_data = atoi(v);
+
+    v = res_get_prefix(zh->res, "explainDatabase", group, "0");
+    zh->m_explain_database = atoi(v);
+
+    v = res_get_prefix(zh->res, "openRW", group, "1");
+    zh->m_flag_rw = atoi(v);
+
+    v = res_get_prefix(zh->res, "fileVerboseLimit", group, "100000");
+    zh->m_file_verbose_limit = atoi(v);
+}
+
 int zebra_begin_trans (ZebraHandle zh, int rw)
 {
-    yaz_log(LOG_LOG, "zebra_begin_trans rw=%d trans=%d", rw, zh->trans_no);
+    ASSERTZH;
     if (!zh->res)
     {
         zh->errCode = 2;
@@ -1260,6 +1391,17 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
     }
     ASSERTZHRES;
     yaz_log(LOG_API,"zebra_begin_trans rw=%d",rw);
+
+    if (zh->user_perm)
+    {
+	if (rw && !strchr(zh->user_perm, 'w'))
+	{
+	    zh->errCode = 223;
+	    zh->errString = 0;
+	    return -1;
+	}
+    }
+
     assert (zh->res);
     if (rw)
     {
@@ -1270,7 +1412,10 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         
         (zh->trans_no++);
         if (zh->trans_w_no)
+	{
+	    read_res_for_transaction(zh);
             return 0;
+	}
         if (zh->trans_no != 1)
         {
             zh->errCode = 2;
@@ -1314,7 +1459,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 (LOG_WARN, "previous transaction didn't finish commit");
                 zebra_unlock (zh->lock_shadow);
                 zebra_unlock (zh->lock_normal);
                 zebra_commit (zh);
@@ -1326,7 +1471,7 @@ 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 (LOG_WARN, "previous transaction didn't reach commit");
                     bf_commitClean (bfs, rval);
                     bfs_destroy (bfs);
             }
@@ -1403,13 +1548,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 (LOG_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 (LOG_DEBUG, "reopen last cur/old %d/%d",
                      val, zh->reg->last_val);
             dirty = 1;
         }
@@ -1422,7 +1567,10 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
             zebra_lock_r (zh->lock_normal);
         
         if (zh->reg)
+	{
+            resultSetInvalidate (zh);
             zebra_register_close (zh->service, zh->reg);
+	}
         zh->reg = zebra_register_open (zh->service, zh->reg_name,
                                        0, val == 'c' ? 1 : 0,
                                        zh->res, zh->path_reg);
@@ -1437,11 +1585,13 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         zh->reg->last_val = val;
         zh->reg->seqno = seqno;
     }
+    read_res_for_transaction(zh);
     return 0;
 }
 
 int zebra_end_trans (ZebraHandle zh)
 {
+    ASSERTZH;
     ZebraTransactionStatus dummy;
     yaz_log(LOG_API,"zebra_end_trans");
     return zebra_end_transaction(zh, &dummy);
@@ -1454,6 +1604,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     const char *rval;
 
     ASSERTZH;
+    assert(status);
     yaz_log(LOG_API,"zebra_end_transaction");
 
     status->processed = 0;
@@ -1485,7 +1636,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 (LOG_DEBUG, "zebra_end_trans");
         rval = res_get (zh->res, "shadow");
         
         zebraExplain_runNumberIncrement (zh->reg->zei, 1);
@@ -1497,7 +1648,8 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         zebra_register_close (zh->service, zh->reg);
         zh->reg = 0;
         
-        yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", 
+        yaz_log (LOG_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);
         
@@ -1510,7 +1662,7 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         if (val != 'd')
         {
             BFiles bfs = bfs_create (rval, zh->path_reg);
-            yaz_log (LOG_LOG, "deleting shadow stuff val=%c", val);
+            yaz_log (LOG_DEBUG, "deleting shadow val=%c", val);
             bf_commitClean (bfs, rval);
             bfs_destroy (bfs);
         }
@@ -1534,30 +1686,33 @@ int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     return 0;
 }
 
-int zebra_repository_update (ZebraHandle zh)
+int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
+    assert(path);
     zh->errCode=0;
-    logf (LOG_LOG|LOG_API, "updating %s", zh->rGroup.path);
-    repositoryUpdate (zh);    
+    logf (LOG_API, "updating %s", path);
+    repositoryUpdate (zh, path);
     return zh->errCode;
 }
 
-int zebra_repository_delete (ZebraHandle zh)
+int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
+    assert(path);
     zh->errCode=0;
-    logf (LOG_LOG|LOG_API, "deleting %s", zh->rGroup.path);
-    repositoryDelete (zh);
+    logf (LOG_API, "deleting %s", path);
+    repositoryDelete (zh, path);
     return zh->errCode;
 }
 
-int zebra_repository_show (ZebraHandle zh)
+int zebra_repository_show (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
+    assert(path);
     yaz_log(LOG_API,"zebra_repository_show");
     zh->errCode=0;
-    repositoryShow (zh);
+    repositoryShow (zh, path);
     return zh->errCode;
 }
 
@@ -1600,13 +1755,13 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
         {
             zebra_set_state (zh, 'c', seqno);
             
-            logf (LOG_LOG, "commit start");
+            logf (LOG_DEBUG, "commit start");
             bf_commitExec (bfs);
 #ifndef WIN32
             sync ();
 #endif
         }
-        logf (LOG_LOG, "commit clean");
+        logf (LOG_DEBUG, "commit clean");
         bf_commitClean (bfs, rval);
         seqno++;
         zebra_set_state (zh, 'o', seqno);
@@ -1624,12 +1779,14 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
 
 int zebra_clean (ZebraHandle zh)
 {
+    ASSERTZH;
     yaz_log(LOG_API,"zebra_clean");
     return zebra_commit_ex(zh, 1);
 }
 
 int zebra_commit (ZebraHandle zh)
 {
+    ASSERTZH;
     yaz_log(LOG_API,"zebra_commit");
     return zebra_commit_ex(zh, 0);
 }
@@ -1651,6 +1808,8 @@ int zebra_init (ZebraHandle zh)
 
     bfs = bfs_create (res_get (zh->service->global_res, "register"),
                       zh->path_reg);
+    if (!bfs)
+	return -1;
     if (rval && *rval)
         bf_cache (bfs, rval);
     
@@ -1677,41 +1836,6 @@ int zebra_compact (ZebraHandle zh)
     return 0;
 }
 
-int zebra_record_insert (ZebraHandle zh, const char *buf, int len, int *sysno)
-{
-    int sysn=0;
-    ASSERTZH;
-    yaz_log(LOG_API,"zebra_record_insert");
-    if (sysno)
-	*sysno=0;
-    zh->errCode=0;
-    if (zebra_begin_trans (zh, 1))
-        return -1;
-    extract_rec_in_mem (zh, "grs.sgml",
-                        buf, len,
-                        "Default",  /* database */
-                        0 /* delete_flag */,
-                        0 /* test_mode */,
-                        &sysn /* sysno */,
-                        1 /* store_keys */,
-                        1 /* store_data */,
-                        0 /* match criteria */);
-    if (zebra_end_trans (zh))
-        return -1;
-    if (sysno)
-	*sysno=sysn;
-    return 0;
-}
-
-int zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
-{
-    ASSERTZH;
-    yaz_log(LOG_API,"zebra_set_group");
-    zh->errCode=0;
-    memcpy (&zh->rGroup, rg, sizeof(*rg));
-    return 0;
-}
-
 int zebra_result (ZebraHandle zh, int *code, char **addinfo)
 {
     ASSERTZH;
@@ -1733,6 +1857,7 @@ int zebra_shadow_enable (ZebraHandle zh, int value)
 int zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
+    assert(encoding);
     yaz_log(LOG_API,"zebra_record_encoding");
     zh->errCode=0;
     xfree (zh->record_encoding);
@@ -1766,9 +1891,11 @@ int zebra_record_encoding (ZebraHandle zh, const char *encoding)
 int zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
 {
     ASSERTZH;
+    assert(name);
+    assert(value);
     yaz_log(LOG_API,"zebra_set_resource %s:%s",name,value);
     zh->errCode=0;
-    res_put(zh->res, name, value);
+    res_set(zh->res, name, value);
     return 0;
 }
 
@@ -1777,6 +1904,8 @@ 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);
@@ -1795,123 +1924,19 @@ int zebra_trans_no (ZebraHandle zh)
 
 int zebra_get_shadow_enable (ZebraHandle zh)
 {
+    ASSERTZH;
     yaz_log(LOG_API,"zebra_get_shadow_enable");
     return (zh->shadow_enable);
 }
 
 int zebra_set_shadow_enable (ZebraHandle zh, int value)
 {
+    ASSERTZH;
     yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
     zh->shadow_enable = value;
     return 0;
 }
 
-int init_recordGroup (struct recordGroup *rg)
-{
-    assert(rg);
-    yaz_log(LOG_API,"init_recordGroup");
-    rg->groupName = NULL;
-    rg->databaseName = NULL;
-    rg->path = NULL;
-    rg->recordId = NULL;
-    rg->recordType = NULL;
-    rg->flagStoreData = -1;
-    rg->flagStoreKeys = -1; 
-    rg->flagRw = 1;
-    rg->databaseNamePath = 0;
-    rg->explainDatabase = 0; 
-    rg->fileVerboseLimit = 100000; 
-    rg->followLinks = -1;
-    return 0;
-} 
-
-
-/* This is from extract.c... it seems useful, when extract_rec_in mem is 
-   called... and in general... Should be moved to somewhere else */
-void res_get_recordGroup (ZebraHandle zh,
-			  struct recordGroup *rGroup,
-			  const char *ext)
-{
-    char gprefix[128];
-    char ext_res[128]; 
-    
-    yaz_log(LOG_API,"res_get_recordGroup e=%s",ext);
-    if (!rGroup->groupName || !*rGroup->groupName)
-	*gprefix = '\0';
-    else 
-	sprintf (gprefix, "%s.", rGroup->groupName);
-    
-    /* determine file type - depending on extension */
-    if (!rGroup->recordType) {
-	sprintf (ext_res, "%srecordType.%s", gprefix, ext);
-	if (!(rGroup->recordType = res_get (zh->res, ext_res))) {
-	    sprintf (ext_res, "%srecordType", gprefix);
-	    rGroup->recordType = res_get (zh->res, ext_res);
-	}
-    }
-    /* determine match criteria */
-    if (!rGroup->recordId) { 
-	sprintf (ext_res, "%srecordId.%s", gprefix, ext);
-	if (!(rGroup->recordId = res_get (zh->res, ext_res))) {
-	    sprintf (ext_res, "%srecordId", gprefix);
-	    rGroup->recordId = res_get (zh->res, ext_res);
-	}
-    } 
-    
-    /* determine database name */
-    if (!rGroup->databaseName) {
-	sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
-	if (!(rGroup->databaseName = res_get (zh->res, ext_res))) { 
-	    sprintf (ext_res, "%sdatabase", gprefix);
-	    rGroup->databaseName = res_get (zh->res, ext_res);
-	}
-    }
-    if (!rGroup->databaseName)
-	rGroup->databaseName = "Default";
-    
-    /* determine if explain database */
-    sprintf (ext_res, "%sexplainDatabase", gprefix);
-    rGroup->explainDatabase =
-	atoi (res_get_def (zh->res, ext_res, "0"));
-    
-    /* storeData */
-    if (rGroup->flagStoreData == -1)
-    {
-	const char *sval;
-	sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
-	if (!(sval = res_get (zh->res, ext_res)))
-	{
-	    sprintf (ext_res, "%sstoreData", gprefix);
-	    sval = res_get (zh->res, ext_res);
-	}
-	if (sval)
-	    rGroup->flagStoreData = atoi (sval);
-    }
-    if (rGroup->flagStoreData == -1) 
-	rGroup->flagStoreData = 0;
-    
-    /* storeKeys */
-    if (rGroup->flagStoreKeys == -1)
-    {
-	const char *sval;
-	
-	sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
-	sval = res_get (zh->res, ext_res);
-	if (!sval)
-	{
-	    sprintf (ext_res, "%sstoreKeys", gprefix);
-	    sval = res_get (zh->res, ext_res);
-	}
-	if (!sval)
-	    sval = res_get (zh->res, "storeKeys");
-	if (sval)
-	    rGroup->flagStoreKeys = atoi (sval);
-    }
-    if (rGroup->flagStoreKeys == -1)
-	rGroup->flagStoreKeys = 0;
-} 
-
-
 /* almost the same as zebra_records_retrieve ... but how did it work? 
    I mean for multiple records ??? CHECK ??? */
 void api_records_retrieve (ZebraHandle zh, ODR stream,
@@ -1921,6 +1946,12 @@ void api_records_retrieve (ZebraHandle zh, ODR stream,
 {
     ZebraPosSet poset;
     int i, *pos_array;
+    ASSERTZH;
+    assert(stream);
+    assert(setname);
+    assert(comp);
+    assert(recs);
+    assert(num_recs>0);
     yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs);
 
     if (!zh->res)
@@ -1997,87 +2028,100 @@ void api_records_retrieve (ZebraHandle zh, ODR stream,
 /* ---------------------------------------------------------------------------
   Record insert(=update), delete 
 
-  If sysno is provided, then it's used to identify the reocord.
+  If sysno is provided, then it's used to identify the record.
   If not, and match_criteria is provided, then sysno is guessed
   If not, and a record is provided, then sysno is got from there
 NOTE: Now returns 0 at success and updates sysno, which is an int*
   20-jun-2003 Heikki
 */
 
+int zebra_add_record(ZebraHandle zh,
+		     const char *buf, int buf_size)
+{
+    SYSNO sysno = 0;
+    return zebra_update_record(zh, 0, &sysno, 0, 0, buf, buf_size, 0);
+}
+
 int zebra_insert_record (ZebraHandle zh, 
-			 struct recordGroup *rGroup,
 			 const char *recordType,
-			 int *sysno, const char *match, const char *fname,
-			 const char *buf, int buf_size,
-			 int force_update) /* This one is ignored */
- 
+			 SYSNO *sysno, const char *match, const char *fname,
+			 const char *buf, int buf_size, int force_update)
 {
     int res;
-    yaz_log(LOG_API,"zebra_insert_record sysno=%d", *sysno);
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+    yaz_log(LOG_API, "zebra_insert_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
-    zebra_begin_trans(zh, 1);
-    res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     0, /* delete_flag  */
-			     0, /* test_mode */
-			     recordType,
-			     sysno,   
-			     match, fname,
-			     force_update, 
-			     0); /* allow_update */
+    if (zebra_begin_trans(zh, 1))
+	return 1;
+    res = buffer_extract_record (zh, buf, buf_size, 
+				 0, /* delete_flag  */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,   
+				 match, fname,
+				 0, 
+				 0); /* allow_update */
     zebra_end_trans(zh); 
-    if (res < 0) return (res);
     return res; 
 }
 
 int zebra_update_record (ZebraHandle zh, 
-			 struct recordGroup *rGroup,
 			 const char *recordType,
-			 int* sysno, const char *match, const char *fname,
+			 SYSNO* sysno, const char *match, const char *fname,
 			 const char *buf, int buf_size,
 			 int force_update)
 {
     int res;
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
 
-    yaz_log(LOG_API,"zebra_update_record sysno=%d", *sysno);
+    yaz_log(LOG_API, "zebra_update_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
-    zebra_begin_trans(zh, 1);
-    res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     0, /* delete_flag */
-			     0, /* test_mode */
-			     recordType,
-			     sysno,   
-			     match, fname,
-			     force_update, 
-			     1); /* allow_update */
+    if (zebra_begin_trans(zh, 1))
+	return 1;
+    res = buffer_extract_record (zh, buf, buf_size, 
+				 0, /* delete_flag */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,   
+				 match, fname,
+				 force_update, 
+				 1); /* allow_update */
     zebra_end_trans(zh); 
     return res; 
 }
 
 int zebra_delete_record (ZebraHandle zh, 
-			 struct recordGroup *rGroup, 
 			 const char *recordType,
-			 int *sysno, const char *match, const char *fname,
+			 SYSNO *sysno, const char *match, const char *fname,
 			 const char *buf, int buf_size,
 			 int force_update) 
 {
     int res;
-    yaz_log(LOG_API,"zebra_delete_record sysno=%d", *sysno);
+    ASSERTZH;
+    assert(sysno);
+    assert(buf);
+    yaz_log(LOG_API, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
-    zebra_begin_trans(zh, 1);
-    res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     1, /* delete_flag */
-			     0, /* test_mode */
-			     recordType,
-			     sysno,
-			     match,fname,
-			     force_update,
-			     1); /* allow_update */
+    if (zebra_begin_trans(zh, 1))
+	return 1;
+    res = buffer_extract_record (zh, buf, buf_size,
+				 1, /* delete_flag */
+				 0, /* test_mode */
+				 recordType,
+				 sysno,
+				 match,fname,
+				 force_update,
+				 1); /* allow_update */
     zebra_end_trans(zh);
     return res;   
 }
@@ -2093,6 +2137,9 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
     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);
     
@@ -2105,6 +2152,8 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
     
     odr_destroy(odr);
 
+    yaz_log(LOG_API,"Hits: %d",hits);
+
     if (numhits)
 	*numhits=hits;
 
@@ -2113,17 +2162,22 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
 
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.
-  FIXME - This is a horrible name, will conflict with half the applications
 */
-int zebra_sort_2 (ZebraHandle zh, 
-		  ODR stream,
-		  const char *sort_spec,
-		  const char *output_setname,
-		  const char **input_setnames) 
+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);
+    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_API,"sort (FIXME) ");
     if (!sort_sequence)
     {
@@ -2145,3 +2199,4 @@ int zebra_sort_2 (ZebraHandle zh,
     zebra_end_read(zh);
     return sort_status;
 }
+