X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzebraapi.c;h=3d9d89f246a9de2427fd4fd41cc5af20b12d4776;hp=1ebc60deb11a75e830e2dc54287e480e1422d167;hb=13bf0c380e98816595127291b64368dd9b8ca639;hpb=8f7cd01d361d4c2ebb375b05c98eb9e82cae4a43

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 1ebc60d..3d9d89f 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,5 +1,5 @@
-/* $Id: zebraapi.c,v 1.94 2003-03-25 19:56:01 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: zebraapi.c,v 1.128 2004-09-03 14:59:49 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,13 +36,21 @@ 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);
 
@@ -52,6 +59,7 @@ static void zebra_chdir (ZebraService zs)
 {
     const char *dir ;
     ASSERTZS;
+    yaz_log(LOG_API,"zebra_chdir");
     dir = res_get (zs->global_res, "chdir");
     if (!dir)
 	return;
@@ -66,11 +74,12 @@ static void zebra_chdir (ZebraService zs)
 static void zebra_flush_reg (ZebraHandle zh)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_flush_reg");
     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, 
@@ -85,6 +94,7 @@ ZebraHandle zebra_open (ZebraService zs)
     ZebraHandle zh;
     const char *default_encoding;
     ASSERTZS;
+    yaz_log(LOG_API,"zebra_open");
 
     if (!zs)
         return 0;
@@ -99,6 +109,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;
@@ -111,8 +122,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");
@@ -141,11 +150,16 @@ 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_LOG, "zebra_start %s", configName);
+    yaz_log(LOG_API|LOG_LOG,"zebra_start %s",configName);
 
-    if ((res = res_open (configName, 0)))
+    if ((res = res_open (configName, def_res, over_res)))
     {
         ZebraService zh = xmalloc (sizeof(*zh));
 
@@ -175,6 +189,13 @@ ZebraService zebra_start (const char *configName)
     return 0;
 }
 
+
+void zebra_pidfname(ZebraService zs, char *path)
+{
+    zebra_lock_prefix (zs->global_res, path);
+    strcat(path, "zebrasrv.pid");
+}
+
 static
 struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
                                             int rw, int useshadow, Res res,
@@ -182,7 +203,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;
     
@@ -196,9 +219,9 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
 
     assert (res);
 
-    yaz_log (LOG_DEBUG, "zebra_register_open rw = %d useshadow=%d p=%p",
-             rw, useshadow, reg);
-
+    yaz_log (LOG_LOG|LOG_API, "zebra_register_open rw = %d useshadow=%d p=%p,n=%s,rp=%s",
+             rw, useshadow, reg, name, reg_path ? reg_path : "(none)");
+    
     reg->dh = data1_createx (DATA1_FLAG_XML);
     if (!reg->dh)
         return 0;
@@ -210,8 +233,12 @@ 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_LOG, "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);
@@ -223,6 +250,10 @@ 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;
 
@@ -231,16 +262,16 @@ 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);
     zebraRankInstall (reg, rankzv_class);
+    zebraRankInstall (reg, rankliv_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -277,15 +308,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;
@@ -296,17 +318,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;
@@ -353,30 +364,34 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     return reg;
 }
 
-void zebra_admin_shutdown (ZebraHandle zh)
+int zebra_admin_shutdown (ZebraHandle zh)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_admin_shutdown");
     zh->errCode=0;
 
     zebra_mutex_cond_lock (&zh->service->session_lock);
     zh->service->stop_flag = 1;
     zebra_mutex_cond_unlock (&zh->service->session_lock);
+    return 0;
 }
 
-void zebra_admin_start (ZebraHandle zh)
+int zebra_admin_start (ZebraHandle zh)
 {
     ZebraService zs;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_admin_start");
     zh->errCode=0;
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
+    return 0;
 }
 
 static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 {
     ASSERTZS;
-    yaz_log(LOG_DEBUG, "zebra_register_close p=%p", reg);
+    yaz_log(LOG_LOG|LOG_API, "zebra_register_close p=%p", reg);
     reg->stop_flag = 0;
     zebra_chdir (zs);
     if (reg->records)
@@ -388,12 +403,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);
@@ -407,17 +418,21 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
 
     xfree (reg->sortKeys.buf);
     xfree (reg->keys.buf);
+#if IT_KEY_NEW
+    if (reg->keys.codec_handle)
+	iscz1_stop(reg->keys.codec_handle);
+#endif
 
     xfree (reg->key_buf);
     xfree (reg->name);
     xfree (reg);
 }
 
-void zebra_stop(ZebraService zs)
+int zebra_stop(ZebraService zs)
 {
     if (!zs)
-        return ;
-    yaz_log (LOG_LOG, "zebra_stop");
+        return 0;
+    yaz_log (LOG_LOG|LOG_API, "zebra_stop");
 
     while (zs->sessions)
     {
@@ -431,25 +446,24 @@ void zebra_stop(ZebraService zs)
 
     res_close (zs->global_res);
     xfree (zs->configName);
-    xfree (zs->path_root);
     xfree (zs);
+    return 0;
 }
 
-void zebra_close (ZebraHandle zh)
+int zebra_close (ZebraHandle zh)
 {
     ZebraService zs;
     struct zebra_session **sp;
     int i;
 
+    yaz_log(LOG_API,"zebra_close");
     if (!zh)
-        return;
+        return 0;
     ASSERTZH;
     zh->errCode=0;
     
     zs = zh->service;
     yaz_log (LOG_DEBUG, "zebra_close zh=%p", zh);
-    if (!zh)
-        return ;
     resultSetDestroy (zh, -1, 0, 0);
 
     if (zh->reg)
@@ -467,7 +481,6 @@ void 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);
@@ -484,8 +497,11 @@ void 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;
 }
 
 struct map_baseinfo {
@@ -508,7 +524,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;
     }
@@ -586,7 +602,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);
@@ -634,6 +650,7 @@ void map_basenames (ZebraHandle zh, ODR stream,
     struct map_baseinfo *p = &info;
     int i;
     ASSERTZH;
+    yaz_log(LOG_API,"map_basenames ");
     zh->errCode=0;
 
     info.zh = zh;
@@ -662,6 +679,7 @@ void map_basenames (ZebraHandle zh, ODR stream,
 int zebra_select_database (ZebraHandle zh, const char *basename)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_select_database %s",basename);
     zh->errCode=0;
     return zebra_select_databases (zh, 1, &basename);
 }
@@ -674,6 +692,8 @@ 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",
+		    num_bases,basenames[0]);
     zh->errCode=0;
     
     if (num_bases < 1)
@@ -743,45 +763,66 @@ int zebra_select_databases (ZebraHandle zh, int num_bases,
     return 0;
 }
 
-void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
+int zebra_search_RPN (ZebraHandle zh, ODR o,
 		       Z_RPNQuery *query, const char *setname, int *hits)
 {
+    const char *max;
+    zint maxhits;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_search_rpn");
     zh->errCode=0;
     zh->hits = 0;
     *hits = 0;
 
     if (zebra_begin_read (zh))
-	return;
-    resultSetAddRPN (zh, decode, stream, query, 
+	return 1;
+
+    zebra_livcode_transform(zh, query);
+
+    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;
+	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 */
+    }
+    else
+        *hits = zh->hits;
+    return 0;
 }
 
