Prevent zebra_clean from deleting files for uncommited trans.

[idzebra-moved-to-github.git] / index / zebraapi.c

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 676846f..09c0e1a 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.264 2007-11-06 10:29:59 adam Exp $
+/* $Id: zebraapi.c,v 1.267 2007-12-18 13:41:27 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -421,7 +421,7 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
 
     {
        const char *index_fname = res_get_def(res, "index", "default.idx");
-       if (index_fname && *index_fname)
+       if (index_fname && *index_fname && strcmp(index_fname, "none"))
        {
            if (zebra_maps_read_file(reg->zebra_maps, index_fname) != ZEBRA_OK)
                ret = ZEBRA_FAIL;
@@ -1149,7 +1149,6 @@ ZEBRA_RES zebra_records_retrieve(ZebraHandle zh, ODR stream,
                recs[i].errCode =
                    zebra_record_fetch(zh, setname,
                                        poset[i].sysno, poset[i].score,
-                                      hit_snippet,
                                       stream, input_format, comp,
                                       &recs[i].format, &buf, &len,
                                       &recs[i].base, &recs[i].errString);
@@ -1554,7 +1553,7 @@ static void zebra_set_state (ZebraHandle zh, int val, int seqno)
     long p = getpid();
     FILE *f;
     ASSERTZH;
-    yaz_log(log_level, "zebra_set_state v=%d seq=%d", val, seqno);
+    yaz_log(log_level, "zebra_set_state v=%c seq=%d", val, seqno);
 
     sprintf (state_fname, "state.%s.LCK", zh->reg_name);
     fname = zebra_mk_fname (res_get(zh->res, "lockDir"), state_fname);
@@ -1906,14 +1905,12 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
         if (val != 'd')
         {
             BFiles bfs = bfs_create (rval, zh->path_reg);
-            yaz_log (YLOG_DEBUG, "deleting shadow val=%c", val);
             bf_commitClean (bfs, rval);
             bfs_destroy (bfs);
         }
         if (!rval)
             seqno++;
         zebra_set_state (zh, 'o', seqno);
-        
         zebra_unlock (zh->lock_shadow);
         zebra_unlock (zh->lock_normal);
         
@@ -1969,6 +1966,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
 
     ASSERTZH;
 
+    yaz_log(log_level, "zebra_commit_ex clean_only=%d", clean_only);
     zebra_select_default_database(zh);
     if (!zh->res)
     {
@@ -2000,6 +1998,11 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
         yaz_log(YLOG_WARN, "previous transaction didn't reach commit");
         clean_only = 1;
     }
+    else if (val == 'c')
+    {
+        /* commit has started. We can not remove it anymore */
+        clean_only = 0;
+    }
 
     if (rval && *rval)
         bf_cache (bfs, rval);
@@ -2011,7 +2014,7 @@ static ZEBRA_RES zebra_commit_ex(ZebraHandle zh, int clean_only)
         {
             zebra_set_state(zh, 'c', seqno);
             
-            yaz_log(YLOG_DEBUG, "commit start");
+            yaz_log(log_level, "commit start");
             if (bf_commitExec (bfs))
                 res = ZEBRA_FAIL;
         }