X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=8a16997ad04cff9a5866501bc6dc5251ab87bc33;hb=4e0710badb00d3957d110ce661cec2f32148b2d0;hp=ee1b4a2d21fbc94f0f041798a75622956b363d63;hpb=e50b06029483660fdcd60cb7f723baadfda34a0a;p=yaz-moved-to-github.git diff --git a/ztest/ztest.c b/ztest/ztest.c index ee1b4a2..8a16997 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -7,7 +7,17 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.6 1998-01-29 13:16:02 adam + * Revision 1.9 1998-03-31 11:07:45 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.8 1998/02/11 11:53:36 adam + * Changed code so that it compiles as C++. + * + * Revision 1.7 1998/02/10 11:03:57 adam + * Added support for extended handlers in backend server interface. + * + * Revision 1.6 1998/01/29 13:16:02 adam * Added dummy sort in test server. * * Revision 1.5 1997/11/07 13:31:58 adam @@ -39,38 +49,59 @@ #include #include #include +#include Z_GenericRecord *read_grs1(FILE *f, ODR o); -int bend_sort (void *handle, bend_sortrequest *req, bend_sortresult *res) -{ - res->errcode = 1; - res->errstring = "Sort not implemented"; - res->sort_status = Z_SortStatus_failure; - return 0; -} +int ztest_search (void *handle, bend_search_rr *rr); +int ztest_sort (void *handle, bend_sort_rr *rr); +int ztest_present (void *handle, bend_present_rr *rr); +int ztest_esrequest (void *handle, bend_esrequest_rr *rr); bend_initresult *bend_init(bend_initrequest *q) { - bend_initresult *r = odr_malloc (q->stream, sizeof(*r)); + bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r)); static char *dummy = "Hej fister"; r->errcode = 0; r->errstring = 0; r->handle = dummy; - q->bend_sort = bend_sort; /* register sort handler */ + q->bend_sort = ztest_sort; /* register sort handler */ + q->bend_search = ztest_search; /* register search handler */ + q->bend_present = ztest_present; /* register present handle */ + q->bend_esrequest = ztest_esrequest; return r; } -bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd) +int ztest_search (void *handle, bend_search_rr *rr) { - bend_searchresult *r = odr_malloc (q->stream, sizeof(*r)); + rr->hits = rand() % 22; + return 0; +} - r->errcode = 0; - r->errstring = 0; - r->hits = rand() % 22; +int ztest_present (void *handle, bend_present_rr *rr) +{ + return 0; +} - return r; +int ztest_esrequest (void *handle, bend_esrequest_rr *rr) +{ + rr->errcode = 0; + return 0; +} + +/* Obsolete bend_search, never called because handler is registered */ +bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd) +{ + return 0; +} + +/* Our sort handler really doesn't sort... */ +int ztest_sort (void *handle, bend_sort_rr *rr) +{ + rr->errcode = 0; + rr->sort_status = Z_SortStatus_success; + return 0; } static int atoin (const char *buf, int n) @@ -96,7 +127,7 @@ char *marc_read(FILE *inf) size = atoin (length_str, 5); if (size <= 6) return NULL; - if (!(buf = xmalloc (size+1))) + if (!(buf = (char*) xmalloc (size+1))) return NULL; if (fread (buf+5, 1, size-5, inf) != (size-5)) { @@ -121,7 +152,7 @@ static char *dummy_database_record (int num) xfree(buf); if (num == 98) { - assert(buf = xmalloc(2101)); + assert(buf = (char*) xmalloc(2101)); memset(buf, 'A', 2100); buf[2100] = '\0'; break; @@ -158,7 +189,8 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o) bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) { - bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r)); + bend_fetchresult *r = (bend_fetchresult *) + odr_malloc (q->stream, sizeof(*r)); static char *bbb = 0; r->errstring = 0; @@ -175,7 +207,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) char buf[100]; sprintf(buf, "This is dummy SUTRS record number %d\n", q->number); - assert(r->record = bbb = xmalloc(strlen(buf)+1)); + assert(r->record = bbb = (char*) xmalloc(strlen(buf)+1)); strcpy(bbb, buf); r->len = strlen(buf); } @@ -206,34 +238,12 @@ bend_deleteresult *bend_delete(void *handle, bend_deleterequest *q, int *num) return 0; } -#if 0 -bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) -{ - static struct scan_entry list[200]; - static char buf[200][200]; - static bend_scanresult r; - int i; - - r.term_position = q->term_position; - r.num_entries = q->num_entries; - r.entries = list; - for (i = 0; i < r.num_entries; i++) - { - list[i].term = buf[i]; - sprintf(list[i].term, "term-%d", i+1); - list[i].occurrences = rand() % 100000; - } - r.errcode = 0; - r.errstring = 0; - return &r; -} -#else /* * silly dummy-scan what reads words from a file. */ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) { - bend_scanresult *r = odr_malloc (q->stream, sizeof(*r)); + bend_scanresult *r = (bend_scanresult *) odr_malloc (q->stream, sizeof(*r)); static FILE *f = 0; static struct scan_entry list[200]; static char entries[200][80]; @@ -241,6 +251,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) char term[80], *p; int i, pos; + r->errcode = 0; r->errstring = 0; r->entries = list; r->status = BEND_SCAN_SUCCESS; @@ -270,7 +281,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) if (islower(*p)) *p = toupper(*p); - fseek(f, 0, 0); + fseek(f, 0, SEEK_SET); r->num_entries = 0; for (i = 0, pos = 0; fscanf(f, " %79[^:]:%d", entries[pos], &hits[pos]) == 2; i++, pos < 199 ? pos++ : (pos = 0)) @@ -307,8 +318,6 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) return r; } -#endif - void bend_close(void *handle) { return;