-void zebra_records_retrieve (ZebraHandle zh, ODR stream,
+int zebra_records_retrieve (ZebraHandle zh, ODR stream,
 			     const char *setname, Z_RecordComposition *comp,
 			     oid_value input_format, int num_recs,
 			     ZebraRetrievalRecord *recs)
 {
     ZebraPosSet poset;
-    int i, *pos_array;
+    int i, *pos_array, ret = 0;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_records_retrieve n=%d",num_recs);
     zh->errCode=0;
 
     if (!zh->res)
     {
         zh->errCode = 30;
         zh->errString = odr_strdup (stream, setname);
-        return;
+        return -1;
     }
     
     zh->errCode = 0;
 
     if (zebra_begin_read (zh))
-	return;
+	return -1;
 
     pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array));
     for (i = 0; i<num_recs; i++)
@@ -792,6 +833,7 @@ void 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
     {
@@ -822,6 +864,7 @@ void 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;
 	    }
 	}
@@ -829,39 +872,44 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream,
     }
     zebra_end_read (zh);
     xfree (pos_array);
+    return ret;
 }
 
-void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
+int zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 		 oid_value attributeset,
 		 int *position, int *num_entries, ZebraScanEntry **entries,
 		 int *is_partial)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_scan");
     zh->errCode=0;
     if (zebra_begin_read (zh))
     {
 	*entries = 0;
 	*num_entries = 0;
-	return;
+	return 1;
     }
     rpn_scan (zh, stream, zapt, attributeset,
 	      zh->num_basenames, zh->basenames, position,
 	      num_entries, entries, is_partial, 0, 0);
     zebra_end_read (zh);
