X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=cb05bb6d7c12af5e3d45be3d661fe6e545a59512;hb=4e48a2f759ac1e7224f00d7c091bb840885cf7d2;hp=32b47935dd2e63f8c11172605e158b043e4fb647;hpb=3c32ec08b365ba1cbfa705d7cbefca5b7b4afe28;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 32b4793..cb05bb6 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.198 2005-12-09 10:56:59 adam Exp $
+/* $Id: zebraapi.c,v 1.203 2006-03-13 17:42:09 mike Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -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 "orddict.h"
 #include <charmap.h>
 #include <idzebra/api.h>
 
@@ -72,7 +73,6 @@ static void zebra_flush_reg (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_flush_reg");
-    zebra_clearError(zh);
     zebraExplain_flush (zh->reg->zei, zh);
     
     extract_flushWriteKeys (zh, 1 /* final */);
@@ -184,11 +184,18 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 	const char *passwd_plain = 0;
 	const char *passwd_encrypt = 0;
 	const char *dbaccess = 0;
-        ZebraService zh = xmalloc(sizeof(*zh));
+        ZebraService zh = 0;
 
 	if (configName)
-	    res_read_file(res, configName);
-
+	{
+	    ZEBRA_RES ret = res_read_file(res, configName);
+	    if (ret != ZEBRA_OK)
+	    {
+		res_close(res);
+		return 0;
+	    }
+	}
+	zh = xmalloc(sizeof(*zh));
         zh->global_res = res;
         zh->sessions = 0;
         
@@ -321,7 +328,14 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     data1_set_tabroot (reg->dh, reg_path);
     reg->recTypes = recTypes_init (zs->record_classes, reg->dh);
 
-    reg->zebra_maps = zebra_maps_open (res, reg_path);
+    if ((reg->zebra_maps = zebra_maps_open (res, reg_path)) == 0) {
+	/* ### Do we need to destroy reg->recTypes? */
+	bfs_destroy(reg->bfs);
+	data1_destroy(reg->dh);
+	xfree(reg);
+	return 0;
+    }
+
     reg->rank_classes = NULL;
 
     reg->key_buf = 0;
@@ -343,7 +357,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     reg->isamc = 0;
     reg->isamb = 0;
     reg->zei = 0;
-    reg->matchDict = 0;
     reg->key_file_no = 0;
     reg->ptr_i = 0;
     
@@ -437,6 +450,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 	yaz_log (YLOG_WARN, "Cannot obtain EXPLAIN information");
 	return 0;
     }
+
     reg->active = 2;
     yaz_log (YLOG_DEBUG, "zebra_register_open ok p=%p", reg);
     return reg;
