X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=b036ff1dc740ba3013ab9fa15c8cf6dec34d25f4;hb=6d3b83ae7e008f2d61326051b03f7f07d3cc2ef0;hp=8207926fef7bfd31d84f8d66fc69035a32eb984a;hpb=1d09966e51904c44ed82eaa920ffc9fbcc087541;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 8207926..b036ff1 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.201 2006-02-09 08:31:02 adam Exp $
+/* $Id: zebraapi.c,v 1.205 2006-03-25 15:33:29 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -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;
         
@@ -292,6 +299,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     reg->dh = data1_createx (DATA1_FLAG_XML);
     if (!reg->dh)
     {
+	xfree(reg->name);
 	xfree(reg);
         return 0;
     }
@@ -299,6 +307,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     if (!reg->bfs)
     {
         data1_destroy(reg->dh);
+	xfree(reg->name);
 	xfree(reg);
         return 0;
     }
@@ -308,6 +317,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 	{
 	    bfs_destroy(reg->bfs);
 	    data1_destroy(reg->dh);
+	    xfree(reg->name);
 	    xfree(reg);
 	    return 0;
 	}
@@ -321,7 +331,16 @@ 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)
+    {
+	recTypes_destroy(reg->recTypes);
+	bfs_destroy(reg->bfs);
+	data1_destroy(reg->dh);
+	xfree(reg->name);
+	xfree(reg);
+	return 0;
+    }
+
     reg->rank_classes = NULL;
 
     reg->key_buf = 0;
@@ -687,11 +706,11 @@ static void zebra_select_register (ZebraHandle zh, const char *new_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);
+            zebra_lock_create (res_get(zh->res, "lockDir"), fname);
         
         sprintf (fname, "shadow.%s.LCK", zh->reg_name);
         zh->lock_shadow =
-            zebra_lock_create (res_get(zh->res, "lockDir"), fname, 0);
+            zebra_lock_create (res_get(zh->res, "lockDir"), fname);
 
 	if (!zh->lock_normal || !zh->lock_shadow)
 	{
@@ -1656,7 +1675,7 @@ ZEBRA_RES zebra_begin_trans(ZebraHandle zh, int rw)
                     yaz_log (YLOG_WARN, "previous transaction didn't reach commit");
                     bf_commitClean (bfs, rval);
                     bfs_destroy (bfs);
-            }
+		}
                 else
                 {
                     yaz_log (YLOG_WARN, "your previous transaction didn't finish");
@@ -2344,3 +2363,12 @@ void zebra_setError_zint(ZebraHandle zh, int code, zint i)
     zh->errString = nmem_strdup(zh->nmem_error, vstr);
 }
 
+void zebra_lock_prefix (Res res, char *path)
+{
+    const char *lock_dir = res_get_def (res, "lockDir", "");
+
+    strcpy (path, lock_dir);
+    if (*path && path[strlen(path)-1] != '/')
+        strcat (path, "/");
+}
+