+    return 0;
 }
 
-void zebra_sort (ZebraHandle zh, ODR stream,
+int zebra_sort (ZebraHandle zh, ODR stream,
 		 int num_input_setnames, const char **input_setnames,
 		 const char *output_setname, Z_SortKeySpecList *sort_sequence,
 		 int *sort_status)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_sort");
     zh->errCode=0;
     if (zebra_begin_read (zh))
-	return;
+	return 1;
     resultSetSort (zh, stream->mem, num_input_setnames, input_setnames,
 		   output_setname, sort_sequence, sort_status);
     zebra_end_read(zh);
+    return 0;
 }
 
 int zebra_deleleResultSet(ZebraHandle zh, int function,
@@ -870,15 +918,16 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 {
     int i, status;
     ASSERTZH;
+    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;
     }
@@ -893,72 +942,99 @@ int zebra_deleleResultSet(ZebraHandle zh, int function,
 int zebra_errCode (ZebraHandle zh)
 {
     if (zh)
+    {
+        yaz_log(LOG_API,"zebra_errCode: %d",zh->errCode);
         return zh->errCode;
+    }
+    yaz_log(LOG_API,"zebra_errCode: o");
     return 0; 
 }
 
 const char *zebra_errString (ZebraHandle zh)
 {
+    const char *e="";
     if (zh)
-        return diagbib1_str (zh->errCode);
-    return "";
+        e= diagbib1_str (zh->errCode);
+    yaz_log(LOG_API,"zebra_errString: %s",e);
+    return e;
 }
 
 char *zebra_errAdd (ZebraHandle zh)
 {
+    char *a="";
+    if (zh)
+        a= zh->errString;
+    yaz_log(LOG_API,"zebra_errAdd: %s",a);
+    return a;
+}
+
+void zebra_clearError(ZebraHandle zh)
+{
     if (zh)
-        return zh->errString;
-    return "";
+    {
+        zh->errCode=0;
+        zh->errString="";
+    }
 }
 
 int zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 {
+    const char *p;
+    char u[40];
     ZebraService zs;
+
     ASSERTZH;
     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;
 }
 
-void zebra_admin_import_begin (ZebraHandle zh, const char *database,
+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", 
+		     database, record_type);
     zh->errCode=0;
     if (zebra_select_database(zh, database))
-        return;
-    zebra_begin_trans (zh, 1);
-    xfree (zh->admin_databaseName);
-    zh->admin_databaseName = xstrdup(database);
+        return 1;
+    if (zebra_begin_trans (zh, 1))
+	return 1;
+    return 0;
 }
 
-void zebra_admin_import_end (ZebraHandle zh)
+int zebra_admin_import_end (ZebraHandle zh)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_admin_import_end");
     zh->errCode=0;
     zebra_end_trans (zh);
+    return 0;
 }
 
-void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
+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");
     zh->errCode=0;
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
-	const char *databaseName = npr->databaseName;
 
-	if (!databaseName)
-	    databaseName = zh->admin_databaseName;
 	printf ("--------------%d--------------------\n", i);
 	if (npr->which == Z_NamePlusRecord_intermediateFragment)
 	{
@@ -970,31 +1046,35 @@ void 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);
 	    }
 	}
     }
+    return 0;
 }
 
 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 ac=%d", action);
     zh->errCode=0;
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
@@ -1002,21 +1082,39 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     memcpy (recid_z, recid_buf, recid_len);
     recid_z[recid_len] = 0;
 
+    if (zebra_begin_trans(zh, 1))
+	return -1;
+
     rinfo = dict_lookup (zh->reg->matchDict, recid_z);
     if (rinfo)
     {
         if (action == 1)  /* fail if insert */
-            return -1;
+        {
+	     zebra_end_trans(zh);
+	     return -1;
+	}
+
         memcpy (&sysno, rinfo+1, sizeof(sysno));
     }
     else
     {
         if (action == 2 || action == 3) /* fail if delete or update */
+        {
+	    zebra_end_trans(zh);
             return -1;
+	}
+	action = 1;  /* make it an insert (if it's an update).. */
     }
