X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=1685caba019dd26c52e9b564183cce449b287bda;hb=a2c4cb0542fef348b998284ca9bf3b2348f5c5b7;hp=b293fc22ee1f775f3b6d3ead5a5cefcb8d8ce158;hpb=53f91ef0ea7d588a26e90bf87ad46bdb84938d6f;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index b293fc2..1685cab 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.221 2006-06-12 09:39:18 marc Exp $
+/* $Id: zebraapi.c,v 1.223 2006-06-27 11:56:28 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -181,6 +181,8 @@ ZebraService zebra_start_res (const char *configName, Res def_res, Res over_res)
 {
     Res res;
 
+    zebra_flock_init();
+
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("zebraapi");
@@ -478,7 +480,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     {
 	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");
@@ -1398,15 +1400,15 @@ ZEBRA_RES zebra_admin_exchange_record(ZebraHandle zh,
 	}
 	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)
     {
@@ -2019,7 +2021,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 
 	zebra_lock_w(zh->lock_shadow);
         bf_commitClean (bfs, rval);
-	zebra_unlock (zh->lock_normal);
+	zebra_unlock (zh->lock_shadow);
     }
     else
     {
@@ -2220,14 +2222,14 @@ 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 */
+    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");
@@ -2257,14 +2259,14 @@ 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 */
+    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");
@@ -2293,14 +2295,14 @@ ZEBRA_RES zebra_delete_record (ZebraHandle zh,
 
     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 */
+    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");