X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=ee3d2e034303fdccc4aabb56a9876412ec202247;hb=7f0e24a73392b1288b117ee46482f58f471ea094;hp=c3df75a7f61fc74669597543b23fe7cdd5715a28;hpb=9f6bbd483ea92b4a5ae114a36bfebd942e138460;p=yaz-moved-to-github.git diff --git a/ztest/ztest.c b/ztest/ztest.c index c3df75a..ee3d2e0 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -2,124 +2,7 @@ * 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.37 2001-02-20 11:25:32 adam - * Added ill_get_APDU and ill_get_Cancel. - * - * Revision 1.36 2001/01/30 21:34:18 adam - * Added step-size for Scan backend interface. - * - * Revision 1.35 2000/11/23 10:58:33 adam - * SSL comstack support. Separate POSIX thread support library. - * - * Revision 1.34 2000/09/04 08:58:15 adam - * Added prefix yaz_ for most logging utility functions. - * - * Revision 1.33 2000/08/10 08:41:26 adam - * Fixes for ILL. - * - * Revision 1.32 2000/04/05 07:39:55 adam - * Added shared library support (libtool). - * - * Revision 1.31 2000/01/31 13:15:21 adam - * Removed uses of assert(3). Cleanup of ODR. CCL parser update so - * that some characters are not surrounded by spaces in resulting term. - * ILL-code updates. - * - * Revision 1.30 2000/01/13 23:05:50 adam - * Fixed tagging for member requester-CHECKED-IN in ILL ASN.1 spec. - * - * 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 $ */ /* @@ -133,7 +16,7 @@ #include #include -#ifdef ASN_COMPILED +#if YAZ_MODULE_ill #include #endif @@ -158,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"); @@ -173,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; @@ -203,7 +91,7 @@ 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; @@ -214,13 +102,20 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) oident *ent = oid_getentbyoid(r->direct_reference); if (ent) 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)) @@ -249,7 +144,7 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) { yaz_log (LOG_LOG, "Decode ILL APDU begin"); 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_APDU (rr->decode, &ill_apdu, 0, 0)) @@ -260,7 +155,7 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) odr_offset(rr->decode)); yaz_log(LOG_LOG, "PDU dump:"); odr_dumpBER(yaz_log_file(), - r->u.single_ASN1_type->buf, + (char *) r->u.single_ASN1_type->buf, r->u.single_ASN1_type->len); } else @@ -304,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"); @@ -330,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; @@ -439,23 +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); - 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; } @@ -629,11 +581,12 @@ int ztest_scan(void *handle, bend_scan_rr *q) bend_initresult *bend_init(bend_initrequest *q) { bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r)); - static char *dummy = "Hej fister"; + int *counter = (int *) xmalloc (sizeof(int)); + *counter = 0; r->errcode = 0; r->errstring = 0; - r->handle = dummy; + 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 */ @@ -646,6 +599,7 @@ bend_initresult *bend_init(bend_initrequest *q) void bend_close(void *handle) { + xfree (handle); /* release our user-defined handle */ return; }