X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=38bc75130621ce38d7544e45bba4b9120882c9a7;hb=b88909df16157ed1e7859bc3fad6b01520d4865e;hp=e32e5909ffaf59747a56962dcf321e59584bd61b;hpb=23bca0017111f1c9408386f6363d70e689f313ac;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index e32e590..38bc751 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,5 +1,5 @@
-/* $Id: zebraapi.c,v 1.207 2006-03-28 12:39:07 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: zebraapi.c,v 1.222 2006-06-13 12:02:12 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -36,6 +36,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/pquery.h>
 #include <yaz/sortspec.h>
 #include "index.h"
+#include "rank.h"
 #include "orddict.h"
 #include <charmap.h>
 #include <idzebra/api.h>
@@ -53,6 +54,15 @@ static int log_level_initialized = 0;
 static void zebra_open_res(ZebraHandle zh);
 static void zebra_close_res(ZebraHandle zh);
 
+static ZEBRA_RES zebra_check_handle(ZebraHandle zh)
+{
+    if (zh)
+        return ZEBRA_OK;
+    return ZEBRA_FAIL;
+}
+
+#define ZEBRA_CHECK_HANDLE(zh) if (zebra_check_handle(zh) != ZEBRA_OK) return ZEBRA_FAIL
+
 static void zebra_chdir (ZebraService zs)
 {
     const char *dir ;
@@ -69,14 +79,15 @@ static void zebra_chdir (ZebraService zs)
 #endif
 }
 
-static void zebra_flush_reg (ZebraHandle zh)
+static ZEBRA_RES zebra_flush_reg (ZebraHandle zh)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_flush_reg");
     zebraExplain_flush (zh->reg->zei, zh);
     
     extract_flushWriteKeys (zh, 1 /* final */);
     zebra_index_merge (zh );
+    return ZEBRA_OK;
 }
 
 static struct zebra_register *zebra_register_open(ZebraService zs, 
@@ -235,6 +246,14 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
         zh->path_root = res_get (zh->global_res, "root");
 	zh->nmem = nmem_create();
 	zh->record_classes = recTypeClass_create (zh->global_res, zh->nmem);
+
+	if (1)
+	{
+	    const char *module_path = res_get(res, "modulePath");
+	    if (module_path)
+		recTypeClass_load_modules(&zh->record_classes, zh->nmem,
+					  module_path);
+	}
         return zh;
     }
     return 0;
@@ -297,7 +316,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     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);
+    reg->dh = data1_create();
     if (!reg->dh)
     {
 	xfree(reg->name);
@@ -349,12 +368,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 
     reg->keys = zebra_rec_keys_open();
 
-#if NATTR
     reg->sortKeys = zebra_rec_keys_open();
-#else
-    reg->sortKeys.buf = 0;
-    reg->sortKeys.buf_max = 0;
-#endif
 
     reg->records = 0;
     reg->dict = 0;
@@ -367,8 +381,9 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     reg->key_file_no = 0;
     reg->ptr_i = 0;
     
+    /* installing rank classes */
     zebraRankInstall (reg, rank_1_class);
-    zebraRankInstall (reg, rank_zv_class);
+    zebraRankInstall (reg, rank_similarity_class);
     zebraRankInstall (reg, rank_static_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
@@ -459,11 +474,11 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 	    ret = ZEBRA_FAIL;
 	}
     }
