X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=index%2Fzebraapi.c;h=25bcd66957d620afa3826cf17e18c8f784ef824a;hb=2953b2e39b289b3625e6a3a7c5a3f2b5e1d95ce8;hp=01c6433d4d5b58a1ded9d918914e1c13a3ec45ad;hpb=52551bf774d771a0422a401946fd0c5ee3788f34;p=idzebra-moved-to-github.git

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 01c6433..25bcd66 100644
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.93 2003-03-13 04:25:17 pop Exp $
+/* $Id: zebraapi.c,v 1.97 2003-04-02 18:46:13 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -241,6 +241,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
     
     zebraRankInstall (reg, rank1_class);
     zebraRankInstall (reg, rankzv_class);
+    zebraRankInstall (reg, rankliv_class);
 
     recordCompression = res_get_def (res, "recordCompression", "none");
     if (!strcmp (recordCompression, "none"))
@@ -753,6 +754,9 @@ void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream,
 
     if (zebra_begin_read (zh))
 	return;
+
+    zebra_livcode_transform(zh, query);
+
     resultSetAddRPN (zh, decode, stream, query, 
                      zh->num_basenames, zh->basenames, setname);
 
@@ -1389,7 +1393,7 @@ void zebra_repository_show (ZebraHandle zh)
     repositoryShow (zh);
 }
 
-int zebra_commit (ZebraHandle zh)
+static int zebra_commit_ex (ZebraHandle zh, int clean_only)
 {
     int seqno;
     char val;
@@ -1422,13 +1426,18 @@ int zebra_commit (ZebraHandle zh)
         bf_cache (bfs, rval);
     if (bf_commitExists (bfs))
     {
-        zebra_set_state (zh, 'c', seqno);
-
-        logf (LOG_LOG, "commit start");
-        bf_commitExec (bfs);
+        if (clean_only)
+            zebra_set_state (zh, 'd', seqno);
+        else
+        {
+            zebra_set_state (zh, 'c', seqno);
+            
+            logf (LOG_LOG, "commit start");
+            bf_commitExec (bfs);
 #ifndef WIN32
-        sync ();
+            sync ();
 #endif
+        }
         logf (LOG_LOG, "commit clean");
         bf_commitClean (bfs, rval);
         seqno++;
@@ -1445,6 +1454,16 @@ int zebra_commit (ZebraHandle zh)
     return 0;
 }
 
+int zebra_clean (ZebraHandle zh)
+{
+    return zebra_commit_ex(zh, 1);
+}
+
+int zebra_commit (ZebraHandle zh)
+{
+    return zebra_commit_ex(zh, 0);
+}
+
 int zebra_init (ZebraHandle zh)
 {
     const char *rval;
@@ -1571,7 +1590,7 @@ void zebra_set_resource(ZebraHandle zh, const char *name, const char *value)
 }
 
 const char *zebra_get_resource(ZebraHandle zh,
-		                const char *name, const char *defaultvalue)
+                               const char *name, const char *defaultvalue)
 {
     ASSERTZH;
     zh->errCode=0;
@@ -1781,7 +1800,7 @@ int zebra_insert_record (ZebraHandle zh,
 			 const char *recordType,
 			 int sysno, const char *match, const char *fname,
 			 const char *buf, int buf_size,
-			 int force_update) // This one is ignored
+			 int force_update) /* This one is ignored */
  
 {
     int res;
@@ -1790,13 +1809,13 @@ int zebra_insert_record (ZebraHandle zh,
 
     zebra_begin_trans(zh, 1);
     res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     0, // delete_flag 
-			     0, // test_mode,
+			     0, /* delete_flag  */
+			     0, /* test_mode */
 			     recordType,
 			     &sysno,   
 			     match, fname,
 			     force_update, 
-			     0); // allow_update     
+			     0); /* allow_update */
     zebra_end_trans(zh); 
     if (res < 0) return (res);
     return sysno; 
@@ -1816,13 +1835,13 @@ int zebra_update_record (ZebraHandle zh,
 
     zebra_begin_trans(zh, 1);
     res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     0, // delete_flag 
-			     0, // test_mode,
+			     0, /* delete_flag */
+			     0, /* test_mode */
 			     recordType,
 			     &sysno,   
 			     match, fname,
 			     force_update, 
-			     1); // allow_update    
+			     1); /* allow_update */
     zebra_end_trans(zh); 
     return sysno; 
 }
@@ -1842,13 +1861,13 @@ int zebra_delete_record (ZebraHandle zh,
 
     zebra_begin_trans(zh, 1);
     res=bufferExtractRecord (zh, buf, buf_size, rGroup, 
-			     1, // delete_flag
-			     0, // test_mode, 
+			     1, /* delete_flag */
+			     0, /* test_mode */
 			     recordType,
 			     &sysno,
 			     match,fname,
 			     force_update,
-			     1); // allow_update    
+			     1); /* allow_update */
     zebra_end_trans(zh);
     return sysno;   
 }