X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=07bc6949c2bc1b0ba3656bc905942af30dd5cfd4;hp=52ea6661d9587ee136acb51b4461486b1871a1e9;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=9006495b0949ec4c474866cb69376653540b1aab diff --git a/ztest/ztest.c b/ztest/ztest.c index 52ea666..07bc694 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,57 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.3 1997-09-09 10:10:20 adam + * Revision 1.19 1998-10-20 15:16:22 adam + * Minor change to prevent warning. + * + * Revision 1.18 1998/10/20 15:13:45 adam + * Minor fix regarding output for Item Order. + * + * Revision 1.17 1998/10/18 22:33:35 quinn + * Added diagnostic dump of Item Order Eservice. + * + * Revision 1.16 1998/10/15 08:26:23 adam + * Added type cast to make C++ happy. + * + * Revision 1.15 1998/10/13 20:05:57 adam + * Minor change. + * + * Revision 1.14 1998/10/13 16:12:25 adam + * Added support for Surrogate Diagnostics for Scan Term entries. + * + * Revision 1.13 1998/08/19 16:10:09 adam + * Changed som member names of DeleteResultSetRequest/Response. + * + * 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. + * + * Revision 1.4 1997/09/17 12:10:43 adam + * YAZ version 1.4. + * + * Revision 1.3 1997/09/09 10:10:20 adam * Another MSV5.0 port. Changed projects to include proper * library/include paths. * Server starts server in test-mode when no options are given. @@ -29,32 +79,122 @@ #include #include #include - -/* Specifically for NT Services - Shouldn't cause problems on UNIX */ -#include "service.h" +#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) { - static bend_initresult 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; - return &r; + 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) +{ + rr->hits = rand() % 22; + return 0; +} + +int ztest_present (void *handle, bend_present_rr *rr) +{ + return 0; +} + +int ztest_esrequest (void *handle, bend_esrequest_rr *rr) +{ + logf(LOG_LOG, "function: %d", *rr->esr->function); + if (rr->esr->packageName) + logf(LOG_LOG, "packagename: %s", rr->esr->packageName); + logf(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction); + + if (!rr->esr->taskSpecificParameters) + { + logf (LOG_WARN, "No task specific parameters"); + } + else if (rr->esr->taskSpecificParameters->which != Z_External_itemOrder) + { + logf (LOG_WARN, "Not Item Order %d", rr->esr->taskSpecificParameters->which); + } + else + { + Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder; + switch (it->which) + { +#ifdef ASN_COMPILED + case Z_IOItemOrder_esRequest: +#else + case Z_ItemOrder_esRequest: +#endif + { + Z_IORequest *ir = it->u.esRequest; + Z_IOOriginPartToKeep *k = ir->toKeep; + Z_IOOriginPartNotToKeep *n = ir->notToKeep; + + if (k && k->contact) + { + if (k->contact->name) + logf(LOG_LOG, "contact name %s", k->contact->name); + if (k->contact->phone) + logf(LOG_LOG, "contact phone %s", k->contact->phone); + if (k->contact->email) + logf(LOG_LOG, "contact email %s", k->contact->email); + } + if (k->addlBilling) + { + logf(LOG_LOG, "Billing info (not shown)"); + } + + if (n->resultSetItem) + { + logf(LOG_LOG, "resultsetItem"); + logf(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId); + logf(LOG_LOG, "item: %d", *n->resultSetItem->item); + } + } + break; + } + } + rr->errcode = 0; + return 0; +} + +int ztest_delete (void *handle, bend_delete_rr *rr) { - static bend_searchresult r; + 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; +} - r.errcode = 0; - r.errstring = 0; - r.hits = rand() % 22; +/* Obsolete bend_search, never called because handler is registered */ +bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd) +{ + return 0; +} - return &r; +/* 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) @@ -80,7 +220,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)) { @@ -105,7 +245,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; @@ -140,84 +281,57 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o) return r; } -bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) +bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd) { - static bend_fetchresult r; - static char *bbb = 0; - - r.errstring = 0; - r.last_in_set = 0; - r.basename = "DUMMY"; - if (bbb) - { - xfree(bbb); - bbb = 0; - } - r.format = q->format; + bend_fetchresult *r = (bend_fetchresult *) + odr_malloc (q->stream, sizeof(*r)); + char *cp; + r->errstring = 0; + r->last_in_set = 0; + r->basename = "DUMMY"; + 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->len = strlen(buf); + r->record = (char *) odr_malloc (q->stream, r->len+1); + strcpy(r->record, buf); } else if (q->format == VAL_GRS1) { - r.len = -1; - r.record = (char*) dummy_grs_record(q->number, q->stream); - if (!r.record) + r->len = -1; + r->record = (char*) dummy_grs_record(q->number, q->stream); + if (!r->record) { - r.errcode = 13; - return &r; + r->errcode = 13; + return r; } } - else if (!(r.record = bbb = dummy_database_record(q->number))) + else if ((cp = dummy_database_record(q->number))) { - r.errcode = 13; - r.format = VAL_USMARC; - return &r; + r->len = strlen(cp); + r->record = (char *) odr_malloc (q->stream, 1+r->len); + strcpy (r->record, cp); + r->format = VAL_USMARC; } else - r.len = strlen(r.record); - 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 = 13; + return r; } - r.errcode = 0; - r.errstring = 0; - return &r; + r->errcode = 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 *bend_scan(void *handle, bend_scanrequest *q, int *fd) { - static bend_scanresult 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]; @@ -225,9 +339,10 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) char term[80], *p; int i, pos; - r.errstring = 0; - r.entries = list; - r.status = BEND_SCAN_SUCCESS; + r->errcode = 0; + r->errstring = 0; + r->entries = list; + r->status = BEND_SCAN_SUCCESS; if (!f && !(f = fopen("dummy-words", "r"))) { perror("dummy-words"); @@ -235,18 +350,18 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) } if (q->term->term->which != Z_Term_general) { - r.errcode = 229; /* unsupported term type */ - return &r; + r->errcode = 229; /* unsupported term type */ + return r; } if (q->term->term->u.general->len >= 80) { - r.errcode = 11; /* term too long */ - return &r; + r->errcode = 11; /* term too long */ + return r; } if (q->num_entries > 200) { - r.errcode = 31; - return &r; + r->errcode = 31; + return r; } memcpy(term, q->term->term->u.general->buf, q->term->term->u.general->len); term[q->term->term->u.general->len] = '\0'; @@ -254,111 +369,60 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) if (islower(*p)) *p = toupper(*p); - fseek(f, 0, 0); - r.num_entries = 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)) { - if (!r.num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */ + if (!r->num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */ { - if ((r.term_position = q->term_position) > i + 1) + if ((r->term_position = q->term_position) > i + 1) { - r.term_position = i + 1; - r.status = BEND_SCAN_PARTIAL; + r->term_position = i + 1; + r->status = BEND_SCAN_PARTIAL; } - for (; r.num_entries < r.term_position; r.num_entries++) + for (; r->num_entries < r->term_position; r->num_entries++) { int po; - po = pos - r.term_position + r.num_entries + 1; /* find pos */ + po = pos - r->term_position + r->num_entries + 1; /* find pos */ if (po < 0) po += 200; - list[r.num_entries].term = entries[po]; - list[r.num_entries].occurrences = hits[po]; + + if (!strcmp (term, "SD") && r->num_entries == 2) + { + list[r->num_entries].term = entries[pos]; + list[r->num_entries].occurrences = -1; + list[r->num_entries].errcode = 233; + list[r->num_entries].errstring = "SD for Scan Term"; + } + else + { + list[r->num_entries].term = entries[po]; + list[r->num_entries].occurrences = hits[po]; + } } } - else if (r.num_entries) + else if (r->num_entries) { - list[r.num_entries].term = entries[pos]; - list[r.num_entries].occurrences = hits[pos]; - r.num_entries++; + list[r->num_entries].term = entries[pos]; + list[r->num_entries].occurrences = hits[pos]; + r->num_entries++; } - if (r.num_entries >= q->num_entries) + if (r->num_entries >= q->num_entries) break; } if (feof(f)) - r.status = BEND_SCAN_PARTIAL; - return &r; + r->status = BEND_SCAN_PARTIAL; + return r; } -#endif - void bend_close(void *handle) { return; } -typedef struct _Args -{ - char **argv; - int argc; -} Args; - -static Args ArgDetails; - -/* name of the executable */ -#define SZAPPNAME "server" - -/* internal name of the service */ -#define SZSERVICENAME "Z3950 Test Server" - -/* displayed name of the service */ -#define SZSERVICEDISPLAYNAME "Z3950 Test Server" - -/* list of service dependencies - "dep1\0dep2\0\0" */ -#define SZDEPENDENCIES "" - int main(int argc, char **argv) { - /* Lets setup the Arg structure */ - ArgDetails.argc = argc; - ArgDetails.argv = argv; - -#ifdef WIN32 - - /* Now setup the service with the service controller */ - SetupService(argc, argv, &ArgDetails, SZAPPNAME, SZSERVICENAME, SZSERVICEDISPLAYNAME, SZDEPENDENCIES); - -#else /* WIN32 */ - - /* The service controller does the following for us under windows */ - if (StartAppService(NULL, argc, argv)) - RunAppService(&ArgDetails); - - /* Ensure the service has been stopped */ - StopAppService(NULL); - -#endif /* WIN32 */ - - return(0); -} - -int StartAppService(void *pHandle, int argc, char **argv) -{ - /* Initializes the App */ - return 1; -} - -void RunAppService(void *pHandle) -{ - Args *pArgs = (Args *)pHandle; - - /* Starts the app running */ - statserv_main(pArgs->argc, pArgs->argv); -} - -void StopAppService(void *pHandle) -{ - /* Stops the app */ - statserv_closedown(); + return statserv_main(argc, argv); }