-    if (reg->records)
+    if (ret == ZEBRA_OK)
     {
 	reg->zei = zebraExplain_open(reg->records, reg->dh,
 				     res, rw, reg,
-				     explain_extract);
+				     zebra_extract_explain);
 	if (!reg->zei)
 	{
 	    yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
@@ -482,7 +497,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 
 ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_admin_shutdown");
 
     zebra_mutex_cond_lock (&zh->service->session_lock);
@@ -494,7 +509,7 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 ZEBRA_RES zebra_admin_start (ZebraHandle zh)
 {
     ZebraService zs;
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_admin_start");
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
@@ -530,11 +545,7 @@ static void zebra_register_close(ZebraService zs, struct zebra_register *reg)
     data1_destroy (reg->dh);
 
     zebra_rec_keys_close(reg->keys);
-#if NATTR
     zebra_rec_keys_close(reg->sortKeys);
-#else
-    xfree(reg->sortKeys.buf);
-#endif
 
     xfree(reg->key_buf);
     xfree(reg->name);
@@ -564,16 +575,15 @@ ZEBRA_RES zebra_stop(ZebraService zs)
     return ZEBRA_OK;
 }
 
-ZEBRA_RES zebra_close (ZebraHandle zh)
+ZEBRA_RES zebra_close(ZebraHandle zh)
 {
     ZebraService zs;
     struct zebra_session **sp;
     int i;
 
     yaz_log(log_level, "zebra_close");
-    if (!zh)
-        return ZEBRA_OK;
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
+
     zh->errCode = 0;
     
     zs = zh->service;
@@ -754,8 +764,6 @@ static void zebra_select_register (ZebraHandle zh, const char *new_reg)
     {
 	if (res_get_int(zh->res, "staticrank", &zh->m_staticrank) == ZEBRA_OK)
 	    yaz_log(YLOG_LOG, "static rank set and is %d", zh->m_staticrank);
-	else
-	    yaz_log(YLOG_LOG, "static rank unset");
     }
 }
 
@@ -842,7 +850,8 @@ void map_basenames (ZebraHandle zh, ODR stream,
 
 ZEBRA_RES zebra_select_database (ZebraHandle zh, const char *basename)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
+
     yaz_log(log_level, "zebra_select_database %s",basename);
     assert(basename);
     return zebra_select_databases (zh, 1, &basename);
@@ -855,7 +864,8 @@ ZEBRA_RES zebra_select_databases (ZebraHandle zh, int num_bases,
     const char *cp;
     int len = 0;
     char *new_reg = 0;
-    ASSERTZH;
+
+    ZEBRA_CHECK_HANDLE(zh);
     assert(basenames);
 
     yaz_log(log_level, "zebra_select_databases n=%d [0]=%s",
@@ -967,7 +977,9 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
 			   const char *setname, zint *hits)
 {
     ZEBRA_RES r;
-    ASSERTZH;
+    
+    ZEBRA_CHECK_HANDLE(zh);
+
     assert(o);
     assert(query);
     assert(hits);
@@ -996,7 +1008,8 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
     int i;
     ZEBRA_RES ret = ZEBRA_OK;
     zint *pos_array;
-    ASSERTZH;
+
+    ZEBRA_CHECK_HANDLE(zh);
     assert(stream);
     assert(setname);
     assert(recs);
@@ -1123,7 +1136,9 @@ ZEBRA_RES zebra_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
 {
     ZEBRA_RES res;
     RSET limit_rset = 0;
-    ASSERTZH;
+
+    ZEBRA_CHECK_HANDLE(zh);
+
     assert(stream);
     assert(zapt);
     assert(position);
@@ -1164,7 +1179,7 @@ ZEBRA_RES zebra_sort (ZebraHandle zh, ODR stream,
 		      int *sort_status)
 {
     ZEBRA_RES res;
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     assert(stream);
     assert(num_input_setnames>0);
     assert(input_setnames);
@@ -1246,9 +1261,9 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     char u[40];
     ZebraService zs;
 
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
 
-    zs= zh->service;
+    zs = zh->service;
     
     sprintf(u, "perm.%.30s", user ? user : "anonymous");
     p = res_get(zs->global_res, u);
@@ -1274,7 +1289,6 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
                                const char *record_type)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
 		     database, record_type);
     if (zebra_select_database(zh, database) == ZEBRA_FAIL)
@@ -1284,7 +1298,7 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
 
 ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_admin_import_end");
     return zebra_end_trans(zh);
 }
@@ -1294,7 +1308,7 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     ZEBRA_RES res = ZEBRA_OK;
     SYSNO sysno;
     int i;
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     yaz_log(log_level, "zebra_admin_import_segment");
 
     for (i = 0; i<segment->num_segmentRecords; i++)
@@ -1338,7 +1352,7 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
     char *rinfo = 0;
     char recid_z[256];
     int db_ord;
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     assert(action>0 && action <=4);
     assert(rec_buf);
 
@@ -1363,7 +1377,8 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
     {
         if (action == 1)  /* fail if insert */
         {
-	    zebra_end_trans(zh);
+	    if (zebra_end_trans(zh) != ZEBRA_OK)
+		yaz_log(YLOG_WARN, "zebra_end_trans failed");
 	    zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
 			   "Cannot insert record: already exist");
 	    return ZEBRA_FAIL;
@@ -1375,22 +1390,23 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
     {
         if (action == 2 || action == 3) /* fail if delete or update */
         {
-	    zebra_end_trans(zh);
+	    if (zebra_end_trans(zh) != ZEBRA_OK)
+		yaz_log(YLOG_WARN, "zebra_end_trans failed");
 	    zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED,
 			   "Cannot delete/update record: does not exist");
             return ZEBRA_FAIL;
 	}
 	action = 1;  /* make it an insert (if it's an update).. */
     }
-    res = buffer_extract_record (zh, rec_buf, rec_len,
-				 action == 3 ? 1 : 0 /* delete flag */,
-				 0, /* test mode */
-				 0, /* recordType */
-				 &sysno, 
-				 0, /* match */
-				 0, /* fname */
-				 0, /* force update */
-				 1  /* allow update */
+    res = zebra_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 (res == ZEBRA_FAIL)
     {
@@ -1406,7 +1422,11 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
     {
         dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
     }
-    zebra_end_trans(zh);
+    if (zebra_end_trans(zh) != ZEBRA_OK)
+    {
+	yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	res = ZEBRA_FAIL;
+    }
     return res;
 }
 
@@ -1442,8 +1462,9 @@ static int delete_SU_handle(void *handle, int ord)
 ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
 {
     ZEBRA_RES ret = ZEBRA_OK;
-    ASSERTZH;
+
     yaz_log(log_level, "zebra_drop_database %s", db);
+    ZEBRA_CHECK_HANDLE(zh);
 
     if (zebra_select_database (zh, db) == ZEBRA_FAIL)
         return ZEBRA_FAIL;
@@ -1466,14 +1487,18 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
 		       "drop database only supported for isam:b");
 	ret = ZEBRA_FAIL;
     }
-    zebra_end_trans (zh);
+    if (zebra_end_trans (zh) != ZEBRA_OK)
+    {
+	yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	ret = ZEBRA_FAIL;
+    }
     return ret;
 }
 
 ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_create_database %s", db);
+    ZEBRA_CHECK_HANDLE(zh);
     assert(db);
 
     if (zebra_select_database (zh, db) == ZEBRA_FAIL)
@@ -1485,7 +1510,10 @@ ZEBRA_RES zebra_create_database (ZebraHandle zh, const char *db)
     if (zebraExplain_newDatabase (zh->reg->zei, db, 0 
                                   /* explainDatabase */))
     {
-        zebra_end_trans (zh);
+        if (zebra_end_trans (zh) != ZEBRA_OK)
+	{
+	    yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	}
 	zebra_setError(zh, YAZ_BIB1_ES_IMMEDIATE_EXECUTION_FAILED, db);
 	return ZEBRA_FAIL;
     }
@@ -1599,7 +1627,7 @@ static void read_res_for_transaction(ZebraHandle zh)
 
 ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     zebra_select_default_database(zh);
     if (!zh->res)
     {
@@ -1740,8 +1768,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
         
         if (zh->trans_no != 1)
         {
-            zebra_flush_reg (zh);
-            return ZEBRA_OK;
+            return zebra_flush_reg (zh);
         }
 #if HAVE_SYS_TIMES_H
         times (&zh->tms1);
@@ -1810,8 +1837,9 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
 ZEBRA_RES zebra_end_trans (ZebraHandle zh)
 {
     ZebraTransactionStatus dummy;
-    ASSERTZH;
+
     yaz_log(log_level, "zebra_end_trans");
+    ZEBRA_CHECK_HANDLE(zh);
     return zebra_end_transaction(zh, &dummy);
 }
 
@@ -1821,7 +1849,8 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     int seqno;
     const char *rval;
 
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
+
     assert(status);
     yaz_log(log_level, "zebra_end_transaction");
 
@@ -1871,10 +1900,10 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
                  zh->records_processed, zh->records_inserted,
                  zh->records_updated, zh->records_deleted);
         
-        status->processed = (int) zh->records_processed;
-        status->inserted = (int) zh->records_inserted;
-        status->updated = (int) zh->records_updated;
-        status->deleted = (int) zh->records_deleted;
+        status->processed = zh->records_processed;
+        status->inserted = zh->records_inserted;
+        status->updated = zh->records_updated;
+        status->deleted = zh->records_deleted;
         
         zebra_get_state (zh, &val, &seqno);
         if (val != 'd')
@@ -1904,31 +1933,33 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
     return ZEBRA_OK;
 }
 
-int zebra_repository_update (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_update(ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
     yaz_log (log_level, "updating %s", path);
-    repositoryUpdate (zh, path);
-    return 0;
+
+    if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
+        return zebra_update_file_match(zh, path);
+    else
+        return zebra_update_from_path(zh, path);
 }
 
-int zebra_repository_delete (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_delete(ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
     yaz_log (log_level, "deleting %s", path);
-    repositoryDelete (zh, path);
-    return 0;
+    return zebra_delete_from_path(zh, path);
 }
 
-int zebra_repository_show (ZebraHandle zh, const char *path)
+ZEBRA_RES zebra_repository_show(ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
     yaz_log(log_level, "zebra_repository_show");
     repositoryShow (zh, path);
-    return 0;
+    return ZEBRA_OK;
 }
 
 static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
@@ -1956,7 +1987,12 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
     zebra_lock_r (zh->lock_shadow);
 
     bfs = bfs_create (res_get (zh->res, "register"), zh->path_reg);
-
+    if (!bfs)
+    {
+	zebra_unlock(zh->lock_shadow);
+	zebra_unlock(zh->lock_normal);
+        return ZEBRA_FAIL;
+    }
     zebra_get_state (zh, &val, &seqno);
 
     if (rval && *rval)
@@ -1975,43 +2011,51 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
             sync ();
 #endif
         }
-        yaz_log (YLOG_DEBUG, "commit clean");
-        bf_commitClean (bfs, rval);
         seqno++;
         zebra_set_state (zh, 'o', seqno);
+
+	zebra_unlock (zh->lock_shadow);
+	zebra_unlock (zh->lock_normal);
+
+	zebra_lock_w(zh->lock_shadow);
+        bf_commitClean (bfs, rval);
+	zebra_unlock (zh->lock_normal);
     }
     else
     {
+	zebra_unlock(zh->lock_shadow);
+	zebra_unlock(zh->lock_normal);
         yaz_log (log_level, "nothing to commit");
     }
     bfs_destroy (bfs);
 
-    zebra_unlock (zh->lock_shadow);
-    zebra_unlock (zh->lock_normal);
     return ZEBRA_OK;
 }
 
 ZEBRA_RES zebra_clean(ZebraHandle zh)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_clean");
