Disable X-Path indexing for explain records (in the case where

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

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 33980ce..38bc751 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.219 2006-05-30 13:21:16 adam Exp $
+/* $Id: zebraapi.c,v 1.222 2006-06-13 12:02:12 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -383,7 +383,6 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name,
     
     /* installing rank classes */
     zebraRankInstall (reg, rank_1_class);
-    zebraRankInstall (reg, rank_zv_class);
     zebraRankInstall (reg, rank_similarity_class);
     zebraRankInstall (reg, rank_static_class);
 
@@ -479,7 +478,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");
@@ -1399,15 +1398,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)
     {
@@ -1901,10 +1900,10 @@ ZEBRA_RES zebra_end_transaction (ZebraHandle zh, ZebraTransactionStatus *status)
                  zh->records_processed, zh->records_inserted,
                  zh->records_updated, zh->records_deleted);
         
-        status->processed = (int) zh->records_processed;
-        status->inserted = (int) zh->records_inserted;
-        status->updated = (int) zh->records_updated;
-        status->deleted = (int) zh->records_deleted;
+        status->processed = zh->records_processed;
+        status->inserted = zh->records_inserted;
+        status->updated = zh->records_updated;
+        status->deleted = zh->records_deleted;
         
         zebra_get_state (zh, &val, &seqno);
         if (val != 'd')
@@ -2221,14 +2220,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");
@@ -2258,14 +2257,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");
@@ -2294,14 +2293,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");