* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.30 1995-11-22 17:19:16 adam
+ * Revision 1.56 1996-05-09 09:54:42 adam
+ * Server supports maps from one logical attributes to a list of physical
+ * attributes.
+ * The extraction process doesn't make space consuming 'any' keys.
+ *
+ * Revision 1.55 1996/05/09 07:28:55 quinn
+ * Work towards phrases and multiple registers
+ *
+ * Revision 1.54 1996/05/01 13:46:35 adam
+ * First work on multiple records in one file.
+ * New option, -offset, to the "unread" command in the filter module.
+ *
+ * Revision 1.53 1996/04/26 12:09:43 adam
+ * Added a few comments.
+ *
+ * Revision 1.52 1996/04/25 13:27:57 adam
+ * Function recordExtract modified so that files with no keys (possibly empty)
+ * are ignored.
+ *
+ * Revision 1.51 1996/03/19 11:08:42 adam
+ * Bug fix: Log preamble wasn't always turned off after recordExtract.
+ *
+ * Revision 1.50 1996/02/12 18:45:36 adam
+ * New fileVerboseFlag in record group control.
+ *
+ * Revision 1.49 1996/02/05 12:29:57 adam
+ * Logging reduced a bit.
+ * The remaining running time is estimated during register merge.
+ *
+ * Revision 1.48 1996/02/01 20:53:26 adam
+ * The temporary per-record keys are compacted a little, and duplication
+ * of the per-records keys are avoided when they are saved in the record
+ * information buffer.
+ *
+ * Revision 1.47 1996/01/17 14:57:48 adam
+ * Prototype changed for reader functions in extract/retrieve. File
+ * is identified by 'void *' instead of 'int.
+ *
+ * Revision 1.46 1995/12/15 14:57:16 adam
+ * Bug fix.
+ *
+ * Revision 1.45 1995/12/15 12:37:41 adam
+ * In addRecordKeyAny: Writes key only when attrSet != -1.
+ *
+ * Revision 1.44 1995/12/12 16:00:54 adam
+ * System call sync(2) used after update/commit.
+ * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
+ * and F_RDLCK.
+ *
+ * Revision 1.43 1995/12/11 09:12:46 adam
+ * The rec_get function returns NULL if record doesn't exist - will
+ * happen in the server if the result set records have been deleted since
+ * the creation of the set (i.e. the search).
+ * The server saves a result temporarily if it is 'volatile', i.e. the
+ * set is register dependent.
+ *
+ * Revision 1.42 1995/12/07 17:38:46 adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * Revision 1.41 1995/12/06 16:06:42 adam
+ * Better diagnostics. Work on 'real' dictionary deletion.
+ *
+ * Revision 1.40 1995/12/05 16:57:40 adam
+ * More work on regular patterns.
+ *
+ * Revision 1.39 1995/12/05 13:20:18 adam
+ * Bug fix: file_read sometimes returned early EOF.
+ *
+ * Revision 1.38 1995/12/04 17:59:21 adam
+ * More work on regular expression conversion.
+ *
+ * Revision 1.37 1995/12/04 14:22:27 adam
+ * Extra arg to recType_byName.
+ * Started work on new regular expression parsed input to
+ * structured records.
+ *
+ * Revision 1.36 1995/11/30 08:34:29 adam
+ * Started work on commit facility.
+ * Changed a few malloc/free to xmalloc/xfree.
+ *
+ * Revision 1.35 1995/11/28 14:26:21 adam
+ * Bug fix: recordId with constant wasn't right.
+ * Bug fix: recordId dictionary entry wasn't deleted when needed.
+ *
+ * Revision 1.34 1995/11/28 09:09:38 adam
+ * Zebra config renamed.
+ * Use setting 'recordId' to identify record now.
+ * Bug fix in recindex.c: rec_release_blocks was invokeded even
+ * though the blocks were already released.
+ * File traversal properly deletes records when needed.
+ *
+ * Revision 1.33 1995/11/27 09:56:20 adam
+ * Record info elements better enumerated. Internal store of records.
+ *
+ * Revision 1.32 1995/11/25 10:24:05 adam
+ * More record fields - they are enumerated now.
+ * New options: flagStoreData flagStoreKey.
+ *
+ * Revision 1.31 1995/11/24 11:31:35 adam
+ * Commands add & del read filenames from stdin if source directory is
+ * empty.
+ * Match criteria supports 'constant' strings.
+ *
+ * Revision 1.30 1995/11/22 17:19:16 adam
* Record management uses the bfile system.
*
* Revision 1.29 1995/11/21 15:01:14 adam
static int records_inserted = 0;
static int records_updated = 0;
static int records_deleted = 0;
+static int records_processed = 0;
-#define MATCH_DICT "match"
+static void logRecord (int showFlag)
+{
+ if (!showFlag)
+ ++records_processed;
+ if (showFlag || !(records_processed % 1000))
+ {
+ logf (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
+ records_processed, records_inserted, records_updated,
+ records_deleted);
+ }
+}
void key_open (int mem)
{
key_buf_used = 0;
key_file_no = 0;
- if (!(matchDict = dict_open (MATCH_DICT, 20, 1)))
+ if (!(matchDict = dict_open (GMATCH_DICT, 50, 1)))
{
- logf (LOG_FATAL, "dict_open fail of %s", MATCH_DICT);
+ logf (LOG_FATAL, "dict_open fail of %s", GMATCH_DICT);
exit (1);
}
assert (!records);
rec_close (&records);
dict_close (matchDict);
- logf (LOG_LOG, "Records inserted %6d", records_inserted);
- logf (LOG_LOG, "Records updated %6d", records_updated);
- logf (LOG_LOG, "Records deleted %6d", records_deleted);
+ logRecord (1);
return key_file_no;
}
int buf_used;
int buf_max;
char *buf;
+ char prevAttrSet;
+ short prevAttrUse;
} reckeys;
static void addRecordKey (const RecWord *p)
char attrSet;
short attrUse;
size_t i;
+ int lead = 0;
if (reckeys.buf_used+1024 > reckeys.buf_max)
{
char *b;
- b = malloc (reckeys.buf_max += 65000);
+ b = xmalloc (reckeys.buf_max += 128000);
if (reckeys.buf_used > 0)
memcpy (b, reckeys.buf, reckeys.buf_used);
- free (reckeys.buf);
+ xfree (reckeys.buf);
reckeys.buf = b;
}
dst = reckeys.buf + reckeys.buf_used;
+
+ attrSet = p->attrSet;
+ if (reckeys.buf_used > 0 && reckeys.prevAttrSet == attrSet)
+ lead |= 1;
+ else
+ reckeys.prevAttrSet = attrSet;
+ attrUse = p->attrUse;
+ if (reckeys.buf_used > 0 && reckeys.prevAttrUse == attrUse)
+ lead |= 2;
+ else
+ reckeys.prevAttrUse = attrUse;
+
switch (p->which)
{
- case Word_String:
- attrSet = p->attrSet;
- memcpy (dst, &attrSet, sizeof(attrSet));
- dst += sizeof(attrSet);
+ case Word_String: case Word_Phrase:
+ *dst++ = lead;
- attrUse = p->attrUse;
- memcpy (dst, &attrUse, sizeof(attrUse));
- dst += sizeof(attrUse);
-
+ if (!(lead & 1))
+ {
+ memcpy (dst, &attrSet, sizeof(attrSet));
+ dst += sizeof(attrSet);
+ }
+ if (!(lead & 2))
+ {
+ memcpy (dst, &attrUse, sizeof(attrUse));
+ dst += sizeof(attrUse);
+ }
for (i = 0; p->u.string[i]; i++)
*dst++ = p->u.string[i];
*dst++ = '\0';
static void flushRecordKeys (SYSNO sysno, int cmd, struct recKeys *reckeys,
const char *databaseName)
{
+ char attrSet = -1;
+ short attrUse = -1;
int off = 0;
while (off < reckeys->buf_used)
{
const char *src = reckeys->buf + off;
- char attrSet;
- short attrUse;
struct it_key key;
-
- memcpy (&attrSet, src, sizeof(attrSet));
- src += sizeof(attrSet);
-
- memcpy (&attrUse, src, sizeof(attrUse));
- src += sizeof(attrUse);
+ int lead;
+
+ lead = *src++;
+ if (!(lead & 1))
+ {
+ memcpy (&attrSet, src, sizeof(attrSet));
+ src += sizeof(attrSet);
+ }
+ if (!(lead & 2))
+ {
+ memcpy (&attrUse, src, sizeof(attrUse));
+ src += sizeof(attrUse);
+ }
if (key_buf_used + 1024 > (ptr_top-ptr_i)*sizeof(char*))
key_flush ();
++ptr_i;
return ws;
}
-static void addRecordKeyAny (const RecWord *p)
+struct file_read_info {
+ off_t file_max;
+ off_t file_offset;
+ off_t file_moffset;
+ int file_more;
+ int fd;
+};
+
+static struct file_read_info *file_read_start (int fd)
{
- if (p->attrSet != 1 || p->attrUse != 1016)
- {
- RecWord w;
+ struct file_read_info *fi = xmalloc (sizeof(*fi));
- memcpy (&w, p, sizeof(w));
- w.attrSet = 1;
- w.attrUse = 1016;
- addRecordKey (&w);
- }
- addRecordKey (p);
+ fi->fd = fd;
+ fi->file_max = 0;
+ fi->file_moffset = 0;
+ return fi;
}
-static char *file_buf;
-static int file_offset;
-static int file_bufsize;
-
-static void file_read_start (int fd)
+static void file_read_stop (struct file_read_info *fi)
{
- file_offset = 0;
- file_buf = xmalloc (4096);
- file_bufsize = read (fd, file_buf, 4096);
+ assert (fi);
+ xfree (fi);
}
-static void file_read_stop (int fd)
+static off_t file_seek (void *handle, off_t offset)
{
- xfree (file_buf);
+ struct file_read_info *p = handle;
+ p->file_offset = offset;
+ return lseek (p->fd, offset, SEEK_SET);
}
-static int file_read (int fd, char *buf, size_t count)
+static int file_read (void *handle, char *buf, size_t count)
{
- int l = file_bufsize - file_offset;
-
- if (count > l)
+ struct file_read_info *p = handle;
+ int fd = p->fd;
+ int r;
+ r = read (fd, buf, count);
+ if (r > 0)
{
- int r;
- if (l > 0)
- memcpy (buf, file_buf + file_offset, l);
- count = count-l;
- if (count > file_bufsize)
- {
- if ((r = read (fd, buf + l, count)) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read");
- exit (1);
- }
- file_bufsize = 0;
- file_offset = 0;
- return r;
- }
- file_bufsize = r = read (fd, file_buf, 4096);
- if (r == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read");
- exit (1);
- }
- else if (r <= count)
- {
- file_offset = r;
- memcpy (buf + l, file_buf, r);
- return l + r;
- }
- else
- {
- file_offset = count;
- memcpy (buf + l, file_buf, count - l);
- return count;
- }
+ p->file_offset += r;
+ if (p->file_offset > p->file_max)
+ p->file_max = p->file_offset;
}
- memcpy (buf, file_buf + file_offset, count);
- file_offset += count;
- return count;
+ return r;
+}
+
+static void file_begin (void *handle)
+{
+ struct file_read_info *p = handle;
+
+ p->file_offset = p->file_moffset;
+ if (p->file_moffset)
+ lseek (p->fd, p->file_moffset, SEEK_SET);
+ p->file_more = 0;
+}
+
+static void file_end (void *handle, off_t offset)
+{
+ struct file_read_info *p = handle;
+
+ assert (p->file_more == 0);
+ p->file_more = 1;
+ p->file_moffset = offset;
}
static int atois (const char **s)
static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup,
const char *fname,
- const char *recordType,
const char *spec)
{
static char dstBuf[2048];
}
if (first)
{
- logf (LOG_WARN, "Record in file %s didn't contain match"
- " fields in (%d,%d)", fname, attrSet, attrUse);
+ logf (LOG_WARN, "Record didn't contain match"
+ " fields in (%d,%d)", attrSet, attrUse);
return NULL;
}
}
else if (*s == '$')
{
int spec_len;
- char special[32];
+ char special[64];
const char *spec_src = NULL;
const char *s1 = ++s;
while (*s1 && *s1 != ' ' && *s1 != '\t')
s1++;
spec_len = s1 - s;
- if (spec_len > 31)
- spec_len = 31;
+ if (spec_len > 63)
+ spec_len = 63;
memcpy (special, s, spec_len);
special[spec_len] = '\0';
s = s1;
- if (strcmp (special, "group"))
+ if (!strcmp (special, "group"))
spec_src = rGroup->groupName;
- else if (strcmp (special, "database"))
+ else if (!strcmp (special, "database"))
spec_src = rGroup->databaseName;
- else if (strcmp (special, "filename"))
+ else if (!strcmp (special, "filename"))
spec_src = fname;
- else if (strcmp (special, "type"))
- spec_src = recordType;
+ else if (!strcmp (special, "type"))
+ spec_src = rGroup->recordType;
else
spec_src = NULL;
if (spec_src)
{
strcpy (dst, spec_src);
- dst += strlen(spec_src);
+ dst += strlen (spec_src);
}
}
+ else if (*s == '\"' || *s == '\'')
+ {
+ int stopMarker = *s++;
+ char tmpString[64];
+ int i = 0;
+
+ while (*s && *s != stopMarker)
+ {
+ if (i < 63)
+ tmpString[i++] = *s++;
+ }
+ if (*s)
+ s++;
+ tmpString[i] = '\0';
+ strcpy (dst, tmpString);
+ dst += strlen (tmpString);
+ }
else
{
logf (LOG_WARN, "Syntax error in match criteria %s in group %s",
return dstBuf;
}
-int fileExtract (SYSNO *sysno, const char *fname, struct recordGroup *rGroup,
- int deleteFlag)
+struct recordLogInfo {
+ const char *fname;
+ char *op;
+ struct recordGroup *rGroup;
+};
+
+static void recordLogPreamble (int level, const char *msg, void *info)
+{
+ struct recordLogInfo *p = info;
+ FILE *outf = log_file ();
+
+ if (level & LOG_LOG)
+ return ;
+ if (p->op)
+ fprintf (outf, "%s of ", p->op);
+ fprintf (outf, "%s type %s\n", p->rGroup->recordType, p->fname);
+ log_event_start (NULL, NULL);
+}
+
+static int recordExtract (SYSNO *sysno, const char *fname,
+ struct recordGroup *rGroup, int deleteFlag,
+ struct file_read_info *fi, RecType recType,
+ char *subType)
{
+ struct recExtractCtrl extractCtrl;
+ int r;
+ char *matchStr;
SYSNO sysnotmp;
- int i, r;
+ off_t recordOffset = 0;
+ Record rec;
+ struct recordLogInfo logInfo;
+
+ logInfo.fname = fname;
+ logInfo.op = NULL;
+ logInfo.rGroup = rGroup;
+ log_event_start (recordLogPreamble, &logInfo);
+
+ if (fi->fd != -1)
+ {
+ /* we are going to read from a file, so prepare the extraction */
+ extractCtrl.fh = fi;
+ extractCtrl.subType = subType;
+ extractCtrl.init = wordInit;
+ extractCtrl.add = addRecordKey;
+
+ reckeys.buf_used = 0;
+ reckeys.prevAttrUse = -1;
+ reckeys.prevAttrSet = -1;
+
+ recordOffset = fi->file_moffset;
+ extractCtrl.offset = recordOffset;
+ extractCtrl.readf = file_read;
+ extractCtrl.seekf = file_seek;
+ extractCtrl.endf = file_end;
+ r = (*recType->extract)(&extractCtrl);
+
+ if (r)
+ {
+ /* error occured during extraction ... */
+ logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
+ return 0;
+ }
+ if (reckeys.buf_used == 0)
+ {
+ /* the extraction process returned no information - the record
+ is probably empty */
+ logf (LOG_WARN, "Empty file %s", fname);
+ return 0;
+ }
+ }
+
+ /* perform match if sysno not known and if match criteria is specified */
+
+ matchStr = NULL;
+ if (!sysno)
+ {
+ sysnotmp = 0;
+ sysno = &sysnotmp;
+ if (rGroup->recordId && *rGroup->recordId)
+ {
+ char *rinfo;
+
+ matchStr = fileMatchStr (&reckeys, rGroup, fname,
+ rGroup->recordId);
+ if (matchStr)
+ {
+ rinfo = dict_lookup (matchDict, matchStr);
+ if (rinfo)
+ memcpy (sysno, rinfo+1, sizeof(*sysno));
+ }
+ else
+ {
+ logf (LOG_WARN, "Bad match criteria");
+ return 0;
+ }
+ }
+ }
+
+ if (! *sysno)
+ {
+ /* new record */
+ if (deleteFlag)
+ {
+ logf (LOG_LOG, "Cannot delete new record");
+ return 1;
+ }
+ logInfo.op = "add";
+ if (rGroup->fileVerboseFlag)
+ logf (LOG_LOG, "add %s %s+%ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ rec = rec_new (records);
+ *sysno = rec->sysno;
+
+ if (matchStr)
+ {
+ dict_insert (matchDict, matchStr, sizeof(*sysno), sysno);
+ }
+ flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
+
+ records_inserted++;
+ }
+ else
+ {
+ /* record already exists */
+ struct recKeys delkeys;
+
+ rec = rec_get (records, *sysno);
+ assert (rec);
+ delkeys.buf_used = rec->size[recInfo_delKeys];
+ delkeys.buf = rec->info[recInfo_delKeys];
+ flushRecordKeys (*sysno, 0, &delkeys, rec->info[recInfo_databaseName]);
+ if (deleteFlag)
+ {
+ /* record going to be deleted */
+ logInfo.op = "delete";
+ if (!delkeys.buf_used)
+ {
+ logf (LOG_WARN, "cannot delete; storeKeys false");
+ }
+ else
+ {
+ if (rGroup->fileVerboseFlag)
+ logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ records_deleted++;
+ if (matchStr)
+ dict_delete (matchDict, matchStr);
+ rec_del (records, &rec);
+ }
+ logRecord (0);
+ return 1;
+ }
+ else
+ {
+ /* record going to be updated */
+ logInfo.op = "update";
+ if (!delkeys.buf_used)
+ {
+ logf (LOG_WARN, "cannot update; storeKeys false");
+ }
+ else
+ {
+ if (rGroup->fileVerboseFlag)
+ logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
+ records_updated++;
+ }
+ }
+ }
+ /* update file type */
+ xfree (rec->info[recInfo_fileType]);
+ rec->info[recInfo_fileType] =
+ rec_strdup (rGroup->recordType, &rec->size[recInfo_fileType]);
+
+ /* update filename */
+ xfree (rec->info[recInfo_filename]);
+ rec->info[recInfo_filename] =
+ rec_strdup (fname, &rec->size[recInfo_filename]);
+
+ /* update delete keys */
+ xfree (rec->info[recInfo_delKeys]);
+ if (reckeys.buf_used > 0 && rGroup->flagStoreKeys == 1)
+ {
+#if 1
+ rec->size[recInfo_delKeys] = reckeys.buf_used;
+ rec->info[recInfo_delKeys] = reckeys.buf;
+ reckeys.buf = NULL;
+ reckeys.buf_max = 0;
+#else
+ rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used);
+ rec->size[recInfo_delKeys] = reckeys.buf_used;
+ memcpy (rec->info[recInfo_delKeys], reckeys.buf,
+ rec->size[recInfo_delKeys]);
+#endif
+ }
+ else
+ {
+ rec->info[recInfo_delKeys] = NULL;
+ rec->size[recInfo_delKeys] = 0;
+ }
+
+ /* update store data */
+ xfree (rec->info[recInfo_storeData]);
+ if (rGroup->flagStoreData == 1)
+ {
+ rec->size[recInfo_storeData] = fi->file_max;
+ rec->info[recInfo_storeData] = xmalloc (fi->file_max);
+ if (lseek (fi->fd, recordOffset, SEEK_SET) < 0)
+ {
+ logf (LOG_ERRNO|LOG_FATAL, "seek to %ld in %s", fname,
+ (long) recordOffset);
+ exit (1);
+ }
+ if (read (fi->fd, rec->info[recInfo_storeData], fi->file_max)
+ < fi->file_max)
+ {
+ logf (LOG_ERRNO|LOG_FATAL, "read %d bytes of %s",
+ fi->file_max, fname);
+ exit (1);
+ }
+ }
+ else
+ {
+ rec->info[recInfo_storeData] = NULL;
+ rec->size[recInfo_storeData] = 0;
+ }
+ /* update database name */
+ xfree (rec->info[recInfo_databaseName]);
+ rec->info[recInfo_databaseName] =
+ rec_strdup (rGroup->databaseName, &rec->size[recInfo_databaseName]);
+
+ /* update offset */
+ xfree (rec->info[recInfo_offset]);
+
+ rec->size[recInfo_offset] = sizeof(recordOffset);
+ rec->info[recInfo_offset] = xmalloc (sizeof(recordOffset));
+ memcpy (rec->info[recInfo_offset], &recordOffset, sizeof(recordOffset));
+
+ /* commit this record */
+ rec_put (records, &rec);
+ logRecord (0);
+ return 1;
+}
+
+int fileExtract (SYSNO *sysno, const char *fname,
+ const struct recordGroup *rGroupP, int deleteFlag)
+{
+ int r, i, fd;
char gprefix[128];
char ext[128];
char ext_res[128];
- const char *file_type;
- const char *file_match;
- struct recExtractCtrl extractCtrl;
+ char subType[128];
RecType recType;
- Record rec;
- char *matchStr;
+ struct recordGroup rGroupM;
+ struct recordGroup *rGroup = &rGroupM;
+ struct file_read_info *fi;
+ memcpy (rGroup, rGroupP, sizeof(*rGroupP));
+
if (!rGroup->groupName || !*rGroup->groupName)
*gprefix = '\0';
else
sprintf (gprefix, "%s.", rGroup->groupName);
- logf (LOG_DEBUG, "fileExtractAdd %s", fname);
+ logf (LOG_DEBUG, "fileExtract %s", fname);
/* determine file extension */
for (i = strlen(fname); --i >= 0; )
break;
}
/* determine file type - depending on extension */
- sprintf (ext_res, "%sfileExtension.%s", gprefix, ext);
- if (!(file_type = res_get (common_resource, ext_res)))
+ if (!rGroup->recordType)
+ {
+ sprintf (ext_res, "%srecordType.%s", gprefix, ext);
+ if (!(rGroup->recordType = res_get (common_resource, ext_res)))
+ {
+ sprintf (ext_res, "%srecordType", gprefix);
+ if (!(rGroup->recordType = res_get (common_resource, ext_res)))
+ {
+ if (rGroup->fileVerboseFlag)
+ logf (LOG_LOG, "? %s", fname);
+ return 0;
+ }
+ }
+ }
+ if (!rGroup->recordType)
+ {
+ if (rGroup->fileVerboseFlag)
+ logf (LOG_LOG, "? record %s", fname);
return 0;
- if (!(recType = recType_byName (file_type)))
+ }
+ if (!(recType = recType_byName (rGroup->recordType, subType)))
+ {
+ logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
return 0;
+ }
/* determine match criteria */
- sprintf (ext_res, "%sfileMatch.%s", gprefix, ext);
- file_match = res_get (common_resource, ext_res);
- if (!file_match)
+ if (!rGroup->recordId)
{
- sprintf (ext_res, "%sfileMatch", gprefix);
- file_match = res_get (common_resource, ext_res);
+ sprintf (ext_res, "%srecordId.%s", gprefix, ext);
+ rGroup->recordId = res_get (common_resource, ext_res);
}
/* determine database name */
if (!rGroup->databaseName)
rGroup->databaseName = "Default";
- /* open input file */
- if ((extractCtrl.fd = open (fname, O_RDONLY)) == -1)
+ if (rGroup->flagStoreData == -1)
{
- logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
- return 0;
- }
-
- /* extract keys */
- extractCtrl.subType = "";
- extractCtrl.init = wordInit;
- extractCtrl.add = addRecordKeyAny;
-
- reckeys.buf_used = 0;
- file_read_start (extractCtrl.fd);
- extractCtrl.readf = file_read;
- r = (*recType->extract)(&extractCtrl);
- file_read_stop (extractCtrl.fd);
- close (extractCtrl.fd);
-
- if (r)
- {
- logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
- return 0;
- }
-
- /* perform match if sysno not known and if match criteria is specified */
-
- matchStr = NULL;
- if (!sysno && file_match)
- {
- char *rinfo;
-
- sysno = &sysnotmp;
- matchStr = fileMatchStr(&reckeys, rGroup, fname, file_type,
- file_match);
- if (matchStr)
+ const char *sval;
+ sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
+ if (!(sval = res_get (common_resource, ext_res)))
{
- rinfo = dict_lookup (matchDict, matchStr);
- if (rinfo)
- memcpy (sysno, rinfo+1, sizeof(*sysno));
- else
- *sysno = 0;
- }
- else
- {
- logf (LOG_WARN, "Record not inserted");
- return 0;
+ sprintf (ext_res, "%sstoreData", gprefix);
+ sval = res_get (common_resource, ext_res);
}
+ if (sval)
+ rGroup->flagStoreData = atoi (sval);
}
+ if (rGroup->flagStoreData == -1)
+ rGroup->flagStoreData = 0;
- /* new record ? */
- if (! *sysno)
+ if (rGroup->flagStoreKeys == -1)
{
- if (deleteFlag)
+ const char *sval;
+
+ sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
+ if (!(sval = res_get (common_resource, ext_res)))
{
- logf (LOG_LOG, "? record %s", fname);
- return 1;
+ sprintf (ext_res, "%sstoreKeys", gprefix);
+ sval = res_get (common_resource, ext_res);
}
- logf (LOG_LOG, "add record %s", fname);
- rec = rec_new (records);
- *sysno = rec->sysno;
-
- if (matchStr)
- dict_insert (matchDict, matchStr, sizeof(*sysno), sysno);
- flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
-
- records_inserted++;
+ if (sval)
+ rGroup->flagStoreKeys = atoi (sval);
}
+ if (rGroup->flagStoreKeys == -1)
+ rGroup->flagStoreKeys = 0;
+
+ if (sysno && deleteFlag)
+ fd = -1;
else
{
- struct recKeys delkeys;
-
- rec = rec_get (records, *sysno);
-
- delkeys.buf_used = rec->size[2];
- delkeys.buf = rec->info[2];
- flushRecordKeys (*sysno, 0, &delkeys, rec->info[3]);
- if (deleteFlag)
+ if ((fd = open (fname, O_RDONLY)) == -1)
{
- logf (LOG_LOG, "delete record %s", fname);
- records_deleted++;
- rec_del (records, &rec);
- return 1;
- }
- else
- {
- logf (LOG_LOG, "update record %s", fname);
- flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
- records_updated++;
+ logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
+ return 0;
}
}
- free (rec->info[0]);
- rec->info[0] = rec_strdup (file_type, &rec->size[0]);
-
- free (rec->info[1]);
- rec->info[1] = rec_strdup (fname, &rec->size[1]);
-
- free (rec->info[2]);
- if (reckeys.buf_used > 0)
+ fi = file_read_start (fd);
+ do
{
- rec->info[2] = malloc (reckeys.buf_used);
- rec->size[2] = reckeys.buf_used;
- memcpy (rec->info[2], reckeys.buf, rec->size[2]);
- }
- else
- {
- rec->info[2] = NULL;
- rec->size[2] = 0;
- }
- free (rec->info[3]);
- rec->info[3] = rec_strdup (rGroup->databaseName, &rec->size[3]);
-
- rec_put (records, &rec);
- return 1;
+ file_begin (fi);
+ r = recordExtract (sysno, fname, rGroup, deleteFlag, fi,
+ recType, subType);
+ } while (r && !sysno && fi->file_more);
+ log_event_start (NULL, NULL);
+ file_read_stop (fi);
+ if (fd != -1)
+ close (fd);
+ return r;
}
+