+    ZEBRA_CHECK_HANDLE(zh);
     return zebra_commit_ex(zh, 1);
 }
 
 ZEBRA_RES zebra_commit(ZebraHandle zh)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_commit");
+    ZEBRA_CHECK_HANDLE(zh);
     return zebra_commit_ex(zh, 0);
 }
 
+
 ZEBRA_RES zebra_init(ZebraHandle zh)
 {
     const char *rval;
     BFiles bfs = 0;
-    ASSERTZH;
+
     yaz_log(log_level, "zebra_init");
 
+    ZEBRA_CHECK_HANDLE(zh);
+
     zebra_select_default_database(zh);
     if (!zh->res)
     {
@@ -2039,8 +2083,9 @@ ZEBRA_RES zebra_init(ZebraHandle zh)
 ZEBRA_RES zebra_compact(ZebraHandle zh)
 {
     BFiles bfs;
-    ASSERTZH;
+
     yaz_log(log_level, "zebra_compact");
+    ZEBRA_CHECK_HANDLE(zh);
     if (!zh->res)
     {
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@ -2054,10 +2099,17 @@ ZEBRA_RES zebra_compact(ZebraHandle zh)
 
 void zebra_result(ZebraHandle zh, int *code, char **addinfo)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_result");
-    *code = zh->errCode;
-    *addinfo = zh->errString;
+    if (zh)
+    {
+	*code = zh->errCode;
+	*addinfo = zh->errString;
+    }
+    else
+    {
+	*code = YAZ_BIB1_TEMPORARY_SYSTEM_ERROR;
+	*addinfo ="ZebraHandle is NULL";
+    }
 }
 
 void zebra_shadow_enable(ZebraHandle zh, int value)
@@ -2069,9 +2121,9 @@ void zebra_shadow_enable(ZebraHandle zh, int value)
 
 ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 {
-    ASSERTZH;
-    assert(encoding);
     yaz_log(log_level, "zebra_octet_term_encoding %s", encoding);
+    ZEBRA_CHECK_HANDLE(zh);
+    assert(encoding);
 
     if (zh->iconv_to_utf8 != 0)
         yaz_iconv_close(zh->iconv_to_utf8);
@@ -2092,8 +2144,8 @@ ZEBRA_RES zebra_octet_term_encoding(ZebraHandle zh, const char *encoding)
 
 ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_record_encoding");
+    ZEBRA_CHECK_HANDLE(zh);
     xfree(zh->record_encoding);
     zh->record_encoding = 0;
     if (encoding)
@@ -2103,10 +2155,10 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 
 void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
 {
-    ASSERTZH;
     assert(name);
     assert(value);
     yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
+    ASSERTZH;
     res_set(zh->res, name, value);
 }
 
@@ -2126,57 +2178,36 @@ const char *zebra_get_resource(ZebraHandle zh,
 
 int zebra_trans_no (ZebraHandle zh)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_trans_no");
+    ASSERTZH;
     return zh->trans_no;
 }
 
 int zebra_get_shadow_enable (ZebraHandle zh)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_get_shadow_enable");
+    ASSERTZH;
     return zh->shadow_enable;
 }
 
 void zebra_set_shadow_enable (ZebraHandle zh, int value)
 {
-    ASSERTZH;
     yaz_log(log_level, "zebra_set_shadow_enable %d",value);
+    ASSERTZH;
     zh->shadow_enable = value;
 }
 
-/* Used by Perl API.. Added the record buffer dup to zebra_records_retrieve
-   so that it's identicical to the original api_records_retrieve */
-void api_records_retrieve (ZebraHandle zh, ODR stream,
-			   const char *setname, Z_RecordComposition *comp,
-			   oid_value input_format, int num_recs,
-			   ZebraRetrievalRecord *recs)
-{
-    zebra_records_retrieve(zh, stream, setname, comp, input_format,
-			   num_recs, recs);
-}
-
-/* ---------------------------------------------------------------------------
-  Record insert(=update), delete 
-
-  If sysno is provided, then it's used to identify the record.
-  If not, and match_criteria is provided, then sysno is guessed
-  If not, and a record is provided, then sysno is got from there
-NOTE: Now returns 0 at success and updates sysno, which is an int*
-  20-jun-2003 Heikki
-*/
-
-int zebra_add_record(ZebraHandle zh,
-		     const char *buf, int buf_size)
+ZEBRA_RES zebra_add_record(ZebraHandle zh,
+                           const char *buf, int buf_size)
 {
     return zebra_update_record(zh, 0, 0 /* sysno */, 0, 0, buf, buf_size, 0);
 }
 
-ZEBRA_RES zebra_insert_record (ZebraHandle zh, 
-			       const char *recordType,
-			       SYSNO *sysno, const char *match,
-			       const char *fname,
-			       const char *buf, int buf_size, int force_update)
+ZEBRA_RES zebra_insert_record(ZebraHandle zh, 
+			      const char *recordType,
+			      SYSNO *sysno, const char *match,
+			      const char *fname,
+			      const char *buf, int buf_size, int force_update)
 {
     ZEBRA_RES res;
     ASSERTZH;
@@ -2189,15 +2220,19 @@ ZEBRA_RES zebra_insert_record (ZebraHandle zh,
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
 	return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size, 
-				 0, /* delete_flag  */
-				 0, /* test_mode */
-				 recordType,
-				 sysno,   
-				 match, fname,
-				 0, 
-				 0); /* allow_update */
-    zebra_end_trans(zh); 
+    res = zebra_buffer_extract_record(zh, buf, buf_size, 
+                                      0, /* delete_flag  */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,   
+                                      match, fname,
+                                      0, 
+                                      0); /* allow_update */
+    if (zebra_end_trans(zh) != ZEBRA_OK)
+    {
+	yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	res = ZEBRA_FAIL;
+    }
     return res; 
 }
 
@@ -2209,7 +2244,9 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh,
 			       int force_update)
 {
     ZEBRA_RES res;
-    ASSERTZH;
+
+    ZEBRA_CHECK_HANDLE(zh);
+
     assert(buf);
 
     yaz_log(log_level, "zebra_update_record");
@@ -2220,15 +2257,19 @@ ZEBRA_RES zebra_update_record (ZebraHandle zh,
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
 	return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size, 
-				 0, /* delete_flag */
-				 0, /* test_mode */
-				 recordType,
-				 sysno,   
-				 match, fname,
-				 force_update, 
-				 1); /* allow_update */
-    zebra_end_trans(zh); 
+    res = zebra_buffer_extract_record(zh, buf, buf_size, 
+                                      0, /* delete_flag */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,   
+                                      match, fname,
+                                      force_update, 
+                                      1); /* allow_update */
+    if (zebra_end_trans(zh) != ZEBRA_OK)
+    {
+	yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	res = ZEBRA_FAIL;
+    }
     return res; 
 }
 
@@ -2240,24 +2281,31 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh,
 			       int force_update) 
 {
     ZEBRA_RES res;
-    ASSERTZH;
-    assert(sysno);
+
+    ZEBRA_CHECK_HANDLE(zh);
+
     assert(buf);
-    yaz_log(log_level, "zebra_delete_record sysno=" ZINT_FORMAT, *sysno);
+    yaz_log(log_level, "zebra_delete_record");
+    if (sysno)
+	yaz_log(log_level, " sysno=" ZINT_FORMAT, *sysno);
 
     if (buf_size < 1) buf_size = strlen(buf);
 
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
 	return ZEBRA_FAIL;
-    res = buffer_extract_record (zh, buf, buf_size,
-				 1, /* delete_flag */
-				 0, /* test_mode */
-				 recordType,
-				 sysno,
-				 match,fname,
-				 force_update,
-				 1); /* allow_update */
-    zebra_end_trans(zh);
+    res = zebra_buffer_extract_record(zh, buf, buf_size,
+                                      1, /* delete_flag */
+                                      0, /* test_mode */
+                                      recordType,
+                                      sysno,
+                                      match,fname,
+                                      force_update,
+                                      1); /* allow_update */
+    if (zebra_end_trans(zh) != ZEBRA_OK)
+    {
+	yaz_log(YLOG_WARN, "zebra_end_trans failed");
+	res = ZEBRA_FAIL;
+    }
     return res;
 }
 
@@ -2271,8 +2319,12 @@ ZEBRA_RES zebra_search_PQF(ZebraHandle zh, const char *pqf_query,
     zint lhits = 0;
     ZEBRA_RES res = ZEBRA_OK;
     Z_RPNQuery *query;
-    ODR odr = odr_createmem(ODR_ENCODE);
-    ASSERTZH;
+    ODR odr;
+
+    ZEBRA_CHECK_HANDLE(zh);
+
+    odr = odr_createmem(ODR_ENCODE);
+
     assert(pqf_query);
     assert(setname);
 
@@ -2310,7 +2362,8 @@ int zebra_sort_by_specstr (ZebraHandle zh, ODR stream,
     int num_input_setnames = 0;
     int sort_status = 0;
     Z_SortKeySpecList *sort_sequence;
-    ASSERTZH;
+
+    ZEBRA_CHECK_HANDLE(zh);
     assert(stream);
     assert(sort_spec);
     assert(output_setname);
@@ -2354,7 +2407,7 @@ struct BFiles_struct *zebra_get_bfs(ZebraHandle zh)
 */
 ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
 {
-    ASSERTZH;
+    ZEBRA_CHECK_HANDLE(zh);
     zebra_limit_destroy(zh->m_limit);
     zh->m_limit = zebra_limit_create(complement_flag, ids);
     return ZEBRA_OK;
@@ -2365,6 +2418,8 @@ ZEBRA_RES zebra_set_limit(ZebraHandle zh, int complement_flag, zint *ids)
 */
 void zebra_setError(ZebraHandle zh, int code, const char *addinfo)
 {
+    if (!zh)
+	return;
     zh->errCode = code;
     nmem_reset(zh->nmem_error);
     zh->errString = addinfo ? nmem_strdup(zh->nmem_error, addinfo) : 0;
@@ -2389,3 +2444,11 @@ void zebra_lock_prefix (Res res, char *path)
         strcat (path, "/");
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+