/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/** \file
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
-#include <ctype.h>
#if HAVE_SYS_TIME_H
#include <sys/time.h>
sh->result_sets = 0;
}
-/** \brief use term value as hit count
+/** \brief use term value as hit count
\param s RPN structure
+ \param hash value for compuation
\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 Odr_int get_term_hit(Z_RPNStructure *s)
+static Odr_int get_term_hit(Z_RPNStructure *s, unsigned *hash)
{
Odr_int h = -1;
switch(s->which)
h = odr_atoi(wrbuf_cstr(hits_str));
wrbuf_destroy(hits_str);
}
+ else
+ {
+ int i;
+ for (i = 0; i < oct->len; i++)
+ *hash = *hash * 65509 + oct->buf[i];
+ }
}
}
break;
case Z_RPNStructure_complex:
- h = get_term_hit(s->u.complex->s1);
+ h = get_term_hit(s->u.complex->s1, hash);
if (h == -1)
- h = get_term_hit(s->u.complex->s2);
+ h = get_term_hit(s->u.complex->s2, hash);
break;
}
return h;
/** \brief gets hit count for numeric terms in RPN queries
\param q RPN Query
- \return number of hits (random or number for term)
-
+ \return number of hits
+
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
{
if (q->which == Z_Query_type_1 || q->which == Z_Query_type_101)
{
+ unsigned hash = 0;
Odr_int h = -1;
- h = get_term_hit(q->u.type_1->RPNStructure);
+ h = get_term_hit(q->u.type_1->RPNStructure, &hash);
if (h == -1)
- h = rand() % 24;
+ h = hash % 24;
return h;
}
+ else if (q->which == Z_Query_type_104 &&
+ q->u.type_104->which == Z_External_CQL)
+ {
+ unsigned hash = 0;
+ const char *cql = q->u.type_104->u.cql;
+ int i;
+ for (i = 0; cql[i]; i++)
+ hash = hash * 65509 + cql[i];
+ return hash % 24;
+ }
else
return 24;
}
}
}
-static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name) {
+static void addterms(ODR odr, Z_FacetField *facet_field, const char *facet_name)
+{
int index;
int freq = 100;
int length = strlen(facet_name) + 10;
char *key = odr_malloc(odr, length);
key[0] = '\0';
- for (index = 0; index < facet_field->num_terms; index++) {
- Z_Term *term;
+ for (index = 0; index < facet_field->num_terms; index++)
+ {
Z_FacetTerm *facet_term;
sprintf(key, "%s%d", facet_name, index);
yaz_log(YLOG_DEBUG, "facet add term %s %d %s", facet_name, index, key);
- term = term_create(odr, key);
- facet_term = facet_term_create(odr, term, freq);
+
+ facet_term = facet_term_create_cstr(odr, key, freq);
freq = freq - 10 ;
facet_field_term_set(odr, facet_field, facet_term, index);
}
for (index = 0; index < facet_list->num; index++) {
struct yaz_facet_attr attrvalues;
yaz_facet_attr_init(&attrvalues);
- attrvalues.limit = 0;
+ attrvalues.limit = 10;
yaz_facet_attr_get_z_attributes(facet_list->elements[index]->attributes,
&attrvalues);
yaz_log(YLOG_LOG, "Attributes: %s %d ", attrvalues.useattr, attrvalues.limit);
return 0;
}
+static void echo_extra_args(ODR stream,
+ Z_SRW_extra_arg *extra_args, char **extra_response)
+{
+ if (extra_args)
+ {
+ Z_SRW_extra_arg *a;
+ WRBUF response_xml = wrbuf_alloc();
+ wrbuf_puts(response_xml, "<extra>");
+ for (a = extra_args; a; a = a->next)
+ {
+ wrbuf_puts(response_xml, "<extra name=\"");
+ wrbuf_xmlputs(response_xml, a->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, "</extra>");
+ *extra_response = odr_strdup(stream, wrbuf_cstr(response_xml));
+ wrbuf_destroy(response_xml);
+ }
+
+}
+
int ztest_search(void *handle, bend_search_rr *rr)
{
struct session_handle *sh = (struct session_handle*) handle;
rr->errcode = YAZ_BIB1_COMBI_OF_SPECIFIED_DATABASES_UNSUPP;
return 0;
}
-
+
db = rr->basenames[0];
/* Allow Default, db.* and Slow */
return 0;
}
- new_set = get_set(sh, rr->setname);
+ new_set = get_set(sh, rr->setname);
if (new_set)
{
if (!rr->replace_set)
}
}
- if (rr->extra_args)
- {
- Z_SRW_extra_arg *a;
- WRBUF response_xml = wrbuf_alloc();
- wrbuf_puts(response_xml, "<extra>");
- for (a = rr->extra_args; a; a = a->next)
- {
- wrbuf_puts(response_xml, "<extra name=\"");
- wrbuf_xmlputs(response_xml, a->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, "</extra>");
- rr->extra_response_data =
- odr_strdup(rr->stream, wrbuf_cstr(response_xml));
- wrbuf_destroy(response_xml);
- }
+ echo_extra_args(rr->stream, rr->extra_args, &rr->extra_response_data);
rr->hits = get_hit_count(rr->query);
if (1)
}
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)
{
- /* user-defined handle - created in bend_init */
- int *counter = (int*) handle;
-
- yaz_log(log_level, "ESRequest no %d", *counter);
-
- (*counter)++;
-
if (rr->esr->packageName)
yaz_log(log_level, "packagename: %s", rr->esr->packageName);
yaz_log(log_level, "Waitaction: " ODR_INT_PRINTF, *rr->esr->waitAction);
Z_IOOriginPartToKeep *k = ir->toKeep;
Z_IOOriginPartNotToKeep *n = ir->notToKeep;
const char *xml_in_response = 0;
-
+
if (k && k->contact)
{
if (k->contact->name)
{
yaz_log(log_level, "Billing info (not shown)");
}
-
+
if (n->resultSetItem)
{
yaz_log(log_level, "resultsetItem");
{
char oid_name_str[OID_STR_MAX];
oid_class oclass;
- const char *oid_name =
+ const char *oid_name =
yaz_oid_to_string_buf(r->direct_reference,
&oclass, oid_name_str);
if (oid_name)
if (r->which == Z_External_octet)
yaz_log(log_level, "%.*s",
r->u.octet_aligned->len,
- r->u.octet_aligned->buf);
+ r->u.octet_aligned->buf);
xml_in_response = "<dummy>x</dummy>";
}
- if (!oid_oidcmp(r->direct_reference,
+ if (!oid_oidcmp(r->direct_reference,
yaz_oid_general_isoill_1))
{
yaz_log(log_level, "Decode ItemRequest begin");
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_level,
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_level,
strlen(xml_in_response));
else
targetPart->itemRequest = 0;
-
+
targetPart->statusOrErrorReport = 0;
targetPart->auxiliaryStatus = 0;
}
Z_IUUpdateEsRequest *esRequest = up->u.esRequest;
Z_IUOriginPartToKeep *toKeep = esRequest->toKeep;
Z_IUSuppliedRecords *notToKeep = esRequest->notToKeep;
-
+
yaz_log(log_level, "action");
if (toKeep->action)
{
targetPart->num_globalDiagnostics = 0;
targetPart->globalDiagnostics = (Z_DiagRec **) odr_nullval();
targetPart->num_taskPackageRecords = 1;
- targetPart->taskPackageRecords =
+ targetPart->taskPackageRecords =
(Z_IUTaskPackageRecordStructure **)
odr_malloc(rr->stream,
sizeof(Z_IUTaskPackageRecordStructure *));
(Z_IUTaskPackageRecordStructure *)
odr_malloc(rr->stream,
sizeof(Z_IUTaskPackageRecordStructure));
-
+
targetPart->taskPackageRecords[0]->which =
Z_IUTaskPackageRecordStructure_record;
- targetPart->taskPackageRecords[0]->u.record =
+ targetPart->taskPackageRecords[0]->u.record =
z_ext_record_sutrs(rr->stream, "test", 4);
- targetPart->taskPackageRecords[0]->correlationInfo = 0;
+ targetPart->taskPackageRecords[0]->correlationInfo = 0;
targetPart->taskPackageRecords[0]->recordStatus =
odr_intdup(rr->stream,
- Z_IUTaskPackageRecordStructure_success);
+ Z_IUTaskPackageRecordStructure_success);
targetPart->taskPackageRecords[0]->num_supplementalDiagnostics
= 0;
if (rec->direct_reference)
{
char oid_name_str[OID_STR_MAX];
- const char *oid_name
+ const char *oid_name
= oid_name = yaz_oid_to_string_buf(
rec->direct_reference, 0,
oid_name_str);
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);
+ struct result_set *set = get_set(sh, rr->setname);
if (!set)
{
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);
+ struct result_set *set = get_set(sh, r->setname);
+ const char *esn = yaz_get_esn(r->comp);
if (!set)
{
{
/* this section returns a small record */
char buf[100];
-
+
sprintf(buf, "This is dummy SUTRS record number %d\n", r->number);
r->len = strlen(buf);
}
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, esn)))
{
r->len = strlen(cp);
r->record = cp;
}
- else
+ else
{
r->errcode = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
r->surrogate_flag = 1;
strcpy(term, "0");
for (p = term; *p; p++)
- if (islower(*(unsigned char *) p))
- *p = toupper(*p);
+ if (yaz_islower(*p))
+ *p = yaz_toupper(*p);
fseek(f, 0, SEEK_SET);
q->num_entries = 0;
if (q->num_entries >= num_entries_req)
break;
}
+ echo_extra_args(q->stream, q->extra_args, &q->extra_response_data);
if (feof(f))
q->status = BEND_SCAN_PARTIAL;
return 0;
projects / yaz-moved-to-github.git / blobdiff