X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=89461379828fa638fc7701752d444dd9f05ac8d0;hp=6e88907730f754e7cbcc88d5a8c60420474a4354;hb=f84db68d03155813df0aa498f2962fbf8e609d46;hpb=d9ee01635f03f9095a66f71b73580560d48798e8 diff --git a/ztest/ztest.c b/ztest/ztest.c index 6e88907..8946137 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -1,13 +1,62 @@ /* - * Copyright (c) 1995-1999, Index Data. + * Copyright (c) 1995-2001, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss * * NT Service interface by * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.27 1999-11-30 13:47:12 adam + * Revision 1.43 2001-06-28 09:27:25 adam + * Number of Extended Services Requests logged. + * + * Revision 1.42 2001/04/06 12:26:46 adam + * Optional CCL module. Moved atoi_n to marcdisp.h from yaz-util.h. + * + * Revision 1.41 2001/04/05 13:08:48 adam + * New configure options: --enable-module. + * + * Revision 1.40 2001/03/25 21:55:13 adam + * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. + * + * Revision 1.39 2001/03/12 14:40:57 adam + * Minor change of print of item update info. + * + * Revision 1.38 2001/02/21 13:46:54 adam + * C++ fixes. + * + * 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 @@ -98,11 +147,14 @@ #include #include #include -#include #include #include +#if YAZ_MODULE_ill +#include +#endif + Z_GenericRecord *read_grs1(FILE *f, ODR o); int ztest_search (void *handle, bend_search_rr *rr); @@ -111,22 +163,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; @@ -140,11 +176,19 @@ 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); + int *counter = handle; /* user-defined handle - created in bend_init */ + + 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"); @@ -185,6 +229,91 @@ 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); } +#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, "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, + (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); + + 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_APDU (rr->print, &ill_apdu, 0, + "ILL APDU"); + odr_reset (rr->print); + } + } + } + } + if (item_req) + { + yaz_log (LOG_LOG, "ILL protocol version = %d", + *item_req->protocol_version_num); + } + } +#endif } break; } @@ -208,7 +337,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"); @@ -234,6 +363,60 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) if (!strcmp(toKeep->databaseName, "accept")) rr->errcode = -1; } + if (toKeep) + { + Z_External *ext = odr_malloc (rr->stream, sizeof(*ext)); + Z_IUOriginPartToKeep *keep = + odr_malloc (rr->stream, sizeof(*keep)); + Z_IUTargetPart *targetPart = + odr_malloc (rr->stream, sizeof(*targetPart)); + rr->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 = + odr_strdup (rr->stream, "123"); + rr->taskPackage->targetReference->len = + rr->taskPackage->targetReference->size = + strlen(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 = 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 = odr_nullval(); + targetPart->num_taskPackageRecords = 0; + targetPart->taskPackageRecords = odr_nullval(); + } if (notToKeep) { int i; @@ -293,12 +476,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) { @@ -345,7 +522,7 @@ char *marc_read(FILE *inf, ODR odr) static char *dummy_database_record (int num, ODR odr) { FILE *inf = fopen ("dummy-records", "r"); - char *buf; + char *buf = 0; if (!inf) return NULL; @@ -354,7 +531,6 @@ static char *dummy_database_record (int num, ODR odr) if (num == 98) { buf = (char*) odr_malloc(odr, 2101); - assert(buf); memset(buf, 'A', 2100); buf[2100] = '\0'; break; @@ -389,67 +565,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"); @@ -457,18 +640,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'; @@ -477,59 +665,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); }