-    extract_rec_in_mem (zh, "grs.sgml", rec_buf, rec_len, database,
-                        action == 3 ? 1 : 0 /* delete flag */,
-                        0, &sysno, 1, 1, 0);
+    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);
@@ -1025,28 +1123,87 @@ int zebra_admin_exchange_record (ZebraHandle zh,
     {
         dict_delete (zh->reg->matchDict, recid_z);
     }
+    zebra_end_trans(zh);
     return 0;
 }
 
-void zebra_admin_create (ZebraHandle zh, const char *database)
+int delete_w_handle(const char *info, void *handle)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
+    ISAMC_P pos;
+
+    if (*info == sizeof(pos))
+    {
+	memcpy (&pos, info+1, sizeof(pos));
+	isamb_unlink(zh->reg->isamb, pos);
+    }
+    return 0;
+}
+
+static int delete_SU_handle(void *handle, int ord)
+{
+    ZebraHandle zh = (ZebraHandle) handle;
+    char ord_buf[20];
+    int ord_len;
+
+    ord_len = key_SU_encode (ord, ord_buf);
+    ord_buf[ord_len] = '\0';
+
+    assert (zh->reg->isamb);
+    dict_delete_subtree(zh->reg->dict, ord_buf,
+			zh, delete_w_handle);
+    return 0;
+}
+
+int zebra_drop_database  (ZebraHandle zh, const char *database)
+{
+    int ret = 0;
+    ASSERTZH;
+    yaz_log(LOG_API,"zebra_drop_database");
+    zh->errCode = 0;
+
+    if (zebra_select_database (zh, database))
+        return -1;
+    if (zebra_begin_trans (zh, 1))
+        return -1;
+    if (zh->reg->isamb)
+    {
+	zebraExplain_curDatabase (zh->reg->zei, 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 ret;
+}
+
+int zebra_create_database (ZebraHandle zh, const char *database)
 {
-    ZebraService zs;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_create_database");
     zh->errCode=0;
 
     if (zebra_select_database (zh, database))
-        return;
-    zebra_begin_trans (zh, 1);
+        return -1;
+    if (zebra_begin_trans (zh, 1))
+        return -1;
 
-    zs = zh->service;
     /* announce database */
     if (zebraExplain_newDatabase (zh->reg->zei, database, 0 
                                   /* explainDatabase */))
     {
+        zebra_end_trans (zh);
 	zh->errCode = 224;
 	zh->errString = "database already exist";
+	return -1;
     }
     zebra_end_trans (zh);
+    return 0;
 }
 
 int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
@@ -1055,6 +1212,7 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 {
     WRBUF wrbuf;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_string_norm ");
     zh->errCode=0;
     if (!zh->reg->zebra_maps)
 	return -1;
@@ -1071,13 +1229,14 @@ int zebra_string_norm (ZebraHandle zh, unsigned reg_id,
 }
 
 
-void zebra_set_state (ZebraHandle zh, int val, int seqno)
+int zebra_set_state (ZebraHandle zh, int val, int 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;
 
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
@@ -1088,15 +1247,17 @@ void zebra_set_state (ZebraHandle zh, int val, int seqno)
     fprintf (f, "%c %d %ld\n", val, seqno, p);
     fclose (f);
     xfree (fname);
+    return 0;
 }
 
-void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
+int zebra_get_state (ZebraHandle zh, char *val, int *seqno)
 {
     char state_fname[256];
     char *fname;
     FILE *f;
 
     ASSERTZH;
+    yaz_log(LOG_API,"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);
@@ -1110,6 +1271,7 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
         fclose (f);
     }
     xfree (fname);
+    return 0;
 }
 
 int zebra_begin_read (ZebraHandle zh)
@@ -1117,14 +1279,60 @@ int zebra_begin_read (ZebraHandle zh)
     return zebra_begin_trans(zh, 0);
 }
 
-void zebra_end_read (ZebraHandle zh)
+int zebra_end_read (ZebraHandle zh)
 {
-    zebra_end_trans(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;
+    
+    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)
 {
+    if (!zh->res)
+    {
+        zh->errCode = 2;
+        zh->errString = "zebra_begin_trans: no database selected";
+        return -1;
+    }
     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)
     {
@@ -1135,19 +1343,25 @@ 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;
-            zh->errString = "write trans not allowed within read trans";
+            zh->errString = "zebra_begin_trans: write trans not allowed within read trans";
             return -1;
         }
+        if (zh->reg)
+	{
+            resultSetInvalidate (zh);
+            zebra_register_close (zh->service, zh->reg);
+	}
         zh->trans_w_no = zh->trans_no;
 
         zh->errCode=0;
         
-        yaz_log (LOG_LOG, "zebra_begin_trans");
-        
         zh->records_inserted = 0;
         zh->records_updated = 0;
         zh->records_deleted = 0;
@@ -1210,8 +1424,23 @@ int zebra_begin_trans (ZebraHandle zh, int rw)
         zh->reg = zebra_register_open (zh->service, zh->reg_name,
                                        1, rval ? 1 : 0, zh->res,
                                        zh->path_reg);
-        
-        zh->reg->seqno = seqno;
+        if (zh->reg)
+            zh->reg->seqno = seqno;
+        else
+        {
+            zebra_set_state (zh, 'o', seqno);
+            
+            zebra_unlock (zh->lock_shadow);
+            zebra_unlock (zh->lock_normal);
+
+            zh->trans_no--;
+            zh->trans_w_no = 0;
+
+            zh->errCode = 2;
+            zh->errString = "zebra_begin_trans: cannot open register";
+            yaz_log(LOG_FATAL, zh->errString);
+            return -1;
+        }
     }
     else
     {
@@ -1269,33 +1498,43 @@ 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);
         if (!zh->reg)
         {
+            zebra_unlock (zh->lock_normal);
+            zebra_unlock (zh->lock_shadow);
+            zh->trans_no--;
             zh->errCode = 109;
             return -1;
         }
         zh->reg->last_val = val;
         zh->reg->seqno = seqno;
     }
+    read_res_for_transaction(zh);
     return 0;
 }
 
