X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fextract.c;h=d9c619b1dddb8fe17356acf9af09aba49eced725;hb=21e03c79e86bc7f7edcd0469d40186fabd9a15f4;hp=95ee86f0fad74a490aafce06a5ab3024a6c5759e;hpb=abad0a32ee7fbde0cad3bb4aa6b562d28d849d3b;p=idzebra-moved-to-github.git diff --git a/index/extract.c b/index/extract.c index 95ee86f..d9c619b 100644 --- a/index/extract.c +++ b/index/extract.c @@ -1,10 +1,26 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: extract.c,v $ - * Revision 1.86 1998-10-13 20:33:53 adam + * Revision 1.91 1999-02-12 13:29:22 adam + * Implemented position-flag for registers. + * + * Revision 1.90 1999/02/02 14:50:52 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.89 1998/10/28 10:54:38 adam + * SDRKit integration. + * + * Revision 1.88 1998/10/16 08:14:29 adam + * Updated record control system. + * + * Revision 1.87 1998/10/15 13:10:33 adam + * Fixed bug in Zebra that caused it to stop indexing when empty + * record was read. + * + * Revision 1.86 1998/10/13 20:33:53 adam * Fixed one log message and change use ordinal to be an unsigned char. * * Revision 1.85 1998/09/22 10:03:41 adam @@ -316,7 +332,7 @@ */ #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -330,6 +346,14 @@ #include "zinfo.h" +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif + +#if ZEBRASDR +#include "zebrasdr.h" +#endif + static Dict matchDict; static Records records = NULL; @@ -405,6 +429,7 @@ int key_open (struct recordGroup *rGroup, int mem) struct encode_info { int sysno; int seqno; + int cmd; char buf[768]; }; @@ -412,6 +437,7 @@ void encode_key_init (struct encode_info *i) { i->sysno = 0; i->seqno = 0; + i->cmd = -1; } char *encode_key_int (int d, char *bp) @@ -453,8 +479,11 @@ void encode_key_write (char *k, struct encode_info *i, FILE *outf) i->sysno = key.sysno; i->seqno = 0; } + else if (!i->seqno && !key.seqno && i->cmd == *k) + return; bp = encode_key_int (key.seqno - i->seqno, bp); i->seqno = key.seqno; + i->cmd = *k; if (fwrite (i->buf, bp - i->buf, 1, outf) != 1) { logf (LOG_FATAL|LOG_ERRNO, "fwrite"); @@ -675,7 +704,8 @@ static void addIndexString (RecWord *p, const char *string, int length) dst += sizeof(*pseqno); } reckeys.buf_used = dst - reckeys.buf; - (*pseqno)++; + if (*pseqno) + (*pseqno)++; } static void addSortString (RecWord *p, const char *string, int length) @@ -943,11 +973,13 @@ static const char **searchRecordKey (struct recKeys *reckeys, } struct file_read_info { - off_t file_max; - off_t file_offset; - off_t file_moffset; + off_t file_max; /* maximum offset so far */ + off_t file_offset; /* current offset */ + off_t file_moffset; /* offset of rec/rec boundary */ int file_more; int fd; + char *sdrbuf; + int sdrmax; }; static struct file_read_info *file_read_start (int fd) @@ -957,6 +989,8 @@ static struct file_read_info *file_read_start (int fd) fi->fd = fd; fi->file_max = 0; fi->file_moffset = 0; + fi->sdrbuf = 0; + fi->sdrmax = 0; return fi; } @@ -969,6 +1003,8 @@ static off_t file_seek (void *handle, off_t offset) { struct file_read_info *p = handle; p->file_offset = offset; + if (p->sdrbuf) + return offset; return lseek (p->fd, offset, SEEK_SET); } @@ -983,7 +1019,16 @@ static int file_read (void *handle, char *buf, size_t count) struct file_read_info *p = handle; int fd = p->fd; int r; - r = read (fd, buf, count); + if (p->sdrbuf) + { + r = count; + if (r > p->sdrmax - p->file_offset) + r = p->sdrmax - p->file_offset; + if (r) + memcpy (buf, p->sdrbuf + p->file_offset, r); + } + else + r = read (fd, buf, count); if (r > 0) { p->file_offset += r; @@ -998,7 +1043,7 @@ static void file_begin (void *handle) struct file_read_info *p = handle; p->file_offset = p->file_moffset; - if (p->file_moffset) + if (!p->sdrbuf && p->file_moffset) lseek (p->fd, p->file_moffset, SEEK_SET); p->file_more = 0; } @@ -1222,7 +1267,12 @@ static int recordExtract (SYSNO *sysno, const char *fname, extractCtrl.addSchema = addSchema; extractCtrl.dh = rGroup->dh; for (i = 0; i<256; i++) - extractCtrl.seqno[i] = 0; + { + if (zebra_maps_is_positioned(rGroup->zebra_maps, i)) + extractCtrl.seqno[i] = 1; + else + extractCtrl.seqno[i] = 0; + } extractCtrl.zebra_maps = rGroup->zebra_maps; extractCtrl.flagShowRecords = !rGroup->flagRw; @@ -1257,7 +1307,7 @@ static int recordExtract (SYSNO *sysno, const char *fname, return 1; logf (LOG_WARN, "No keys generated for file %s", fname); logf (LOG_WARN, " The file is probably empty"); - return 0; + return 1; } } @@ -1511,7 +1561,8 @@ int fileExtract (SYSNO *sysno, const char *fname, } if (!*rGroup->recordType) return 0; - if (!(recType = recType_byName (rGroup->recordType, subType))) + if (!(recType = + recType_byName (rGroup->recTypes, rGroup->recordType, subType))) { logf (LOG_WARN, "No such record type: %s", rGroup->recordType); return 0; @@ -1582,6 +1633,57 @@ int fileExtract (SYSNO *sysno, const char *fname, if (rGroup->flagStoreKeys == -1) rGroup->flagStoreKeys = 0; +#if ZEBRASDR + if (1) + { + ZebraSdrHandle h; + char xname[128], *xp; + + strncpy (xname, fname, 127); + if ((xp = strchr (xname, '.'))) + *xp = '\0'; + + h = zebraSdr_open (xname); + if (!h) + { + logf (LOG_WARN, "sdr open %s", xname); + return 0; + } + for (;;) + { + unsigned char *buf; + char sdr_name[128]; + int r, segmentno; + + segmentno = zebraSdr_segment (h, 0); + sprintf (sdr_name, "%%%s.%d", xname, segmentno); + logf (LOG_LOG, "SDR: %s", sdr_name); + +#if 1 + if (segmentno > 20) + break; +#endif + r = zebraSdr_read (h, &buf); + + if (!r) + break; + + fi = file_read_start (0); + fi->sdrbuf = buf; + fi->sdrmax = r; + do + { + file_begin (fi); + r = recordExtract (sysno, sdr_name, rGroup, deleteFlag, fi, + recType, subType); + } while (r && !sysno && fi->file_more); + file_read_stop (fi); + free (buf); + } + zebraSdr_close (h); + return 1; + } +#endif if (sysno && deleteFlag) fd = -1; else