-/* $Id: extract.c,v 1.139 2003-02-27 23:08:10 pop Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: extract.c,v 1.144 2003-04-15 16:46:18 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
SYSNO *sysno, const char *fname,
struct recordGroup *rGroup, int deleteFlag,
struct file_read_info *fi,
- RecType recType, char *subType, void *clientData)
+ RecType recType, char *subType, void *clientData,
+ int force_update)
{
RecordAttr *recordAttr;
int r;
recordAttr = rec_init_attr (zh->reg->zei, rec);
- if (recordAttr->runNumber ==
+ if (!force_update && recordAttr->runNumber ==
zebraExplain_runNumberIncrement (zh->reg->zei, 0))
{
yaz_log (LOG_LOG, "run number = %d", recordAttr->runNumber);
{
file_begin (fi);
r = recordExtract (zh, sysno, fname, rGroup, deleteFlag, fi,
- recType, subType, clientData);
+ recType, subType, clientData, 1);
} while (r && !sysno && fi->file_more);
file_read_stop (fi);
if (fd != -1)
recordType,
sysno,
match_criteria,
- "<no file>"));
+ "<no file>",
+ 0,1));
}
/*
If sysno is provided, then it's used to identify the reocord.
const char *recordType,
int *sysno,
const char *match_criteria,
- const char *fname)
+ const char *fname,
+ int force_update,
+ int allow_update)
{
RecordAttr *recordAttr;
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 (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;
/* 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)
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];
}
return bp;
}
+#define OLDENCODE 1
#ifdef OLDENCODE
/* this is the old encode_key_write