-void zebra_end_trans (ZebraHandle zh) {
-  ZebraTransactionStatus dummy;
-  zebra_end_transaction(zh, &dummy);
+int zebra_end_trans (ZebraHandle zh)
+{
+    ZebraTransactionStatus dummy;
+    yaz_log(LOG_API,"zebra_end_trans");
+    return zebra_end_transaction(zh, &dummy);
 }
 
-void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
+int zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
 {
     char val;
     int seqno;
     const char *rval;
 
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_end_transaction");
 
     status->processed = 0;
     status->inserted  = 0;
@@ -1304,11 +1543,17 @@ void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     status->utime     = 0;
     status->stime     = 0;
 
+    if (!zh->res || !zh->reg)
+    {
+        zh->errCode = 2;
+        zh->errString = "zebra_end_trans: no open transaction";
+        return -1;
+    }
     if (zh->trans_no != zh->trans_w_no)
     {
         zh->trans_no--;
         if (zh->trans_no != 0)
-            return;
+            return 0;
 
         /* release read lock */
 
@@ -1327,10 +1572,13 @@ void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         
         zebra_flush_reg (zh);
         
+        resultSetInvalidate (zh);
+
         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);
         
@@ -1364,29 +1612,34 @@ void zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     status->utime = (long) (zh->tms2.tms_utime - zh->tms1.tms_utime);
     status->stime = (long) (zh->tms2.tms_stime - zh->tms1.tms_stime);
 #endif
+    return 0;
 }
 
-void zebra_repository_update (ZebraHandle zh)
+int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     zh->errCode=0;
-    logf (LOG_LOG, "updating %s", zh->rGroup.path);
-    repositoryUpdate (zh);    
+    logf (LOG_LOG|LOG_API, "updating %s", path);
+    repositoryUpdate (zh, path);
+    return zh->errCode;
 }
 
-void zebra_repository_delete (ZebraHandle zh)
+int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     zh->errCode=0;
-    logf (LOG_LOG, "deleting %s", zh->rGroup.path);
-    repositoryDelete (zh);
+    logf (LOG_LOG|LOG_API, "deleting %s", path);
+    repositoryDelete (zh, path);
+    return zh->errCode;
 }
 
