X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=c3ea6b49be3b8e83f29e89efbdf590547629b854;hb=99e4ce02beb2ea748b9970ef35fe8834f04a1528;hp=88a90a4bde360f45cb9f0b5a592ba4f2d98844d6;hpb=ed3944df3f241654030ef0d391c85b3e6f6e7230;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 88a90a4..c3ea6b4 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,11 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.35 1996-03-26 16:01:14 adam + * Revision 1.36 1996-05-01 13:46:37 adam + * First work on multiple records in one file. + * New option, -offset, to the "unread" command in the filter module. + * + * Revision 1.35 1996/03/26 16:01:14 adam * New setting lockPath: directory of various lock files. * * Revision 1.34 1996/03/20 09:36:46 adam @@ -270,15 +274,27 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) return &r; } +static int record_offset; + static int record_ext_read (void *fh, char *buf, size_t count) { return read (*((int*) fh), buf, count); } +static off_t record_ext_seek (void *fh, off_t offset) +{ + return lseek (*((int*) fh), offset + record_offset, SEEK_SET); +} + static int record_int_pos; static char *record_int_buf; static int record_int_len; +static off_t record_int_seek (void *fh, off_t offset) +{ + return (off_t) (record_int_pos = offset); +} + static int record_int_read (void *fh, char *buf, size_t count) { int l = record_int_len - record_int_pos; @@ -325,6 +341,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, if (rec->size[recInfo_storeData] > 0) { retrieveCtrl.readf = record_int_read; + retrieveCtrl.seekf = record_int_seek; record_int_len = rec->size[recInfo_storeData]; record_int_buf = rec->info[recInfo_storeData]; record_int_pos = 0; @@ -342,8 +359,15 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, rec_rm (&rec); return 0; /* or 14: System error in presenting records */ } + + memcpy (&record_offset, rec->info[recInfo_offset], + sizeof(record_offset)); + retrieveCtrl.fh = &fd; retrieveCtrl.readf = record_ext_read; + retrieveCtrl.seekf = record_ext_seek; + + record_ext_seek (retrieveCtrl.fh, 0); } retrieveCtrl.subType = subType; retrieveCtrl.localno = sysno;