X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=dc26b11463a08999b3b75606649a3300ee079e95;hb=67f1321cbac10c08079a589eb8a948796aa90779;hp=9a24d0ebf95b5ae9d62a659d2d9aaada1b889803;hpb=c944571888712854653be0d2debf903b8651c8e2;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 9a24d0e..dc26b11 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.199 2005-12-09 11:33:32 adam Exp $
+/* $Id: zebraapi.c,v 1.202 2006-02-21 15:23:11 adam 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>
 
@@ -183,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;
         
@@ -342,7 +350,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;
     
@@ -436,6 +443,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;
@@ -1286,11 +1294,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 */
@@ -1300,6 +1308,7 @@ 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);
@@ -1319,7 +1328,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 */
@@ -1360,11 +1370,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;
@@ -1411,8 +1422,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);
     }
@@ -1685,6 +1699,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
     {