X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=ee3d2e034303fdccc4aabb56a9876412ec202247;hb=7f0e24a73392b1288b117ee46482f58f471ea094;hp=cd6d1860b8bfef0e4d5bf8fad76f106c89ffa434;hpb=79430a0c78468168265d169c185c87379b25616b;p=yaz-moved-to-github.git diff --git a/ztest/ztest.c b/ztest/ztest.c index cd6d186..ee3d2e0 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -1,99 +1,8 @@ /* - * Copyright (c) 1995-2000, Index Data. + * Copyright (c) 1995-2001, Index Data. * See the file LICENSE for details. * - * NT Service interface by - * Chas Woodfield, Fretwell Downing Datasystems. - * - * $Log: ztest.c,v $ - * Revision 1.29 2000-01-12 14:36:07 adam - * Added printing stream (ODR) for backend functions. - * - * Revision 1.28 1999/12/16 23:36:19 adam - * Implemented ILL protocol. Minor updates ASN.1 compiler. - * - * Revision 1.27 1999/11/30 13:47:12 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.26 1999/08/27 09:40:32 adam - * Renamed logf function to yaz_log. Removed VC++ project files. - * - * Revision 1.25 1999/06/01 14:29:12 adam - * Work on Extended Services. - * - * Revision 1.24 1999/05/27 13:07:54 adam - * Fix. - * - * Revision 1.23 1999/05/27 13:02:20 adam - * Assigned OID for old DB Update (VAL_DBUPDATE0). - * - * Revision 1.22 1999/05/26 13:49:12 adam - * DB Update implemented in client (very basic). - * - * Revision 1.21 1998/12/15 12:45:42 adam - * Minor change. - * - * Revision 1.20 1998/12/14 14:48:05 adam - * Fixed memory leak - happened when fetching MARC records. - * - * 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. - * - * Revision 1.2 1997/09/04 13:50:31 adam - * Bug fix in ztest. - * + * $Id: ztest.c,v 1.46 2001-11-13 23:00:43 adam Exp $ */ /* @@ -103,12 +12,11 @@ #include #include #include -#include #include #include -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill #include #endif @@ -120,22 +28,6 @@ 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 = (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; -} - int ztest_search (void *handle, bend_search_rr *rr) { rr->hits = rand() % 22; @@ -149,11 +41,20 @@ int ztest_present (void *handle, bend_present_rr *rr) int ztest_esrequest (void *handle, bend_esrequest_rr *rr) { - yaz_log(LOG_LOG, "function: %d", *rr->esr->function); + /* user-defined handle - created in bend_init */ + int *counter = (int*) handle; + + yaz_log(LOG_LOG, "ESRequest no %d", *counter); + + (*counter)++; + if (rr->esr->packageName) yaz_log(LOG_LOG, "packagename: %s", rr->esr->packageName); yaz_log(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction); + + yaz_log(LOG_LOG, "function: %d", *rr->esr->function); + if (!rr->esr->taskSpecificParameters) { yaz_log (LOG_WARN, "No task specific parameters"); @@ -164,11 +65,7 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) yaz_log (LOG_LOG, "Received 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; @@ -194,27 +91,81 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId); yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item); } -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill if (n->itemRequest) { Z_External *r = (Z_External*) n->itemRequest; ILL_ItemRequest *item_req = 0; + ILL_APDU *ill_apdu = 0; if (r->direct_reference) { oident *ent = oid_getentbyoid(r->direct_reference); if (ent) - yaz_log(LOG_LOG, "ItemRequest %s", ent->desc); + yaz_log(LOG_LOG, "OID %s", ent->desc); + if (ent && ent->value == VAL_TEXT_XML) + { + yaz_log (LOG_LOG, "ILL XML request"); + if (r->which == Z_External_octet) + yaz_log (LOG_LOG, "%.*s", r->u.octet_aligned->len, + r->u.octet_aligned->buf); + } if (ent && ent->value == VAL_ISO_ILL_1) { + yaz_log (LOG_LOG, "Decode ItemRequest begin"); if (r->which == ODR_EXTERNAL_single) { odr_setbuf(rr->decode, - r->u.single_ASN1_type->buf, + (char *) r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len, 0); + + if (!ill_ItemRequest (rr->decode, &item_req, 0, 0)) + { + yaz_log (LOG_LOG, + "Couldn't decode ItemRequest %s near %d", + odr_errmsg(odr_geterror(rr->decode)), + odr_offset(rr->decode)); +#if 0 + yaz_log(LOG_LOG, "PDU dump:"); + odr_dumpBER(yaz_log_file(), + r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len); +#endif + } + else + yaz_log(LOG_LOG, "Decode ItemRequest OK"); + if (rr->print) + { + ill_ItemRequest (rr->print, &item_req, 0, + "ItemRequest"); + odr_reset (rr->print); + } + } + if (!item_req && r->which == ODR_EXTERNAL_single) + { + yaz_log (LOG_LOG, "Decode ILL APDU begin"); + odr_setbuf(rr->decode, + (char*) r->u.single_ASN1_type->buf, r->u.single_ASN1_type->len, 0); - ill_ItemRequest (rr->decode, &item_req, 0, 0); + if (!ill_APDU (rr->decode, &ill_apdu, 0, 0)) + { + yaz_log (LOG_LOG, + "Couldn't decode ILL APDU %s near %d", + odr_errmsg(odr_geterror(rr->decode)), + odr_offset(rr->decode)); + yaz_log(LOG_LOG, "PDU dump:"); + odr_dumpBER(yaz_log_file(), + (char *) r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len); + } + else + yaz_log(LOG_LOG, "Decode ILL APDU OK"); if (rr->print) - ill_ItemRequest (rr->print, &item_req, 0, 0); + { + ill_APDU (rr->print, &ill_apdu, 0, + "ILL APDU"); + odr_reset (rr->print); + } } } } @@ -248,7 +199,7 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) yaz_log (LOG_LOG, " recordInsert"); break; case Z_IUOriginPartToKeep_recordReplace: - yaz_log (LOG_LOG, " recordUpdate"); + yaz_log (LOG_LOG, " recordReplace"); break; case Z_IUOriginPartToKeep_recordDelete: yaz_log (LOG_LOG, " recordDelete"); @@ -274,6 +225,63 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) if (!strcmp(toKeep->databaseName, "accept")) rr->errcode = -1; } + if (toKeep) + { + Z_External *ext = (Z_External *) + odr_malloc (rr->stream, sizeof(*ext)); + Z_IUOriginPartToKeep *keep = (Z_IUOriginPartToKeep *) + odr_malloc (rr->stream, sizeof(*keep)); + Z_IUTargetPart *targetPart = (Z_IUTargetPart *) + odr_malloc (rr->stream, sizeof(*targetPart)); + rr->taskPackage = (Z_TaskPackage *) + odr_malloc (rr->stream, sizeof(*rr->taskPackage)); + rr->taskPackage->packageType = + odr_oiddup (rr->stream, rr->esr->packageType); + rr->taskPackage->packageName = 0; + rr->taskPackage->userId = 0; + rr->taskPackage->retentionTime = 0; + rr->taskPackage->permissions = 0; + rr->taskPackage->description = 0; + rr->taskPackage->targetReference = (Odr_oct *) + odr_malloc (rr->stream, sizeof(Odr_oct)); + rr->taskPackage->targetReference->buf = + (unsigned char *) odr_strdup (rr->stream, "123"); + rr->taskPackage->targetReference->len = + rr->taskPackage->targetReference->size = + strlen((char *) (rr->taskPackage->targetReference->buf)); + rr->taskPackage->creationDateTime = 0; + rr->taskPackage->taskStatus = odr_intdup(rr->stream, 0); + rr->taskPackage->packageDiagnostics = 0; + rr->taskPackage->taskSpecificParameters = ext; + + ext->direct_reference = + odr_oiddup (rr->stream, rr->esr->packageType); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_update; + ext->u.update = (Z_IUUpdate *) + odr_malloc (rr->stream, sizeof(*ext->u.update)); + ext->u.update->which = Z_IUUpdate_taskPackage; + ext->u.update->u.taskPackage = (Z_IUUpdateTaskPackage *) + odr_malloc (rr->stream, sizeof(Z_IUUpdateTaskPackage)); + ext->u.update->u.taskPackage->originPart = keep; + ext->u.update->u.taskPackage->targetPart = targetPart; + + keep->action = (int *) odr_malloc (rr->stream, sizeof(int)); + *keep->action = *toKeep->action; + keep->databaseName = + odr_strdup (rr->stream, toKeep->databaseName); + keep->schema = 0; + keep->elementSetName = 0; + keep->actionQualifier = 0; + + targetPart->updateStatus = odr_intdup (rr->stream, 1); + targetPart->num_globalDiagnostics = 0; + targetPart->globalDiagnostics = (Z_DiagRec **) odr_nullval(); + targetPart->num_taskPackageRecords = 0; + targetPart->taskPackageRecords = + (Z_IUTaskPackageRecordStructure **) odr_nullval(); + } if (notToKeep) { int i; @@ -333,12 +341,6 @@ int ztest_delete (void *handle, bend_delete_rr *rr) 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) { @@ -389,24 +391,23 @@ static char *dummy_database_record (int num, ODR odr) if (!inf) return NULL; - while (--num >= 0) + if (num == 98) + { /* this will generate a very bad MARC record (testing only) */ + buf = (char*) odr_malloc(odr, 2101); + memset(buf, '7', 2100); + buf[2100] = '\0'; + } + else { - if (num == 98) - { - buf = (char*) odr_malloc(odr, 2101); - assert(buf); - memset(buf, 'A', 2100); - buf[2100] = '\0'; - break; - } - else - buf = marc_read (inf, odr); - if (!num || !buf) - break; + /* OK, try to get proper MARC records from the file */ + while (--num >= 0) + { + buf = marc_read (inf, odr); + if (!buf) + break; + } } fclose(inf); - if (num < 0) - return 0; return buf; } @@ -429,67 +430,74 @@ static Z_GenericRecord *dummy_grs_record (int num, ODR o) return r; } -bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd) +int ztest_fetch(void *handle, bend_fetch_rr *r) { - 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) + r->output_format = r->request_format; + if (r->request_format == VAL_SUTRS) { +#if 0 +/* this section returns a huge record (for testing non-blocking write, etc) */ + r->len = 980000; + r->record = odr_malloc (r->stream, r->len); + memset (r->record, 'x', r->len); +#else +/* this section returns a small record */ char buf[100]; - sprintf(buf, "This is dummy SUTRS record number %d\n", q->number); + sprintf(buf, "This is dummy SUTRS record number %d\n", r->number); + r->len = strlen(buf); - r->record = (char *) odr_malloc (q->stream, r->len+1); + r->record = (char *) odr_malloc (r->stream, r->len+1); strcpy(r->record, buf); +#endif } - else if (q->format == VAL_GRS1) + else if (r->request_format == VAL_GRS1) { r->len = -1; - r->record = (char*) dummy_grs_record(q->number, q->stream); + r->record = (char*) dummy_grs_record(r->number, r->stream); if (!r->record) { r->errcode = 13; - return r; + return 0; } } - else if ((cp = dummy_database_record(q->number, q->stream))) + else if ((cp = dummy_database_record(r->number, r->stream))) { r->len = strlen(cp); r->record = cp; - r->format = VAL_USMARC; + r->output_format = VAL_USMARC; } else { r->errcode = 13; - return r; + return 0; } r->errcode = 0; - return r; + return 0; } /* * silly dummy-scan what reads words from a file. */ -bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd) +int ztest_scan(void *handle, bend_scan_rr *q) { - 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]; int hits[200]; char term[80], *p; int i, pos; + int term_position_req = q->term_position; + int num_entries_req = q->num_entries; - r->errcode = 0; - r->errstring = 0; - r->entries = list; - r->status = BEND_SCAN_SUCCESS; + q->errcode = 0; + q->errstring = 0; + q->entries = list; + q->status = BEND_SCAN_SUCCESS; if (!f && !(f = fopen("dummy-words", "r"))) { perror("dummy-words"); @@ -497,18 +505,23 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd) } if (q->term->term->which != Z_Term_general) { - r->errcode = 229; /* unsupported term type */ - return r; + q->errcode = 229; /* unsupported term type */ + return 0; + } + if (*q->step_size != 0) + { + q->errcode = 205; /*Only zero step size supported for Scan */ + return 0; } if (q->term->term->u.general->len >= 80) { - r->errcode = 11; /* term too long */ - return r; + q->errcode = 11; /* term too long */ + return 0; } if (q->num_entries > 200) { - r->errcode = 31; - return r; + q->errcode = 31; + return 0; } memcpy(term, q->term->term->u.general->buf, q->term->term->u.general->len); term[q->term->term->u.general->len] = '\0'; @@ -517,59 +530,80 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *fd) *p = toupper(*p); fseek(f, 0, SEEK_SET); - r->num_entries = 0; + q->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 (!q->num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */ { - if ((r->term_position = q->term_position) > i + 1) + if ((q->term_position = term_position_req) > i + 1) { - r->term_position = i + 1; - r->status = BEND_SCAN_PARTIAL; + q->term_position = i + 1; + q->status = BEND_SCAN_PARTIAL; } - for (; r->num_entries < r->term_position; r->num_entries++) + for (; q->num_entries < q->term_position; q->num_entries++) { int po; - po = pos - r->term_position + r->num_entries + 1; /* find pos */ + po = pos - q->term_position + q->num_entries+1; /* find pos */ if (po < 0) po += 200; - if (!strcmp (term, "SD") && r->num_entries == 2) + if (!strcmp (term, "SD") && q->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"; + list[q->num_entries].term = entries[pos]; + list[q->num_entries].occurrences = -1; + list[q->num_entries].errcode = 233; + list[q->num_entries].errstring = "SD for Scan Term"; } else { - list[r->num_entries].term = entries[po]; - list[r->num_entries].occurrences = hits[po]; + list[q->num_entries].term = entries[po]; + list[q->num_entries].occurrences = hits[po]; } } } - else if (r->num_entries) + else if (q->num_entries) { - list[r->num_entries].term = entries[pos]; - list[r->num_entries].occurrences = hits[pos]; - r->num_entries++; + list[q->num_entries].term = entries[pos]; + list[q->num_entries].occurrences = hits[pos]; + q->num_entries++; } - if (r->num_entries >= q->num_entries) + if (q->num_entries >= num_entries_req) break; } if (feof(f)) - r->status = BEND_SCAN_PARTIAL; + q->status = BEND_SCAN_PARTIAL; + return 0; +} + +bend_initresult *bend_init(bend_initrequest *q) +{ + bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r)); + int *counter = (int *) xmalloc (sizeof(int)); + + *counter = 0; + r->errcode = 0; + r->errstring = 0; + r->handle = counter; /* user handle, in this case a simple int */ + 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; + q->bend_fetch = ztest_fetch; + q->bend_scan = ztest_scan; return r; } void bend_close(void *handle) { + xfree (handle); /* release our user-defined handle */ return; } int main(int argc, char **argv) { - return statserv_main(argc, argv); + return statserv_main(argc, argv, bend_init, bend_close); }