-void zebra_repository_show (ZebraHandle zh)
+int zebra_repository_show (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_repository_show");
     zh->errCode=0;
-    repositoryShow (zh);
+    repositoryShow (zh, path);
+    return zh->errCode;
 }
 
 static int zebra_commit_ex (ZebraHandle zh, int clean_only)
@@ -1452,12 +1705,14 @@ static int zebra_commit_ex (ZebraHandle zh, int clean_only)
 
 int zebra_clean (ZebraHandle zh)
 {
-    zebra_commit_ex(zh, 1);
+    yaz_log(LOG_API,"zebra_clean");
+    return zebra_commit_ex(zh, 1);
 }
 
 int zebra_commit (ZebraHandle zh)
 {
-    zebra_commit_ex(zh, 0);
+    yaz_log(LOG_API,"zebra_commit");
+    return zebra_commit_ex(zh, 0);
 }
 
 int zebra_init (ZebraHandle zh)
@@ -1465,6 +1720,7 @@ int zebra_init (ZebraHandle zh)
     const char *rval;
     BFiles bfs = 0;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_init");
     zh->errCode=0;
 
     if (!zh->res)
@@ -1489,6 +1745,7 @@ int zebra_compact (ZebraHandle zh)
 {
     BFiles bfs;
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_compact");
     zh->errCode=0;
     if (!zh->res)
     {
@@ -1501,60 +1758,34 @@ int zebra_compact (ZebraHandle zh)
     return 0;
 }
 
-int zebra_record_insert (ZebraHandle zh, const char *buf, int len)
-{
-    int sysno = 0;
-    int olderr;
-    ASSERTZH;
-    zh->errCode=0;
-    zebra_begin_trans (zh, 1);
-    if (zh->errCode)
-      return 0; /* bad sysno */
-    extract_rec_in_mem (zh, "grs.sgml",
-                        buf, len,
-                        "Default",  /* database */
-                        0 /* delete_flag */,
-                        0 /* test_mode */,
-                        &sysno /* sysno */,
-                        1 /* store_keys */,
-                        1 /* store_data */,
-                        0 /* match criteria */);
-    olderr=zh->errCode;
-    zebra_end_trans (zh);
-    if (olderr)
-      zh->errCode=olderr; 
-    return sysno;
-}
-
-void zebra_set_group (ZebraHandle zh, struct recordGroup *rg)
-{
-    ASSERTZH;
-    zh->errCode=0;
-    memcpy (&zh->rGroup, rg, sizeof(*rg));
-}
-
-void zebra_result (ZebraHandle zh, int *code, char **addinfo)
+int zebra_result (ZebraHandle zh, int *code, char **addinfo)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_result");
     *code = zh->errCode;
     *addinfo = zh->errString;
+    return 0;
 }
 
-void zebra_shadow_enable (ZebraHandle zh, int value)
+int zebra_shadow_enable (ZebraHandle zh, int value)
 {
     ASSERTZH;
+    yaz_log(LOG_API,"zebra_shadow_enable");
     zh->errCode=0;
     zh->shadow_enable = value;
+    return 0;
 }
 
 int zebra_record_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???
      */
 
     if (zh->iconv_to_utf8 != 0)
@@ -1578,130 +1809,49 @@ int zebra_record_encoding (ZebraHandle zh, const char *encoding)
     return 0;
 }
 
-void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
+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;
-    res_put(zh->res, name, value);
+    res_set(zh->res, name, value);
+    return 0;
 }
 
 const char *zebra_get_resource(ZebraHandle zh,
-		                const char *name, const char *defaultvalue)
+                               const char *name, const char *defaultvalue)
 {
+    const char *v;
     ASSERTZH;
+    v= res_get_def( zh->res, name, (char *)defaultvalue);
     zh->errCode=0;
-    return res_get_def( zh->res, name, (char *)defaultvalue);
+    yaz_log(LOG_API,"zebra_get_resource %s:%s",name,v);
+    return v;
 }
 
 /* moved from zebra_api_ext.c by pop */
+/* FIXME: Should this really be public??? -Heikki */
 
