X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=bbbb402c871f817a0e8cd83f5eae7c1625782abc;hp=7d2f90b9c2a2cdc03c63f69b814071bcbbbcba11;hb=4e627aa761e0b91b240f703173eeb82462ee8409;hpb=ffe862e36b8b60b1197b223cec0b78482cbd7763 diff --git a/ztest/ztest.c b/ztest/ztest.c index 7d2f90b..bbbb402 100644 --- a/ztest/ztest.c +++ b/ztest/ztest.c @@ -8,11 +8,22 @@ */ #include +#include #include #include + +#if HAVE_SYS_TIME_H +#include +#endif #if HAVE_UNISTD_H #include #endif +#if HAVE_SYS_SELECT_H +#include +#endif +#ifdef WIN32 +#include +#endif #include #include @@ -24,12 +35,54 @@ static int log_level=0; static int log_level_set=0; +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); 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); +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 @@ -121,16 +174,73 @@ static int check_slow(const char *basename, bend_association association) 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 ztest_sleep(double d) +{ +#ifdef WIN32 + Sleep( (DWORD) (d * 1000)); +#else + struct timeval tv; + tv.tv_sec = floor(d); + tv.tv_usec = (d - floor(d)) * 1000000; + select(0, 0, 0, 0, &tv); +#endif +} + +static void do_delay(const struct delay *delayp) +{ + double d = delayp->d1; + + if (d > 0.0) + { + if (delayp->d2 > d) + d += (rand()) * (delayp->d2 - d) / RAND_MAX; + ztest_sleep(d); + } +} + 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; } - /* Throw Database unavailable if other than Default or Slow */ - if (!yaz_matchstr(rr->basenames[0], "Default")) + + 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; @@ -142,6 +252,56 @@ 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")) + srand(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; @@ -166,6 +326,10 @@ int ztest_search(void *handle, bend_search_rr *rr) wrbuf_destroy(response_xml); } rr->hits = get_hit_count(rr->query); + + do_delay(&new_set->search_delay); + new_set->hits = rr->hits; + return 0; } @@ -554,25 +718,50 @@ int ztest_sort(void *handle, bend_sort_rr *rr) /* present request handler */ 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 @@ -587,7 +776,8 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) 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; } r->record = (char *) dummy_opac(r->number, r->stream, cp); @@ -610,7 +800,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; } } @@ -624,7 +815,8 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) 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); @@ -632,6 +824,7 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) if (size <= 0 || size >= 5000000) { r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; } fseek(f, 0L, SEEK_SET); r->record = (char*) odr_malloc(r->stream, size); @@ -639,6 +832,7 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) if (fread(r->record, size, 1, f) != 1) { r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS; + r->surrogate_flag = 1; } fclose(f); } @@ -651,7 +845,7 @@ int ztest_fetch(void *handle, bend_fetch_rr *r) } 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; } @@ -812,7 +1006,9 @@ bend_initresult *bend_init(bend_initrequest *q) { bend_initresult *r = (bend_initresult *) odr_malloc(q->stream, sizeof(*r)); - int *counter = (int *) xmalloc(sizeof(int)); + struct session_handle *sh = xmalloc(sizeof(*sh)); + + sh->result_sets = 0; if (!log_level_set) { @@ -820,10 +1016,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 */ @@ -845,7 +1040,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; }