@@ -446,7 +460,6 @@ ZEBRA_RES zebra_admin_shutdown (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_shutdown");
-    zebra_clearError(zh);
 
     zebra_mutex_cond_lock (&zh->service->session_lock);
     zh->service->stop_flag = 1;
@@ -459,7 +472,6 @@ ZEBRA_RES zebra_admin_start (ZebraHandle zh)
     ZebraService zs;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_start");
-    zebra_clearError(zh);
     zs = zh->service;
     zebra_mutex_cond_lock (&zs->session_lock);
     zebra_mutex_cond_unlock (&zs->session_lock);
@@ -939,7 +951,6 @@ ZEBRA_RES zebra_search_RPN(ZebraHandle zh, ODR o, Z_RPNQuery *query,
     assert(hits);
     assert(setname);
     yaz_log(log_level, "zebra_search_rpn");
-    zebra_clearError(zh);
     zh->hits = 0;
     *hits = 0;
 
@@ -971,7 +982,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
 
     yaz_log(log_level, "zebra_records_retrieve n=%d", num_recs);
 
-    zebra_clearError(zh);
     if (!zh->res)
     {
 	zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST,
@@ -1156,7 +1166,7 @@ int zebra_deleteResultSet(ZebraHandle zh, int function,
     ASSERTZH;
     assert(statuses);
     yaz_log(log_level, "zebra_deleteResultSet n=%d",num_setnames);
-    zebra_clearError(zh);;
+
     if (zebra_begin_read(zh))
 	return Z_DeleteStatus_systemProblemAtTarget;
     switch (function)
@@ -1207,15 +1217,6 @@ char *zebra_errAdd (ZebraHandle zh)
     return a;
 }
 
-void zebra_clearError(ZebraHandle zh)
-{
-    if (zh)
-    {
-        zh->errCode = 0;
-        zh->errString = 0;
-    }
-}
-
 ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
 {
     const char *p;
@@ -1224,7 +1225,7 @@ ZEBRA_RES zebra_auth (ZebraHandle zh, const char *user, const char *pass)
     ZebraService zs;
 
     ASSERTZH;
-    zebra_clearError(zh);
+
     zs= zh->service;
     
     sprintf(u, "perm.%.30s", user ? user : "anonymous");
@@ -1254,7 +1255,6 @@ ZEBRA_RES zebra_admin_import_begin (ZebraHandle zh, const char *database,
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_begin db=%s rt=%s", 
 		     database, record_type);
-    zebra_clearError(zh);
     if (zebra_select_database(zh, database) == ZEBRA_FAIL)
         return ZEBRA_FAIL;
     return zebra_begin_trans(zh, 1);
@@ -1264,7 +1264,6 @@ ZEBRA_RES zebra_admin_import_end (ZebraHandle zh)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_end");
-    zebra_clearError(zh);
     return zebra_end_trans(zh);
 }
 
@@ -1275,7 +1274,7 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     int i;
     ASSERTZH;
     yaz_log(log_level, "zebra_admin_import_segment");
-    zebra_clearError(zh);
+
     for (i = 0; i<segment->num_segmentRecords; i++)
     {
 	Z_NamePlusRecord *npr = segment->segmentRecords[i];
@@ -1302,11 +1301,11 @@ ZEBRA_RES zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment)
     return res;
 }
 
-ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
-				       const char *rec_buf,
-				       size_t rec_len,
-				       const char *recid_buf, size_t recid_len,
-				       int action)
+ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
+				      const char *rec_buf,
+				      size_t rec_len,
+				      const char *recid_buf, size_t recid_len,
+				      int action)
     /* 1 = insert. Fail it already exists */
     /* 2 = replace. Fail it does not exist */
     /* 3 = delete. Fail if does not exist */
@@ -1316,12 +1315,12 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     SYSNO sysno = 0;
     char *rinfo = 0;
     char recid_z[256];
+    int db_ord;
     ASSERTZH;
     assert(action>0 && action <=4);
     assert(rec_buf);
 
     yaz_log(log_level, "zebra_admin_exchange_record ac=%d", action);
