* Sebastian Hammer, Adam Dickmeiss
*
* $Log: extract.c,v $
- * Revision 1.65 1996-11-14 08:57:56 adam
+ * Revision 1.68 1997-02-12 20:39:45 adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.67 1996/11/15 15:02:14 adam
+ * Minor changes regarding logging.
+ *
+ * Revision 1.66 1996/11/14 09:52:21 adam
+ * Strings in record keys bound by IT_MAX_WORD.
+ *
+ * Revision 1.65 1996/11/14 08:57:56 adam
* Reduction of storeKeys area.
*
* Revision 1.64 1996/11/08 11:10:16 adam
case Word_Numeric:
*dst++ = 'n';
}
- for (i = 0; p->u.string[i]; i++)
+ for (i = 0; p->u.string[i] && i < IT_MAX_WORD-3; i++)
*dst++ = p->u.string[i];
*dst++ = '\0';
struct recordLogInfo {
const char *fname;
- char *op;
+ int recordOffset;
struct recordGroup *rGroup;
};
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);
+ fprintf (outf, "File %s, offset %d, type %s\n",
+ p->rGroup->recordType, p->recordOffset, p->fname);
log_event_start (NULL, NULL);
}
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.endf = file_end;
extractCtrl.map_chrs_input = map_chrs_input;
extractCtrl.flagShowRecords = rGroup->flagShowRecords;
+ if (rGroup->flagShowRecords)
+ printf ("File: %s %ld\n", fname, (long) recordOffset);
+
+ logInfo.fname = fname;
+ logInfo.recordOffset = recordOffset;
+ logInfo.rGroup = rGroup;
+ log_event_start (recordLogPreamble, &logInfo);
+
r = (*recType->extract)(&extractCtrl);
+ log_event_start (NULL, NULL);
+
if (r)
{
/* error occured during extraction ... */
- logf (LOG_WARN, "Couldn't extract file %s, code %d", fname, r);
+ if (!rGroup->flagShowRecords &&
+ records_processed < rGroup->fileVerboseLimit)
+ {
+ logf (LOG_WARN, "fail %s %s %ld code = %d", rGroup->recordType,
+ fname, (long) recordOffset, 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);
+ is probably empty - unless flagShowRecords is in use */
+ if (rGroup->flagShowRecords)
+ return 1;
+ logf (LOG_WARN, "No keys generated for file %s", fname);
+ logf (LOG_WARN, " The file is probably empty");
return 0;
}
}
logf (LOG_LOG, "Cannot delete new record");
return 1;
}
- logInfo.op = "add";
- if (rGroup->fileVerboseFlag)
- logf (LOG_LOG, "add %s %s+%ld", rGroup->recordType,
+ if (records_processed < rGroup->fileVerboseLimit)
+ logf (LOG_LOG, "add %s %s %ld", rGroup->recordType,
fname, (long) recordOffset);
rec = rec_new (records);
*sysno = rec->sysno;
if (deleteFlag)
{
/* record going to be deleted */
- logInfo.op = "delete";
if (!delkeys.buf_used)
{
- logf (LOG_WARN, "cannot delete; storeKeys false");
+ logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ logf (LOG_WARN, "cannot delete file above, storeKeys false");
}
else
{
- if (rGroup->fileVerboseFlag)
+ if (records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "delete %s %s %ld", rGroup->recordType,
fname, (long) recordOffset);
records_deleted++;
else
{
/* record going to be updated */
- logInfo.op = "update";
if (!delkeys.buf_used)
{
- logf (LOG_WARN, "cannot update; storeKeys false");
+ logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
+ fname, (long) recordOffset);
+ logf (LOG_WARN, "cannot update file above, storeKeys false");
}
else
{
- if (rGroup->fileVerboseFlag)
+ if (records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "update %s %s %ld", rGroup->recordType,
fname, (long) recordOffset);
flushRecordKeys (*sysno, 1, &reckeys, rGroup->databaseName);
sprintf (ext_res, "%srecordType", gprefix);
if (!(rGroup->recordType = res_get (common_resource, ext_res)))
{
- if (rGroup->fileVerboseFlag)
+ if (records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "? %s", fname);
return 0;
}
}
if (!rGroup->recordType)
{
- if (rGroup->fileVerboseFlag)
+ if (records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "? record %s", fname);
return 0;
}
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);