X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=6d806b273d194dc076990414a1d008ec285ea85f;hp=6b0c11f736ecfd8241c76147ef37587fcf72a77c;hb=f3027244f210c7014b46dc564e868bbdf10560e2;hpb=a0c511bee52164f097c30d5e2598c0810605ff55 diff --git a/ztest/ztest.c b/ztest/ztest.c index 6b0c11f..6d806b2 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -1,13 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ -/* - * Demonstration of simple server +/** \file + * \brief yaz-ztest Generic Frontend Server */ #include +#include #include #include #if HAVE_UNISTD_H @@ -19,12 +20,29 @@ #include #include +#include "ztest.h" + static int log_level=0; static int log_level_set=0; -Z_GenericRecord *dummy_grs_record (int num, ODR o); -char *dummy_marc_record (int num, ODR odr); -char *dummy_xml_record (int num, ODR odr); +struct delay { + double d1; + double d2; +}; + +struct result_set { + char *name; + char *db; + Odr_int hits; + struct delay search_delay; + struct delay present_delay; + struct delay fetch_delay; + struct result_set *next; +}; + +struct session_handle { + struct result_set *result_sets; +}; int ztest_search(void *handle, bend_search_rr *rr); int ztest_sort(void *handle, bend_sort_rr *rr); @@ -32,16 +50,40 @@ 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); -/** \fn get_term_hit - \brief use term value as hit count +static struct result_set *get_set(struct session_handle *sh, const char *name) +{ + struct result_set *set = sh->result_sets; + for (; set; set = set->next) + if (!strcmp(name, set->name)) + return set; + return 0; +} + +static void remove_sets(struct session_handle *sh) +{ + struct result_set *set = sh->result_sets; + while (set) + { + struct result_set *set_next = set->next; + xfree(set->name); + xfree(set->db); + xfree(set); + set = set_next; + } + sh->result_sets = 0; +} + +/** \brief use term value as hit count + \param s RPN structure + \return >= 0: search term number or -1: not found Traverse RPN tree 'in order' and use term value as hit count. Only terms that looks a numeric is used.. Returns -1 if no sub tree has a hit count term */ -static int get_term_hit(Z_RPNStructure *s) +static Odr_int get_term_hit(Z_RPNStructure *s) { - int h = -1; + Odr_int h = -1; switch(s->which) { case Z_RPNStructure_simple: @@ -52,7 +94,12 @@ static int get_term_hit(Z_RPNStructure *s) { Odr_oct *oct = apt->term->u.general; if (oct->len > 0 && oct->buf[0] >= '0' && oct->buf[0] <= '9') - h = atoi_n((const char *) oct->buf, oct->len); + { + WRBUF hits_str = wrbuf_alloc(); + wrbuf_write(hits_str, (const char *) oct->buf, oct->len); + h = odr_atoi(wrbuf_cstr(hits_str)); + wrbuf_destroy(hits_str); + } } } break; @@ -65,17 +112,18 @@ static int get_term_hit(Z_RPNStructure *s) return h; } -/** \fn get_hit_count - \brief gets hit count for numeric terms in RPN queries +/** \brief gets hit count for numeric terms in RPN queries + \param q RPN Query + \return number of hits (random or number for term) This is just for testing.. A real database of course uses the content of a database to establish a value.. In our case, we have a way to trigger a certain hit count. Good for testing of client applications etc */ -static int get_hit_count(Z_Query *q) +static Odr_int get_hit_count(Z_Query *q) { - int h = -1; + Odr_int h = -1; if (q->which == Z_Query_type_1 || q->which == Z_Query_type_101) h = get_term_hit(q->u.type_1->RPNStructure); if (h == -1) @@ -83,24 +131,27 @@ static int get_hit_count(Z_Query *q) return h; } -int ztest_search(void *handle, bend_search_rr *rr) +/** \brief checks if it's a dummy Slow database + \param basename database name to check + \param association backend association (or NULL if not available) + \retval 1 is slow database + \retval 0 is not a slow database + + The Slow database is for testing.. It allows us to simulate + a slow server... +*/ +static int check_slow(const char *basename, bend_association association) { - if (rr->num_bases != 1) - { - rr->errcode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; - return 0; - } - /* Throw Database unavailable if other than Default or Slow */ - if (!yaz_matchstr (rr->basenames[0], "Default")) - ; /* Default is OK in our test */ - else if(!yaz_matchstr (rr->basenames[0], "Slow")) + if (strncmp(basename, "Slow", 4) == 0) { #if HAVE_UNISTD_H + int i, w = 3; + if (basename[4]) + sscanf(basename+4, "%d", &w); /* wait up to 3 seconds and check if connection is still alive */ - int i; - for (i = 0; i<3; i++) + for (i = 0; i < w; i++) { - if (!bend_assoc_is_alive(rr->association)) + if (association && !bend_assoc_is_alive(association)) { yaz_log(YLOG_LOG, "search aborted"); break; @@ -108,6 +159,71 @@ int ztest_search(void *handle, bend_search_rr *rr) sleep(1); } #endif + return 1; + } + return 0; +} + +static int strcmp_prefix(const char *s, const char *p) +{ + size_t l = strlen(p); + if (strlen(s) >= l && !memcmp(s, p, l)) + return 1; + return 0; +} + +static void init_delay(struct delay *delayp) +{ + delayp->d1 = delayp->d2 = 0.0; +} + +static int parse_delay(struct delay *delayp, const char *value) +{ + if (sscanf(value, "%lf:%lf", &delayp->d1, &delayp->d2) == 2) + ; + else if (sscanf(value, "%lf", &delayp->d1) == 1) + delayp->d2 = 0.0; + else + return -1; + return 0; +} + +static void do_delay(const struct delay *delayp) +{ + double d = delayp->d1; + + if (d > 0.0) + { + struct timeval tv; + if (delayp->d2 > d) + d += (rand()) * (delayp->d2 - d) / RAND_MAX; + tv.tv_sec = floor(d); + tv.tv_usec = (d - floor(d)) * 1000000; + select(0, 0, 0, 0, &tv); + } +} + +int ztest_search(void *handle, bend_search_rr *rr) +{ + struct session_handle *sh = (struct session_handle*) handle; + struct result_set *new_set; + const char *db, *db_sep; + + if (rr->num_bases != 1) + { + rr->errcode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP; + return 0; + } + + db = rr->basenames[0]; + + /* Allow Default, db.* and Slow */ + if (strcmp_prefix(db, "Default")) + ; /* Default is OK in our test */ + else if (strcmp_prefix(db, "db")) + ; /* db.* is OK in our test */ + else if (check_slow(rr->basenames[0], rr->association)) + { rr->estimated_hit_count = 1; } else @@ -117,13 +233,90 @@ int ztest_search(void *handle, bend_search_rr *rr) return 0; } + new_set = get_set(sh, rr->setname); + if (new_set) + { + if (!rr->replace_set) + { + rr->errcode = YAZ_BIB1_RESULT_SET_EXISTS_AND_REPLACE_INDICATOR_OFF; + return 0; + } + xfree(new_set->db); + } + else + { + new_set = xmalloc(sizeof(*new_set)); + new_set->next = sh->result_sets; + sh->result_sets = new_set; + new_set->name = xstrdup(rr->setname); + } + new_set->hits = 0; + new_set->db = xstrdup(db); + init_delay(&new_set->search_delay); + init_delay(&new_set->present_delay); + init_delay(&new_set->fetch_delay); + + db_sep = strchr(db, '?'); + if (db_sep) + { + char **names; + char **values; + int no_parms = yaz_uri_to_array(db_sep+1, rr->stream, &names, &values); + int i; + for (i = 0; i < no_parms; i++) + { + const char *name = names[i]; + const char *value = values[i]; + if (!strcmp(name, "seed")) + srandom(atoi(value)); + else if (!strcmp(name, "search-delay")) + parse_delay(&new_set->search_delay, value); + else if (!strcmp(name, "present-delay")) + parse_delay(&new_set->present_delay, value); + else if (!strcmp(name, "fetch-delay")) + parse_delay(&new_set->fetch_delay, value); + else + { + rr->errcode = YAZ_BIB1_SERVICE_UNSUPP_FOR_THIS_DATABASE; + rr->errstring = odr_strdup(rr->stream, name); + } + } + } + + if (rr->extra_args) + { + Z_SRW_extra_arg *a; + WRBUF response_xml = wrbuf_alloc(); + wrbuf_puts(response_xml, ""); + for (a = rr->extra_args; a; a = a->next) + { + wrbuf_puts(response_xml, "name); + wrbuf_puts(response_xml, "\""); + if (a->value) + { + wrbuf_puts(response_xml, " value=\""); + wrbuf_xmlputs(response_xml, a->value); + wrbuf_puts(response_xml, "\""); + } + wrbuf_puts(response_xml, "/>"); + } + wrbuf_puts(response_xml, ""); + rr->extra_response_data = + odr_strdup(rr->stream, wrbuf_cstr(response_xml)); + wrbuf_destroy(response_xml); + } rr->hits = get_hit_count(rr->query); + + do_delay(&new_set->search_delay); + new_set->hits = rr->hits; + return 0; } /* this huge function handles extended services */ -int ztest_esrequest (void *handle, bend_esrequest_rr *rr) +int ztest_esrequest(void *handle, bend_esrequest_rr *rr) { /* user-defined handle - created in bend_init */ int *counter = (int*) handle; @@ -134,19 +327,19 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) if (rr->esr->packageName) yaz_log(log_level, "packagename: %s", rr->esr->packageName); - yaz_log(log_level, "Waitaction: %d", *rr->esr->waitAction); + yaz_log(log_level, "Waitaction: " ODR_INT_PRINTF, *rr->esr->waitAction); - yaz_log(log_level, "function: %d", *rr->esr->function); + yaz_log(log_level, "function: " ODR_INT_PRINTF, *rr->esr->function); if (!rr->esr->taskSpecificParameters) { - yaz_log (log_level, "No task specific parameters"); + yaz_log(log_level, "No task specific parameters"); } else if (rr->esr->taskSpecificParameters->which == Z_External_itemOrder) { Z_ItemOrder *it = rr->esr->taskSpecificParameters->u.itemOrder; - yaz_log (log_level, "Received ItemOrder"); + yaz_log(log_level, "Received ItemOrder"); if (it->which == Z_IOItemOrder_esRequest) { Z_IORequest *ir = it->u.esRequest; @@ -172,7 +365,7 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) { yaz_log(log_level, "resultsetItem"); yaz_log(log_level, "setId: %s", n->resultSetItem->resultSetId); - yaz_log(log_level, "item: %d", *n->resultSetItem->item); + yaz_log(log_level, "item: " ODR_INT_PRINTF, *n->resultSetItem->item); } if (n->itemRequest) { @@ -185,102 +378,103 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) oid_class oclass; const char *oid_name = yaz_oid_to_string_buf(r->direct_reference, - &oclass, oid_name_str); + &oclass, oid_name_str); if (oid_name) yaz_log(log_level, "OID %s", oid_name); if (!oid_oidcmp(r->direct_reference, yaz_oid_recsyn_xml)) { - yaz_log (log_level, "ILL XML request"); + yaz_log(log_level, "ILL XML request"); if (r->which == Z_External_octet) - yaz_log (log_level, "%.*s", - r->u.octet_aligned->len, - r->u.octet_aligned->buf); + yaz_log(log_level, "%.*s", + r->u.octet_aligned->len, + r->u.octet_aligned->buf); xml_in_response = "x"; } if (!oid_oidcmp(r->direct_reference, yaz_oid_general_isoill_1)) { - yaz_log (log_level, "Decode ItemRequest begin"); + yaz_log(log_level, "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)) + if (!ill_ItemRequest(rr->decode, &item_req, 0, 0)) { - yaz_log (log_level, - "Couldn't decode ItemRequest %s near %ld", - odr_errmsg(odr_geterror(rr->decode)), - (long) odr_offset(rr->decode)); + yaz_log(log_level, + "Couldn't decode ItemRequest %s near %ld", + odr_errmsg(odr_geterror(rr->decode)), + (long) odr_offset(rr->decode)); } else yaz_log(log_level, "Decode ItemRequest OK"); if (rr->print) { - ill_ItemRequest (rr->print, &item_req, 0, - "ItemRequest"); - odr_reset (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_level, "Decode ILL APDU begin"); + yaz_log(log_level, "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)) + if (!ill_APDU(rr->decode, &ill_apdu, 0, 0)) { - yaz_log (log_level, - "Couldn't decode ILL APDU %s near %ld", - odr_errmsg(odr_geterror(rr->decode)), - (long) odr_offset(rr->decode)); + yaz_log(log_level, + "Couldn't decode ILL APDU %s near %ld", + odr_errmsg(odr_geterror(rr->decode)), + (long) odr_offset(rr->decode)); yaz_log(log_level, "PDU dump:"); odr_dumpBER(yaz_log_file(), - (char *) r->u.single_ASN1_type->buf, - r->u.single_ASN1_type->len); + (char *) r->u.single_ASN1_type->buf, + r->u.single_ASN1_type->len); } else yaz_log(log_level, "Decode ILL APDU OK"); if (rr->print) { - ill_APDU (rr->print, &ill_apdu, 0, - "ILL APDU"); - odr_reset (rr->print); + ill_APDU(rr->print, &ill_apdu, 0, + "ILL APDU"); + odr_reset(rr->print); } } } } if (item_req) { - yaz_log (log_level, "ILL protocol version = %d", - *item_req->protocol_version_num); + yaz_log(log_level, "ILL protocol version = " + ODR_INT_PRINTF, + *item_req->protocol_version_num); } } if (k) { Z_External *ext = (Z_External *) - odr_malloc (rr->stream, sizeof(*ext)); + odr_malloc(rr->stream, sizeof(*ext)); Z_IUOriginPartToKeep *keep = (Z_IUOriginPartToKeep *) - odr_malloc (rr->stream, sizeof(*keep)); + odr_malloc(rr->stream, sizeof(*keep)); Z_IOTargetPart *targetPart = (Z_IOTargetPart *) - odr_malloc (rr->stream, sizeof(*targetPart)); + odr_malloc(rr->stream, sizeof(*targetPart)); rr->taskPackage = (Z_TaskPackage *) - odr_malloc (rr->stream, sizeof(*rr->taskPackage)); + odr_malloc(rr->stream, sizeof(*rr->taskPackage)); rr->taskPackage->packageType = - odr_oiddup (rr->stream, rr->esr->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)); + odr_malloc(rr->stream, sizeof(Odr_oct)); rr->taskPackage->targetReference->buf = - (unsigned char *) odr_strdup (rr->stream, "911"); + (unsigned char *) odr_strdup(rr->stream, "911"); rr->taskPackage->targetReference->len = rr->taskPackage->targetReference->size = strlen((char *) (rr->taskPackage->targetReference->buf)); @@ -290,15 +484,15 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) rr->taskPackage->taskSpecificParameters = ext; ext->direct_reference = - odr_oiddup (rr->stream, rr->esr->packageType); + odr_oiddup(rr->stream, rr->esr->packageType); ext->indirect_reference = 0; ext->descriptor = 0; ext->which = Z_External_itemOrder; ext->u.itemOrder = (Z_ItemOrder *) - odr_malloc (rr->stream, sizeof(*ext->u.update)); + odr_malloc(rr->stream, sizeof(*ext->u.update)); ext->u.itemOrder->which = Z_IOItemOrder_taskPackage; ext->u.itemOrder->u.taskPackage = (Z_IOTaskPackage *) - odr_malloc (rr->stream, sizeof(Z_IOTaskPackage)); + odr_malloc(rr->stream, sizeof(Z_IOTaskPackage)); ext->u.itemOrder->u.taskPackage->originPart = k; ext->u.itemOrder->u.taskPackage->targetPart = targetPart; @@ -317,40 +511,41 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) else if (rr->esr->taskSpecificParameters->which == Z_External_update) { Z_IUUpdate *up = rr->esr->taskSpecificParameters->u.update; - yaz_log (log_level, "Received DB Update"); + yaz_log(log_level, "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_level, "action"); + yaz_log(log_level, "action"); if (toKeep->action) { switch (*toKeep->action) { case Z_IUOriginPartToKeep_recordInsert: - yaz_log (log_level, " recordInsert"); + yaz_log(log_level, " recordInsert"); break; case Z_IUOriginPartToKeep_recordReplace: - yaz_log (log_level, " recordReplace"); + yaz_log(log_level, " recordReplace"); break; case Z_IUOriginPartToKeep_recordDelete: - yaz_log (log_level, " recordDelete"); + yaz_log(log_level, " recordDelete"); break; case Z_IUOriginPartToKeep_elementUpdate: - yaz_log (log_level, " elementUpdate"); + yaz_log(log_level, " elementUpdate"); break; case Z_IUOriginPartToKeep_specialUpdate: - yaz_log (log_level, " specialUpdate"); + yaz_log(log_level, " specialUpdate"); break; default: - yaz_log (log_level, " unknown (%d)", *toKeep->action); + yaz_log(log_level, " unknown (" ODR_INT_PRINTF ")", + *toKeep->action); } } if (toKeep->databaseName) { - yaz_log (log_level, "database: %s", toKeep->databaseName); + yaz_log(log_level, "database: %s", toKeep->databaseName); if (!strcmp(toKeep->databaseName, "fault")) { rr->errcode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -362,25 +557,25 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) if (toKeep) { Z_External *ext = (Z_External *) - odr_malloc (rr->stream, sizeof(*ext)); + odr_malloc(rr->stream, sizeof(*ext)); Z_IUOriginPartToKeep *keep = (Z_IUOriginPartToKeep *) - odr_malloc (rr->stream, sizeof(*keep)); + odr_malloc(rr->stream, sizeof(*keep)); Z_IUTargetPart *targetPart = (Z_IUTargetPart *) - odr_malloc (rr->stream, sizeof(*targetPart)); + odr_malloc(rr->stream, sizeof(*targetPart)); rr->taskPackage = (Z_TaskPackage *) - odr_malloc (rr->stream, sizeof(*rr->taskPackage)); + odr_malloc(rr->stream, sizeof(*rr->taskPackage)); rr->taskPackage->packageType = - odr_oiddup (rr->stream, rr->esr->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)); + odr_malloc(rr->stream, sizeof(Odr_oct)); rr->taskPackage->targetReference->buf = - (unsigned char *) odr_strdup (rr->stream, "123"); + (unsigned char *) odr_strdup(rr->stream, "123"); rr->taskPackage->targetReference->len = rr->taskPackage->targetReference->size = strlen((char *) (rr->taskPackage->targetReference->buf)); @@ -390,38 +585,37 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) rr->taskPackage->taskSpecificParameters = ext; ext->direct_reference = - odr_oiddup (rr->stream, rr->esr->packageType); + 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)); + 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)); + 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->action = odr_intdup(rr->stream, *toKeep->action); keep->databaseName = - odr_strdup (rr->stream, toKeep->databaseName); + odr_strdup(rr->stream, toKeep->databaseName); keep->schema = 0; keep->elementSetName = 0; keep->actionQualifier = 0; - targetPart->updateStatus = odr_intdup (rr->stream, 1); + targetPart->updateStatus = odr_intdup(rr->stream, 1); targetPart->num_globalDiagnostics = 0; targetPart->globalDiagnostics = (Z_DiagRec **) odr_nullval(); targetPart->num_taskPackageRecords = 1; targetPart->taskPackageRecords = (Z_IUTaskPackageRecordStructure **) - odr_malloc (rr->stream, - sizeof(Z_IUTaskPackageRecordStructure *)); + odr_malloc(rr->stream, + sizeof(Z_IUTaskPackageRecordStructure *)); targetPart->taskPackageRecords[0] = (Z_IUTaskPackageRecordStructure *) - odr_malloc (rr->stream, - sizeof(Z_IUTaskPackageRecordStructure)); + odr_malloc(rr->stream, + sizeof(Z_IUTaskPackageRecordStructure)); targetPart->taskPackageRecords[0]->which = Z_IUTaskPackageRecordStructure_record; @@ -429,8 +623,8 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) z_ext_record_sutrs(rr->stream, "test", 4); targetPart->taskPackageRecords[0]->correlationInfo = 0; targetPart->taskPackageRecords[0]->recordStatus = - odr_intdup (rr->stream, - Z_IUTaskPackageRecordStructure_success); + odr_intdup(rr->stream, + Z_IUTaskPackageRecordStructure_success); targetPart->taskPackageRecords[0]->num_supplementalDiagnostics = 0; @@ -451,30 +645,30 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) rec->direct_reference, 0, oid_name_str); if (oid_name) - yaz_log (log_level, "record %d type %s", i, - oid_name); + yaz_log(log_level, "record %d type %s", i, + oid_name); } switch (rec->which) { case Z_External_sutrs: if (rec->u.octet_aligned->len > 170) - yaz_log (log_level, "%d bytes:\n%.168s ...", - rec->u.sutrs->len, - rec->u.sutrs->buf); + yaz_log(log_level, "%d bytes:\n%.168s ...", + rec->u.sutrs->len, + rec->u.sutrs->buf); else - yaz_log (log_level, "%d bytes:\n%s", - rec->u.sutrs->len, - rec->u.sutrs->buf); + yaz_log(log_level, "%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_level, "%d bytes:\n%.168s ...", - rec->u.octet_aligned->len, - rec->u.octet_aligned->buf); + yaz_log(log_level, "%d bytes:\n%.168s ...", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); else - yaz_log (log_level, "%d bytes\n%s", - rec->u.octet_aligned->len, - rec->u.octet_aligned->buf); + yaz_log(log_level, "%d bytes\n%s", + rec->u.octet_aligned->len, + rec->u.octet_aligned->buf); } } } @@ -484,9 +678,9 @@ int ztest_esrequest (void *handle, bend_esrequest_rr *rr) } /* result set delete */ -int ztest_delete (void *handle, bend_delete_rr *rr) +int ztest_delete(void *handle, bend_delete_rr *rr) { - if (rr->num_setnames == 1 && !strcmp (rr->setnames[0], "1")) + if (rr->num_setnames == 1 && !strcmp(rr->setnames[0], "1")) rr->delete_status = Z_DeleteStatus_success; else rr->delete_status = Z_DeleteStatus_resultSetDidNotExist; @@ -494,7 +688,7 @@ int ztest_delete (void *handle, bend_delete_rr *rr) } /* Our sort handler really doesn't sort... */ -int ztest_sort (void *handle, bend_sort_rr *rr) +int ztest_sort(void *handle, bend_sort_rr *rr) { rr->errcode = 0; rr->sort_status = Z_SortResponse_success; @@ -503,27 +697,53 @@ int ztest_sort (void *handle, bend_sort_rr *rr) /* present request handler */ -int ztest_present (void *handle, bend_present_rr *rr) +int ztest_present(void *handle, bend_present_rr *rr) { + struct session_handle *sh = (struct session_handle*) handle; + struct result_set *set = get_set(sh, rr->setname); + + if (!set) + { + rr->errcode = YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST; + rr->errstring = odr_strdup(rr->stream, rr->setname); + return 0; + } + do_delay(&set->present_delay); return 0; } /* retrieval of a single record (present, and piggy back search) */ int ztest_fetch(void *handle, bend_fetch_rr *r) { + struct session_handle *sh = (struct session_handle*) handle; char *cp; const Odr_oid *oid = r->request_format; + struct result_set *set = get_set(sh, r->setname); + if (!set) + { + r->errcode = YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST; + r->errstring = odr_strdup(r->stream, r->setname); + return 0; + } + do_delay(&set->fetch_delay); r->last_in_set = 0; - r->basename = "Default"; + r->basename = set->db; r->output_format = r->request_format; + if (r->number < 1 || r->number > set->hits) + { + r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + return 0; + } if (!oid || yaz_oid_is_iso2709(oid)) { cp = dummy_marc_record(r->number, r->stream); if (!cp) { - r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; + return 0; } else { @@ -534,59 +754,15 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) } else if (!oid_oidcmp(oid, yaz_oid_recsyn_opac)) { - Z_OPACRecord *rec; - int i; cp = dummy_marc_record(r->number, r->stream); if (!cp) { - r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; return 0; } - rec = odr_malloc(r->stream, sizeof(*rec)); - rec->bibliographicRecord = - z_ext_record_usmarc(r->stream, cp, strlen(cp)); - rec->num_holdingsData = 1; - rec->holdingsData = odr_malloc(r->stream, sizeof(*rec->holdingsData)); - for (i = 0; i < rec->num_holdingsData; i++) - { - Z_HoldingsRecord *hr = odr_malloc(r->stream, sizeof(*hr)); - Z_HoldingsAndCircData *hc = odr_malloc(r->stream, sizeof(*hc)); - - rec->holdingsData[i] = hr; - hr->which = Z_HoldingsRecord_holdingsAndCirc; - hr->u.holdingsAndCirc = hc; - - hc->typeOfRecord = odr_strdup(r->stream, "x"); - hc->typeOfRecord[0] = cp[5]; /* LDR 6 */ - - hc->encodingLevel = odr_strdup(r->stream, "x"); - hc->encodingLevel[0] = cp[16]; /* LDR 17 */ - - hc->format = 0; /* OPT */ - hc->receiptAcqStatus = 0; /* OPT */ - hc->generalRetention = 0; /* OPT */ - hc->completeness = 0; /* OPT */ - hc->dateOfReport = 0; /* OPT */ - hc->nucCode = 0; /* OPT */ - hc->localLocation = 0; /* OPT */ - hc->shelvingLocation = 0; /* OPT */ - hc->callNumber = 0; /* OPT */ - hc->shelvingData = 0; /* OPT */ - hc->copyNumber = 0; /* OPT */ - hc->publicNote = 0; /* OPT */ - hc->reproductionNote = 0; /* OPT */ - hc->termsUseRepro = 0; /* OPT */ - hc->enumAndChron = 0; /* OPT */ - - hc->num_volumes = 0; - hc->volumes = 0; - - hc->num_circulationData = 0; - hc->circulationData = 0; - } - + r->record = (char *) dummy_opac(r->number, r->stream, cp); r->len = -1; - r->record = (char*) rec; } else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) { @@ -596,7 +772,7 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) sprintf(buf, "This is dummy SUTRS record number %d\n", r->number); r->len = strlen(buf); - r->record = (char *) odr_malloc (r->stream, r->len+1); + r->record = (char *) odr_malloc(r->stream, r->len+1); strcpy(r->record, buf); } else if (!oid_oidcmp(oid, yaz_oid_recsyn_grs_1)) @@ -605,7 +781,8 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) r->record = (char*) dummy_grs_record(r->number, r->stream); if (!r->record) { - r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; return 0; } } @@ -615,36 +792,41 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) FILE *f; long size; - sprintf (fname, "part.%d.ps", r->number); + sprintf(fname, "part.%d.ps", r->number); f = fopen(fname, "rb"); if (!f) { - r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; return 0; } - fseek (f, 0L, SEEK_END); - size = ftell (f); + fseek(f, 0L, SEEK_END); + size = ftell(f); if (size <= 0 || size >= 5000000) { r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; - return 0; + r->surrogate_flag = 1; } - fseek (f, 0L, SEEK_SET); - r->record = (char*) odr_malloc (r->stream, size); + fseek(f, 0L, SEEK_SET); + r->record = (char*) odr_malloc(r->stream, size); r->len = size; - fread (r->record, size, 1, f); - fclose (f); + if (fread(r->record, size, 1, f) != 1) + { + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; + } + fclose(f); } else if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)) { - if ((cp = dummy_xml_record (r->number, r->stream))) + if ((cp = dummy_xml_record(r->number, r->stream))) { r->len = strlen(cp); r->record = cp; } else { - r->errcode = YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE; + r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; r->surrogate_flag = 1; return 0; } @@ -675,15 +857,10 @@ int ztest_scan(void *handle, bend_scan_rr *q) int num_entries_req = q->num_entries; /* Throw Database unavailable if other than Default or Slow */ - if (!yaz_matchstr (q->basenames[0], "Default")) + if (!yaz_matchstr(q->basenames[0], "Default")) ; /* Default is OK in our test */ - else if(!yaz_matchstr (q->basenames[0], "Slow")) - { -#if HAVE_UNISTD_H - sleep(3); -#endif + else if (check_slow(q->basenames[0], 0 /* no assoc for scan */)) ; - } else { q->errcode = YAZ_BIB1_DATABASE_UNAVAILABLE; @@ -719,7 +896,7 @@ int ztest_scan(void *handle, bend_scan_rr *q) return 0; } len = q->term->term->u.general->len; - if (len >= sizeof(term)) + if (len >= (int ) sizeof(term)) len = sizeof(term)-1; memcpy(term, q->term->term->u.general->buf, len); term[len] = '\0'; @@ -740,7 +917,7 @@ int ztest_scan(void *handle, bend_scan_rr *q) q->num_entries = 0; for (i = 0, pos = 0; fscanf(f, " %79[^:]:%d", entries[pos], &hits[pos]) == 2; - i++, pos < 199 ? pos++ : (pos = 0)) + i++, pos < 199 ? pos++ : (pos = 0)) { if (!q->num_entries && strcmp(entries[pos], term) >= 0) /* s-point fnd */ { @@ -757,7 +934,7 @@ int ztest_scan(void *handle, bend_scan_rr *q) if (po < 0) po += 200; - if (!strcmp (term, "SD") && q->num_entries == 2) + if (!strcmp(term, "SD") && q->num_entries == 2) { list[q->num_entries].term = entries[pos]; list[q->num_entries].occurrences = -1; @@ -809,8 +986,10 @@ int ztest_update(void *handle, bend_update_rr *rr) bend_initresult *bend_init(bend_initrequest *q) { bend_initresult *r = (bend_initresult *) - odr_malloc (q->stream, sizeof(*r)); - int *counter = (int *) xmalloc (sizeof(int)); + odr_malloc(q->stream, sizeof(*r)); + struct session_handle *sh = xmalloc(sizeof(*sh)); + + sh->result_sets = 0; if (!log_level_set) { @@ -818,10 +997,9 @@ bend_initresult *bend_init(bend_initrequest *q) log_level_set=1; } - *counter = 0; r->errcode = 0; r->errstring = 0; - r->handle = counter; /* user handle, in this case a simple int */ + r->handle = sh; /* tell GFS about our handle */ q->bend_sort = ztest_sort; /* register sort handler */ q->bend_search = ztest_search; /* register search handler */ q->bend_present = ztest_present; /* register present handle */ @@ -843,7 +1021,9 @@ bend_initresult *bend_init(bend_initrequest *q) void bend_close(void *handle) { - xfree (handle); /* release our user-defined handle */ + struct session_handle *sh = (struct session_handle*) handle; + remove_sets(sh); + xfree(sh); /* release our session */ return; } @@ -854,6 +1034,7 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab