X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ztest%2Fztest.c;h=052f7d2e0512ad1408f6210ee0df54de8109dfe4;hb=102fffd24eb36b4b8322b3f139166ce5f5a4b7d4;hp=614df28c1918d857d86caa4e4e3c8dbab22c2fa6;hpb=ec29e37cd269b330eb493157dedf9aacf5c6ca46;p=yaz-moved-to-github.git diff --git a/ztest/ztest.c b/ztest/ztest.c index 614df28..052f7d2 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -7,7 +7,37 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: ztest.c,v $ - * Revision 1.11 1998-06-09 13:55:08 adam + * 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 @@ -53,7 +83,6 @@ #include #include -#include #include #include @@ -63,6 +92,7 @@ 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) { @@ -76,6 +106,7 @@ bend_initresult *bend_init(bend_initrequest *q) 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; } @@ -92,10 +123,71 @@ 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); + 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) +{ + 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; +} + /* Obsolete bend_search, never called because handler is registered */ bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd) { @@ -122,7 +214,7 @@ static int atoin (const char *buf, int n) return val; } -char *marc_read(FILE *inf) +char *marc_read(FILE *inf, ODR odr) { char length_str[5]; size_t size; @@ -133,7 +225,7 @@ char *marc_read(FILE *inf) size = atoin (length_str, 5); if (size <= 6) return NULL; - if (!(buf = (char*) xmalloc (size+1))) + if (!(buf = (char*) odr_malloc (odr, size+1))) return NULL; if (fread (buf+5, 1, size-5, inf) != (size-5)) { @@ -145,27 +237,25 @@ char *marc_read(FILE *inf) return buf; } -static char *dummy_database_record (int num) +static char *dummy_database_record (int num, ODR odr) { FILE *inf = fopen ("dummy-records", "r"); - char *buf = 0; + char *buf; if (!inf) return NULL; while (--num >= 0) { - if (buf) - xfree(buf); if (num == 98) { - buf = (char*) xmalloc(2101); + buf = (char*) odr_malloc(odr, 2101); assert(buf); memset(buf, 'A', 2100); buf[2100] = '\0'; break; } else - buf = marc_read (inf); + buf = marc_read (inf, odr); if (!num || !buf) break; } @@ -194,7 +284,7 @@ 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) { bend_fetchresult *r = (bend_fetchresult *) odr_malloc (q->stream, sizeof(*r)); @@ -209,7 +299,7 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) sprintf(buf, "This is dummy SUTRS record number %d\n", q->number); r->len = strlen(buf); - r->record = odr_malloc (q->stream, r->len+1); + r->record = (char *) odr_malloc (q->stream, r->len+1); strcpy(r->record, buf); } else if (q->format == VAL_GRS1) @@ -222,11 +312,10 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) return r; } } - else if ((cp = dummy_database_record(q->number))) + 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 @@ -238,17 +327,13 @@ bend_fetchresult *bend_fetch(void *handle, bend_fetchrequest *q, int *num) return r; } -bend_deleteresult *bend_delete(void *handle, bend_deleterequest *q, int *num) -{ - return 0; -} - /* * 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) { - bend_scanresult *r = (bend_scanresult *) odr_malloc (q->stream, sizeof(*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]; @@ -305,8 +390,19 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num) 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)