-    zebra_clearError(zh);
 
     if (!recid_buf || recid_len <= 0 || recid_len >= sizeof(recid_z))
     {
@@ -1336,7 +1335,8 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     if (zebra_begin_trans(zh, 1) == ZEBRA_FAIL)
 	return ZEBRA_FAIL;
 
-    rinfo = dict_lookup (zh->reg->matchDict, recid_z);
+    db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+    rinfo = dict_lookup_ord(zh->reg->matchDict, db_ord, recid_z);
     if (rinfo)
     {
         if (action == 1)  /* fail if insert */
@@ -1377,11 +1377,12 @@ ZEBRA_RES zebra_admin_exchange_record (ZebraHandle zh,
     }
     if (action == 1)
     {
-        dict_insert (zh->reg->matchDict, recid_z, sizeof(sysno), &sysno);
+        dict_insert_ord(zh->reg->matchDict, db_ord, recid_z,
+			sizeof(sysno), &sysno);
     }
     else if (action == 3)
     {
-        dict_delete (zh->reg->matchDict, recid_z);
+        dict_delete_ord(zh->reg->matchDict, db_ord, recid_z);
     }
     zebra_end_trans(zh);
     return res;
@@ -1428,8 +1429,11 @@ ZEBRA_RES zebra_drop_database(ZebraHandle zh, const char *db)
         return ZEBRA_FAIL;
     if (zh->reg->isamb)
     {
+	int db_ord;
 	zebraExplain_curDatabase (zh->reg->zei, db);
-	
+	db_ord = zebraExplain_get_database_ord(zh->reg->zei);
+	dict_delete_subtree_ord(zh->reg->matchDict, db_ord,
+				0 /* handle */, 0 /* func */);
 	zebraExplain_trav_ord(zh->reg->zei, zh, delete_SU_handle);
 	zebraExplain_removeDatabase(zh->reg->zei, zh);
     }
@@ -1702,6 +1706,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
             yaz_log(YLOG_FATAL, "%s", zh->errString);
             return ZEBRA_FAIL;
         }
+	zebraExplain_curDatabase(zh->reg->zei, zh->basenames[0]);
     }
     else
     {
@@ -1881,20 +1886,18 @@ int zebra_repository_update (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zebra_clearError(zh);
     yaz_log (log_level, "updating %s", path);
     repositoryUpdate (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
 int zebra_repository_delete (ZebraHandle zh, const char *path)
 {
     ASSERTZH;
     assert(path);
-    zebra_clearError(zh);
     yaz_log (log_level, "deleting %s", path);
     repositoryDelete (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
 int zebra_repository_show (ZebraHandle zh, const char *path)
@@ -1902,31 +1905,29 @@ int zebra_repository_show (ZebraHandle zh, const char *path)
     ASSERTZH;
     assert(path);
     yaz_log(log_level, "zebra_repository_show");
-    zebra_clearError(zh);
     repositoryShow (zh, path);
-    return zh->errCode;
+    return 0;
 }
 
-static int zebra_commit_ex(ZebraHandle zh, int clean_only)
+static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 {
     int seqno;
     char val;
     const char *rval;
     BFiles bfs;
     ASSERTZH;
-    zebra_clearError(zh);
 
     zebra_select_default_database(zh);
     if (!zh->res)
     {
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
-        return -1;
+        return ZEBRA_FAIL;
     }
     rval = res_get (zh->res, "shadow");    
     if (!rval)
     {
         yaz_log (YLOG_WARN, "Cannot perform commit - No shadow area defined");
-        return 0;
+        return ZEBRA_OK;
     }
 
     zebra_lock_w (zh->lock_normal);
@@ -1965,7 +1966,7 @@ static int zebra_commit_ex(ZebraHandle zh, int clean_only)
 
     zebra_unlock (zh->lock_shadow);
     zebra_unlock (zh->lock_normal);
-    return 0;
+    return ZEBRA_OK;
 }
 
 ZEBRA_RES zebra_clean(ZebraHandle zh)
@@ -1988,7 +1989,6 @@ ZEBRA_RES zebra_init(ZebraHandle zh)
     BFiles bfs = 0;
     ASSERTZH;
     yaz_log(log_level, "zebra_init");
-    zebra_clearError(zh);
 
     zebra_select_default_database(zh);
     if (!zh->res)
@@ -2019,7 +2019,6 @@ ZEBRA_RES zebra_compact(ZebraHandle zh)
     BFiles bfs;
     ASSERTZH;
     yaz_log(log_level, "zebra_compact");
-    zebra_clearError(zh);
     if (!zh->res)
     {
         zh->errCode = YAZ_BIB1_DATABASE_UNAVAILABLE;
@@ -2043,7 +2042,6 @@ void zebra_shadow_enable(ZebraHandle zh, int value)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_shadow_enable");
-    zebra_clearError(zh);
     zh->shadow_enable = value;
 }
 
@@ -2052,7 +2050,6 @@ 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_clearError(zh);
 
     if (zh->iconv_to_utf8 != 0)
         yaz_iconv_close(zh->iconv_to_utf8);
@@ -2075,7 +2072,6 @@ ZEBRA_RES zebra_record_encoding (ZebraHandle zh, const char *encoding)
 {
     ASSERTZH;
     yaz_log(log_level, "zebra_record_encoding");
-    zebra_clearError(zh);
     xfree(zh->record_encoding);
     zh->record_encoding = 0;
     if (encoding)
@@ -2089,7 +2085,6 @@ void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
     assert(name);
     assert(value);
     yaz_log(log_level, "zebra_set_resource %s:%s", name, value);
-    zebra_clearError(zh);
     res_set(zh->res, name, value);
 }
 
@@ -2100,7 +2095,6 @@ const char *zebra_get_resource(ZebraHandle zh,
     ASSERTZH;
     assert(name);
     v = res_get_def (zh->res, name, (char *)defaultvalue);
-    zebra_clearError(zh);
     yaz_log(log_level, "zebra_get_resource %s:%s", name, v);
     return v;
 }