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 bf94e3f..edf6e37 100644 (file)
--- a/index/extract.c
+++ b/index/extract.c
@@ -1,5 +1,5 @@
-/* $Id: extract.c,v 1.138 2003-02-27 22:55:40 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;
@@ -961,39 +964,45 @@ int bufferExtractRecord (ZebraHandle zh,
     extractCtrl.endf = zebra_record_int_end;
     extractCtrl.fh = &fc;
 
-    /* announce database */
-    if (zebraExplain_curDatabase (zh->reg->zei, rGroup->databaseName))
-    {
-      if (zebraExplain_newDatabase (zh->reg->zei, rGroup->databaseName, 0))
-       return 0;
-    }
-
     zh->reg->keys.buf_used = 0;
     zh->reg->keys.prevAttrUse = -1;
     zh->reg->keys.prevAttrSet = -1;
     zh->reg->keys.prevSeqNo = 0;
     zh->reg->sortKeys.buf_used = 0;
 
+    /* announce database */
+
+    if (!(rGroup->databaseName)) {
+        logf (LOG_WARN, "Invalid record group, no database name given");
+       return 0;
+    }
+    
+    if (zebraExplain_curDatabase (zh->reg->zei, rGroup->databaseName))
+    {
+        if (zebraExplain_newDatabase (zh->reg->zei, rGroup->databaseName, 0))
+            return 0;
+    }
+    
     if (*recordType) {
-      logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
-      recType = recType_byName (zh->reg->recTypes, recordType, subType,
-                               &clientData);
+        logf (LOG_DEBUG, "Record type explicitly specified: %s", recordType);
+        recType = recType_byName (zh->reg->recTypes, recordType, subType,
+                                  &clientData);
     } else {
-      if (!(rGroup->recordType)) {
-        logf (LOG_WARN, "No such record type defined");
-        return 0;
-      }
-      logf (LOG_DEBUG, "Get record type from rgroup: %s",rGroup->recordType);
-      recType = recType_byName (zh->reg->recTypes, rGroup->recordType, subType,
-                               &clientData);
-      recordType = rGroup->recordType;
+        if (!(rGroup->recordType)) {
+            logf (LOG_WARN, "No such record type defined");
+            return 0;
+        }
+        logf (LOG_DEBUG, "Get record type from rgroup: %s",rGroup->recordType);
+        recType = recType_byName (zh->reg->recTypes, rGroup->recordType, subType,
+                                  &clientData);
+        recordType = rGroup->recordType;
     }
-
+    
     if (!recType) {
-      logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
-      return 0;
+        logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
+        return 0;
     }
-
+    
     extractCtrl.subType = subType;
     extractCtrl.init = extract_init;
     extractCtrl.tokenAdd = extract_token_add;
@@ -1039,25 +1048,24 @@ int bufferExtractRecord (ZebraHandle zh,
     /* match criteria */
     matchStr = NULL;
 
-    if (! *sysno) {
-      char *rinfo;
-      if (strlen(match_criteria) > 0) {
-       matchStr = (char *)match_criteria;
-      } else {
-       if (rGroup->recordId && *rGroup->recordId) {
-         matchStr = fileMatchStr (zh, &zh->reg->keys, rGroup, fname, 
-                                  rGroup->recordId);
-       }
-      }
-      if (matchStr) {
-       rinfo = dict_lookup (zh->reg->matchDict, matchStr);
-       if (rinfo)
-         memcpy (sysno, rinfo+1, sizeof(*sysno));
-      } else {
-       logf (LOG_WARN, "Bad match criteria (recordID)");
-       return 0;
-      }
-
+    if (! *sysno && match_criteria) {
+        char *rinfo;
+        if (*match_criteria) {
+            matchStr = (char *)match_criteria;
+        } else {
+            if (rGroup->recordId && *rGroup->recordId) {
+                matchStr = fileMatchStr (zh, &zh->reg->keys, rGroup, fname, 
+                                         rGroup->recordId);
+            }
+        }
+        if (matchStr) {
+            rinfo = dict_lookup (zh->reg->matchDict, matchStr);
+            if (rinfo)
+                memcpy (sysno, rinfo+1, sizeof(*sysno));
+        } else {
+            logf (LOG_WARN, "Bad match criteria (recordID)");
+            return 0;
+        }
     }
 
     if (! *sysno)
@@ -1087,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];