X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=6bcf04d67112c2074050ae8306c74d13c92c0fc1;hp=6b21057cb250fcce5cb147adab235103ccd28086;hb=3060b77b776350c6e677c06b3070542dba5c42b6;hpb=55c6ac70550af857d80ef233147dbc986e4095e1 diff --git a/ztest/ztest.c b/ztest/ztest.c index 6b21057..6bcf04d 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1997, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * @@ -7,7 +7,29 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.5 1997-11-07 13:31:58 adam + * Revision 1.12 1998-07-20 12:38:44 adam + * Implemented delete result set service to server API. + * + * Revision 1.11 1998/06/09 13:55:08 adam + * Minor changes. + * + * Revision 1.10 1998/05/27 16:55:54 adam + * Minor changes. + * + * 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 * Added NT Service name part of statserv_options_block. Moved NT * service utility to server library. * @@ -36,29 +58,70 @@ #include #include #include +#include Z_GenericRecord *read_grs1(FILE *f, ODR o); +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); +int ztest_delete (void *handle, bend_delete_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 = 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; + q->bend_delete = ztest_delete; 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; +} + +int ztest_delete (void *handle, bend_delete_rr *rr) +{ + if (rr->num_setnames == 1 && !strcmp (rr->setnames[0], "1")) + rr->delete_status = Z_DeleteStatus_success; + else + rr->delete_status = Z_DeleteStatus_resultSetDidNotExist; + 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) @@ -84,7 +147,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)) { @@ -109,7 +172,8 @@ static char *dummy_database_record (int num) xfree(buf); if (num == 98) { - assert(buf = xmalloc(2101)); + buf = (char*) xmalloc(2101); + assert(buf); memset(buf, 'A', 2100); buf[2100] = '\0'; break; @@ -146,26 +210,21 @@ 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)); - static char *bbb = 0; - + bend_fetchresult *r = (bend_fetchresult *) + odr_malloc (q->stream, sizeof(*r)); + char *cp; r->errstring = 0; r->last_in_set = 0; r->basename = "DUMMY"; - if (bbb) - { - xfree(bbb); - bbb = 0; - } r->format = q->format; if (q->format == VAL_SUTRS) { char buf[100]; sprintf(buf, "This is dummy SUTRS record number %d\n", q->number); - assert(r->record = bbb = xmalloc(strlen(buf)+1)); - strcpy(bbb, buf); r->len = strlen(buf); + r->record = odr_malloc (q->stream, r->len+1); + strcpy(r->record, buf); } else if (q->format == VAL_GRS1) { @@ -177,51 +236,28 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) return r; } } - else if (!(r->record = bbb = dummy_database_record(q->number))) + else if ((cp = dummy_database_record(q->number))) { - r->errcode = 13; + r->len = strlen(cp); + r->record = (char *) odr_malloc (q->stream, 1+r->len); + strcpy (r->record, cp); r->format = VAL_USMARC; - return r; } else - r->len = strlen(r->record); + { + r->errcode = 13; + return r; + } r->errcode = 0; return r; } -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]; @@ -229,6 +265,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; @@ -258,7 +295,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)) @@ -295,8 +332,6 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) return r; } -#endif - void bend_close(void *handle) { return;