added zebra_insert_record call, function in perl api, documentation and tests

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

diff --git a/index/extract.c b/index/extract.c
index 0dc5773..edf6e37 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,5 +1,5 @@
-/* $Id: extract.c,v 1.140 2003-03-04 23:30:20 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: extract.c,v 1.143 2003-03-13 04:25:17 pop Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -917,7 +917,8 @@ int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
                                 recordType,
                                 sysno,
                                 match_criteria,
-                                "<no file>"));
+                                "<no file>",
+                                0,1));
 }
 /*
   If sysno is provided, then it's used to identify the reocord.
@@ -933,7 +934,9 @@ int bufferExtractRecord (ZebraHandle zh,
                         const char *recordType,
                         int *sysno,
                         const char *match_criteria,
-                        const char *fname)
+                        const char *fname,
+                        int force_update,
+                        int allow_update)
 
 {
     RecordAttr *recordAttr;
@@ -1092,28 +1095,38 @@ int bufferExtractRecord (ZebraHandle zh,
         extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
 
         zh->records_inserted++;
-    }
+    } 
     else
     {
         /* record already exists */
         struct recKeys delkeys;
         struct sortKeys sortKeys;
 
+       if (!allow_update) {
+             logf (LOG_LOG, "skipped %s %s %ld", 
+                   recordType, fname, (long) recordOffset);
+             logRecord(zh);
+             return -1;
+       }
+
         rec = rec_get (zh->reg->records, *sysno);
         assert (rec);
        
        recordAttr = rec_init_attr (zh->reg->zei, rec);
 
-       if (recordAttr->runNumber ==
-           zebraExplain_runNumberIncrement (zh->reg->zei, 0))
-       {
-           logf (LOG_LOG, "skipped %s %s %ld", recordType,
-                 fname, (long) recordOffset);
-           extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
-           rec_rm (&rec);
-            logRecord(zh);
-           return 1;
+       if (!force_update) {
+         if (recordAttr->runNumber ==
+             zebraExplain_runNumberIncrement (zh->reg->zei, 0))
+           {
+             logf (LOG_LOG, "skipped %s %s %ld", recordType,
+                   fname, (long) recordOffset);
+             extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
+             rec_rm (&rec);
+             logRecord(zh);
+             return 1;
+           }
        }
+
         delkeys.buf_used = rec->size[recInfo_delKeys];
        delkeys.buf = rec->info[recInfo_delKeys];