X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=e9fc32053c1acd669be2b50bd3e980f3e10a52ec;hb=de4ada45ce039553f8322e620cc047d8cf4a065e;hp=7bc66ae48be77ad9e6fb35e1dccebd14890726fa;hpb=45554249f7785e31125a062dc410a93ef693f574;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 7bc66ae..e9fc320 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,30 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.41 1996-10-29 14:09:56 adam + * Revision 1.47 1997-09-04 13:58:36 adam + * New retrieve/extract method tellf (added). + * Added O_BINARY for open calls. + * + * Revision 1.46 1997/07/28 08:30:47 adam + * Server returns diagnostic 14 when record doesn't exist. + * + * Revision 1.45 1996/12/23 15:30:45 adam + * Work on truncation. + * Bug fix: result sets weren't deleted after server shut down. + * + * Revision 1.44 1996/12/11 12:08:01 adam + * Added better compression. + * + * Revision 1.43 1996/11/15 15:03:58 adam + * Logging of execution speed by using the times(2) call. + * + * Revision 1.42 1996/11/08 11:10:36 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.41 1996/10/29 14:09:56 adam * Use of cisam system - enabled if setting isamc is 1. * * Revision 1.40 1996/06/04 10:19:02 adam @@ -158,10 +181,24 @@ #include #include #include + +#define USE_TIMES 1 +#ifdef __linux__ +#define USE_TIMES 1 +#endif + +#if USE_TIMES +#include +#endif #include "zserver.h" ZServerInfo server_info; +#if USE_TIMES +static struct tms tms1; +static struct tms tms2; +#endif + static int register_lock (ZServerInfo *zi) { time_t lastChange; @@ -176,6 +213,9 @@ static int register_lock (ZServerInfo *zi) state = 0; } zebraServerLock (state); +#if USE_TIMES + times (&tms1); +#endif if (zi->registerState == state) { if (zi->registerChange >= lastChange) @@ -227,6 +267,12 @@ static void register_unlock (ZServerInfo *zi) { static int waitSec = -1; +#if USE_TIMES + times (&tms2); + logf (LOG_LOG, "user/system: %ld/%ld", + (long) (tms2.tms_utime - tms1.tms_utime), + (long) (tms2.tms_stime - tms1.tms_stime)); +#endif if (waitSec == -1) { char *s = res_get (common_resource, "debugRequestWait"); @@ -316,6 +362,11 @@ static off_t record_ext_seek (void *fh, off_t offset) return lseek (*((int*) fh), offset + record_offset, SEEK_SET); } +static off_t record_ext_tell (void *fh) +{ + return lseek (*((int*) fh), 0, SEEK_CUR) - record_offset; +} + static int record_int_pos; static char *record_int_buf; static int record_int_len; @@ -325,6 +376,11 @@ static off_t record_int_seek (void *fh, off_t offset) return (off_t) (record_int_pos = offset); } +static off_t record_int_tell (void *fh) +{ + return (off_t) record_int_pos; +} + static int record_int_read (void *fh, char *buf, size_t count) { int l = record_int_len - record_int_pos; @@ -339,10 +395,10 @@ static int record_int_read (void *fh, char *buf, size_t count) static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, oid_value input_format, Z_RecordComposition *comp, oid_value *output_format, char **rec_bufp, - int *rec_lenp) + int *rec_lenp, char **basenamep) { Record rec; - char *fname, *file_type; + char *fname, *file_type, *basename; RecType rt; int fd = -1; struct recRetrieveCtrl retrieveCtrl; @@ -351,15 +407,14 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, rec = rec_get (zi->records, sysno); if (!rec) { - char *msg = "Record is deleted\n"; - *output_format = VAL_SUTRS; - *rec_bufp = msg; - *rec_lenp = strlen (msg); logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno); - return 0; + return 14; } file_type = rec->info[recInfo_fileType]; fname = rec->info[recInfo_filename]; + basename = rec->info[recInfo_databaseName]; + *basenamep = odr_malloc (stream, strlen(basename)+1); + strcpy (*basenamep, basename); if (!(rt = recType_byName (file_type, subType))) { @@ -372,6 +427,7 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, { retrieveCtrl.readf = record_int_read; retrieveCtrl.seekf = record_int_seek; + retrieveCtrl.tellf = record_int_tell; record_int_len = rec->size[recInfo_storeData]; record_int_buf = rec->info[recInfo_storeData]; record_int_pos = 0; @@ -379,23 +435,20 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, } else { - if ((fd = open (fname, O_RDONLY)) == -1) + if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1) { - char *msg = "Record doesn't exist\n"; - logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname); - *output_format = VAL_SUTRS; - *rec_bufp = msg; - *rec_lenp = strlen (msg); + logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s", + fname); rec_rm (&rec); - return 0; /* or 14: System error in presenting records */ + return 14; } - memcpy (&record_offset, rec->info[recInfo_offset], sizeof(record_offset)); retrieveCtrl.fh = &fd; retrieveCtrl.readf = record_ext_read; retrieveCtrl.seekf = record_ext_seek; + retrieveCtrl.tellf = record_ext_tell; record_ext_seek (retrieveCtrl.fh, 0); } @@ -450,7 +503,8 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) } r.errcode = record_fetch (&server_info, records[0].sysno, records[0].score, q->stream, q->format, - q->comp, &r.format, &r.record, &r.len); + q->comp, &r.format, &r.record, &r.len, + &r.basename); resultSetSysnoDel (&server_info, records, 1); register_unlock (&server_info); return &r; @@ -490,6 +544,7 @@ void bend_close (void *handle) { if (server_info.records) { + resultSetDestroy (&server_info); dict_close (server_info.dict); if (server_info.isam) is_close (server_info.isam);