X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=aa695502246c84e03bf02c969aeae1dcaf557b18;hb=0ca8a9894b43c838980d650dd265f7a3da4ed219;hp=a9885fbd8ce4a8fcafd0e1152eed7c71cc24addd;hpb=9aff3a4c1cf25ef7fd0b93cfa650d31eb736cbc9;p=idzebra-moved-to-github.git diff --git a/index/extract.c b/index/extract.c index a9885fb..aa69550 100644 --- a/index/extract.c +++ b/index/extract.c @@ -4,7 +4,31 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: extract.c,v $ - * Revision 1.67 1996-11-15 15:02:14 adam + * Revision 1.73 1997-09-04 13:57:20 adam + * New file extract/retrieve method tellf (added). + * Added O_BINARY for open calls. + * + * Revision 1.72 1997/07/15 16:32:29 adam + * Bug fix: Match handler didn't terminate the resulting string! + * + * Revision 1.71 1997/07/15 16:28:41 adam + * Bug fix: storeData didn't work with files with multiple records. + * Bug fix: fixed memory management with records; not really well + * thought through. + * + * Revision 1.70 1997/07/01 13:00:42 adam + * Bug fix in routine searchRecordKey: uninitialized variables. + * + * Revision 1.69 1997/04/29 09:26:03 adam + * Bug fix: generic recordId handling didn't work for compressed internal + * keys. + * + * Revision 1.68 1997/02/12 20:39:45 adam + * Implemented options -f that limits the log to the first + * 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 @@ -647,34 +671,42 @@ static const char **searchRecordKey (struct recKeys *reckeys, int off = 0; int startSeq = -1; int i; + short attrUse; + char attrSet; + int seqno = 0; for (i = 0; i<32; i++) ws[i] = NULL; while (off < reckeys->buf_used) { - const char *src = reckeys->buf + off; - char attrSet; - short attrUse; - int seqno; - const char *wstart; - - memcpy (&attrSet, src, sizeof(attrSet)); - src += sizeof(attrSet); - memcpy (&attrUse, src, sizeof(attrUse)); - src += sizeof(attrUse); + const char *src = reckeys->buf + off; + const char *wstart; + 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); + } wstart = src; while (*src++) ; - - memcpy (&seqno, src, sizeof(seqno)); - src += sizeof(seqno); - -#if 0 - logf (LOG_LOG, "(%d,%d) %d %s", attrSet, attrUse, seqno, wstart); -#endif + if (lead & 60) + seqno += ((lead>>2) & 15)-1; + else + { + memcpy (&seqno, src, sizeof(seqno)); + src += sizeof(seqno); + } if (attrUseS == attrUse && attrSetS == attrSet) { int woff; @@ -724,6 +756,12 @@ static off_t file_seek (void *handle, off_t offset) return lseek (p->fd, offset, SEEK_SET); } +static off_t file_tell (void *handle) +{ + struct file_read_info *p = handle; + return p->file_offset; +} + static int file_read (void *handle, char *buf, size_t count) { struct file_read_info *p = handle; @@ -898,12 +936,13 @@ static char *fileMatchStr (struct recKeys *reckeys, struct recordGroup *rGroup, fname, rGroup->groupName ? rGroup->groupName : "none"); return NULL; } + *dst = '\0'; return dstBuf; } struct recordLogInfo { const char *fname; - char *op; + int recordOffset; struct recordGroup *rGroup; }; @@ -914,9 +953,8 @@ static void recordLogPreamble (int level, const char *msg, void *info) 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); } @@ -933,11 +971,6 @@ static int recordExtract (SYSNO *sysno, const char *fname, 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 */ @@ -955,29 +988,41 @@ static int recordExtract (SYSNO *sysno, const char *fname, extractCtrl.offset = recordOffset; extractCtrl.readf = file_read; extractCtrl.seekf = file_seek; + extractCtrl.tellf = file_tell; 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 ... */ - if (!rGroup->flagShowRecords) - 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 */ - if (!rGroup->flagShowRecords) - { - logf (LOG_WARN, "No keys generated for file %s", fname); - logf (LOG_WARN, " The file is probably empty"); - } + 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; } } @@ -1017,8 +1062,7 @@ static int recordExtract (SYSNO *sysno, const char *fname, logf (LOG_LOG, "Cannot delete new record"); return 1; } - logInfo.op = "add"; - if (rGroup->fileVerboseFlag) + if (records_processed < rGroup->fileVerboseLimit) logf (LOG_LOG, "add %s %s %ld", rGroup->recordType, fname, (long) recordOffset); rec = rec_new (records); @@ -1045,14 +1089,15 @@ static int recordExtract (SYSNO *sysno, const char *fname, 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++; @@ -1066,14 +1111,15 @@ static int recordExtract (SYSNO *sysno, const char *fname, 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); @@ -1117,16 +1163,18 @@ static int recordExtract (SYSNO *sysno, const char *fname, xfree (rec->info[recInfo_storeData]); if (rGroup->flagStoreData == 1) { - rec->size[recInfo_storeData] = fi->file_max; - rec->info[recInfo_storeData] = xmalloc (fi->file_max); + int size = fi->file_moffset - recordOffset; + if (!size) + size = fi->file_max - recordOffset; + rec->size[recInfo_storeData] = size; + rec->info[recInfo_storeData] = xmalloc (size); 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) + if (read (fi->fd, rec->info[recInfo_storeData], size) < size) { logf (LOG_ERRNO|LOG_FATAL, "read %d bytes of %s", fi->file_max, fname); @@ -1199,7 +1247,7 @@ int fileExtract (SYSNO *sysno, const char *fname, 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; } @@ -1207,7 +1255,7 @@ int fileExtract (SYSNO *sysno, const char *fname, } if (!rGroup->recordType) { - if (rGroup->fileVerboseFlag) + if (records_processed < rGroup->fileVerboseLimit) logf (LOG_LOG, "? record %s", fname); return 0; } @@ -1272,7 +1320,7 @@ int fileExtract (SYSNO *sysno, const char *fname, fd = -1; else { - if ((fd = open (fname, O_RDONLY)) == -1) + if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1) { logf (LOG_WARN|LOG_ERRNO, "open %s", fname); return 0; @@ -1285,7 +1333,6 @@ int fileExtract (SYSNO *sysno, const char *fname, 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);