X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=6e88907730f754e7cbcc88d5a8c60420474a4354;hb=d953d065a4ed1abd68cec29f93e061a2b8934cd8;hp=7095ef0ad9a32c1d2966390c4813e20daf39be40;hpb=208f8e3130f2a3a4ebeac69a2097367ef8f1617e;p=yaz-moved-to-github.git diff --git a/ztest/ztest.c b/ztest/ztest.c index 7095ef0..6e88907 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * @@ -7,7 +7,28 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.20 1998-12-14 14:48:05 adam + * 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 @@ -79,9 +100,8 @@ #include #include -#include -#include -#include +#include +#include Z_GenericRecord *read_grs1(FILE *f, ODR o); @@ -120,22 +140,19 @@ int ztest_present (void *handle, bend_present_rr *rr) int ztest_esrequest (void *handle, bend_esrequest_rr *rr) { - logf(LOG_LOG, "function: %d", *rr->esr->function); + yaz_log(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); + yaz_log(LOG_LOG, "packagename: %s", rr->esr->packageName); + yaz_log(LOG_LOG, "Waitaction: %d", *rr->esr->waitAction); if (!rr->esr->taskSpecificParameters) { - logf (LOG_WARN, "No task specific parameters"); + yaz_log (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 + else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder) { Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder; + yaz_log (LOG_LOG, "Received ItemOrder"); switch (it->which) { #ifdef ASN_COMPILED @@ -151,28 +168,119 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) if (k && k->contact) { if (k->contact->name) - logf(LOG_LOG, "contact name %s", k->contact->name); + yaz_log(LOG_LOG, "contact name %s", k->contact->name); if (k->contact->phone) - logf(LOG_LOG, "contact phone %s", k->contact->phone); + yaz_log(LOG_LOG, "contact phone %s", k->contact->phone); if (k->contact->email) - logf(LOG_LOG, "contact email %s", k->contact->email); + yaz_log(LOG_LOG, "contact email %s", k->contact->email); } if (k->addlBilling) { - logf(LOG_LOG, "Billing info (not shown)"); + yaz_log(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); + yaz_log(LOG_LOG, "resultsetItem"); + yaz_log(LOG_LOG, "setId: %s", n->resultSetItem->resultSetId); + yaz_log(LOG_LOG, "item: %d", *n->resultSetItem->item); } } break; } } - rr->errcode = 0; + else if (rr->esr->taskSpecificParameters->which == Z_External_update) + { + Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update; + yaz_log (LOG_LOG, "Received DB Update"); + if (up->which == Z_IUUpdate_esRequest) + { + Z_IUUpdateEsRequest *esRequest = up->u.esRequest; + Z_IUOriginPartToKeep *toKeep = esRequest->toKeep; + Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep; + + yaz_log (LOG_LOG, "action"); + if (toKeep->action) + { + switch (*toKeep->action) + { + case Z_IUOriginPartToKeep_recordInsert: + yaz_log (LOG_LOG, " recordInsert"); + break; + case Z_IUOriginPartToKeep_recordReplace: + yaz_log (LOG_LOG, " recordUpdate"); + break; + case Z_IUOriginPartToKeep_recordDelete: + yaz_log (LOG_LOG, " recordDelete"); + break; + case Z_IUOriginPartToKeep_elementUpdate: + yaz_log (LOG_LOG, " elementUpdate"); + break; + case Z_IUOriginPartToKeep_specialUpdate: + yaz_log (LOG_LOG, " specialUpdate"); + break; + default: + yaz_log (LOG_LOG, " unknown (%d)", *toKeep->action); + } + } + if (toKeep->databaseName) + { + yaz_log (LOG_LOG, "database: %s", toKeep->databaseName); + if (!strcmp(toKeep->databaseName, "fault")) + { + rr->errcode = 109; + rr->errstring = toKeep->databaseName; + } + if (!strcmp(toKeep->databaseName, "accept")) + rr->errcode = -1; + } + if (notToKeep) + { + int i; + for (i = 0; i < notToKeep->num; i++) + { + Z_External *rec = notToKeep->elements[i]->record; + + if (rec->direct_reference) + { + struct oident *oident; + oident = oid_getentbyoid(rec->direct_reference); + if (oident) + yaz_log (LOG_LOG, "record %d type %s", i, + oident->desc); + } + switch (rec->which) + { + case Z_External_sutrs: + if (rec->u.octet_aligned->len > 170) + yaz_log (LOG_LOG, "%d bytes:\n%.168s ...", + rec->u.sutrs->len, + rec->u.sutrs->buf); + else + yaz_log (LOG_LOG, "%d bytes:\n%s", + rec->u.sutrs->len, + rec->u.sutrs->buf); + break; + case Z_External_octet : + if (rec->u.octet_aligned->len > 170) + yaz_log (LOG_LOG, "%d bytes:\n%.168s ...", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + else + yaz_log (LOG_LOG, "%d bytes\n%s", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); + } + } + } + } + } + else + { + yaz_log (LOG_WARN, "Unknown Extended Service(%d)", + rr->esr->taskSpecificParameters->which); + + } return 0; } @@ -312,8 +420,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *fd) else if ((cp = dummy_database_record(q->number, q->stream))) { r->len = strlen(cp); - r->record = (char *) odr_malloc (q->stream, 1+r->len); - strcpy (r->record, cp); + r->record = cp; r->format = VAL_USMARC; } else