-int zebra_trans_no (ZebraHandle zh) {
-  return (zh->trans_no);
+int zebra_trans_no (ZebraHandle zh)
+{
+    ASSERTZH;
+    yaz_log(LOG_API,"zebra_trans_no");
+    return zh->trans_no;
 }
 
-
-
-int zebra_get_shadow_enable (ZebraHandle zh) {
-  return (zh->shadow_enable);
+int zebra_get_shadow_enable (ZebraHandle zh)
+{
+    yaz_log(LOG_API,"zebra_get_shadow_enable");
+    return (zh->shadow_enable);
 }
 
-void zebra_set_shadow_enable (ZebraHandle zh, int value) {
-  zh->shadow_enable = value;
+int zebra_set_shadow_enable (ZebraHandle zh, int value)
+{
+    yaz_log(LOG_API,"zebra_set_shadow_enable %d",value);
+    zh->shadow_enable = value;
+    return 0;
 }
 
-void init_recordGroup (struct recordGroup *rg) {
-    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;
-} 
-
-
-/* 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]; 
-    
-  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,
@@ -1711,6 +1861,7 @@ void api_records_retrieve (ZebraHandle zh, ODR stream,
 {
     ZebraPosSet poset;
     int i, *pos_array;
+    yaz_log(LOG_API,"api_records_retrieve s=%s n=%d",setname,num_recs);
 
     if (!zh->res)
     {
@@ -1786,151 +1937,144 @@ 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=" 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 sysno; 
+    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;
 
+    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 sysno; 
+    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=" 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 sysno;   
+    return res;   
 }
 
 /* ---------------------------------------------------------------------------
   Searching 
-
-  zebra_search_RPN is the same as zebra_search_rpn, except that read locking
-  is not mandatory. (it's repeatable now, also in zebraapi.c)
 */
 
-void zebra_search_RPN (ZebraHandle zh, ODR decode, ODR stream,
-		       Z_RPNQuery *query, const char *setname, int *hits)
-{
-    zh->hits = 0;
-    *hits = 0;
-
-    if (zebra_begin_read (zh))
-    	return;
-    resultSetAddRPN (zh, decode, stream, query, 
-                     zh->num_basenames, zh->basenames, setname);
-
-    zebra_end_read (zh);
-
-    *hits = zh->hits;
-}
-
-int zebra_search_PQF (ZebraHandle zh, 
-		      ODR odr_input, ODR odr_output, 
-		      const char *pqf_query,
-		      const char *setname)
-    
+int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
+		      const char *setname, int *numhits)
 {
-    int hits;
+    int hits = 0;
+    int res=-1;
     Z_RPNQuery *query;
-    query = p_query_rpn (odr_input, PROTO_Z3950, pqf_query);
+    ODR odr = odr_createmem(ODR_ENCODE);
+
+    yaz_log(LOG_API,"zebra_search_PQF s=%s q=%s",setname, pqf_query);
     
-    if (!query) {
-        logf (LOG_WARN, "bad query %s\n", pqf_query);
-        odr_reset (odr_input);
-        return(0);
-    }
-    zebra_search_RPN (zh, odr_input, odr_output, query, setname, &hits);
+    query = p_query_rpn (odr, PROTO_Z3950, pqf_query);
     
-    odr_reset (odr_input);
-    odr_reset (odr_output);
+    if (!query)
+        yaz_log (LOG_WARN, "bad query %s\n", pqf_query);
+    else
+        res=zebra_search_RPN (zh, odr, query, setname, &hits);
     
-    return(hits);
+    odr_destroy(odr);
+
+    yaz_log(LOG_API,"Hits: %d",hits);
+
+    if (numhits)
+	*numhits=hits;
+
+    return res;
 }
 
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.
 */
-int sort (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);
-    if (!sort_sequence) {
+    yaz_log(LOG_API,"sort (FIXME) ");
+    if (!sort_sequence)
+    {
         logf(LOG_WARN,"invalid sort specs '%s'", sort_spec);
         zh->errCode = 207;
-    return (-1);
+	return -1;
     }
     
     /* we can do this, since the perl typemap code for char** will 
@@ -1944,5 +2088,6 @@ int sort (ZebraHandle zh,
                    output_setname, sort_sequence, &sort_status);
     
     zebra_end_read(zh);
-    return (sort_status);
+    return sort_status;
 }
+