* Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: ztest.c,v 1.91 2007-05-08 08:22:37 adam Exp $
+ * $Id: ztest.c,v 1.95 2007-08-14 12:22:51 adam Exp $
*/
/*
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
+
+ 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)
+{
+ int h = -1;
+ switch(s->which)
+ {
+ case Z_RPNStructure_simple:
+ if (s->u.simple->which == Z_Operand_APT)
+ {
+ Z_AttributesPlusTerm *apt = s->u.simple->u.attributesPlusTerm;
+ if (apt->term->which == Z_Term_general)
+ {
+ 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);
+ }
+ }
+ break;
+ case Z_RPNStructure_complex:
+ h = get_term_hit(s->u.complex->s1);
+ if (h == -1)
+ h = get_term_hit(s->u.complex->s2);
+ break;
+ }
+ return h;
+}
+
+/** \fn get_hit_count
+ \brief gets hit count for numeric terms in RPN queries
+
+ 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)
+{
+ 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)
+ h = rand() % 24;
+ return h;
+}
+
int ztest_search(void *handle, bend_search_rr *rr)
{
if (rr->num_bases != 1)
rr->errcode = 23;
return 0;
}
-#if NMEM_DEBUG
- /* if database is stop, stop this process.. For debugging only. */
- if (!yaz_matchstr (rr->basenames[0], "stop"))
- {
- nmem_print_list_l(YLOG_LOG);
- exit(0);
- }
-#endif
/* Throw Database unavailable if other than Default or Slow */
if (!yaz_matchstr (rr->basenames[0], "Default"))
; /* Default is OK in our test */
rr->errstring = rr->basenames[0];
return 0;
}
- rr->hits = rand() % 24;
+
+ rr->hits = get_hit_count(rr->query);
return 0;
}
Z_IORequest *ir = it->u.esRequest;
Z_IOOriginPartToKeep *k = ir->toKeep;
Z_IOOriginPartNotToKeep *n = ir->notToKeep;
+ const char *xml_in_response = 0;
if (k && k->contact)
{
{
yaz_log (log_level, "ILL XML request");
if (r->which == Z_External_octet)
- yaz_log (log_level, "%.*s", r->u.octet_aligned->len,
+ yaz_log (log_level, "%.*s",
+ r->u.octet_aligned->len,
r->u.octet_aligned->buf);
+ xml_in_response = "<dummy>x</dummy>";
}
if (!oid_oidcmp(r->direct_reference,
yaz_oid_general_isoill_1))
ext->u.itemOrder->u.taskPackage->originPart = k;
ext->u.itemOrder->u.taskPackage->targetPart = targetPart;
- targetPart->itemRequest = 0;
+ if (xml_in_response)
+ targetPart->itemRequest =
+ z_ext_record_xml(rr->stream, xml_in_response,
+ strlen(xml_in_response));
+ else
+ targetPart->itemRequest = 0;
+
targetPart->statusOrErrorReport = 0;
targetPart->auxiliaryStatus = 0;
}
int ztest_fetch(void *handle, bend_fetch_rr *r)
{
char *cp;
- oid_class oclass;
- char oid_str_buf[OID_STR_MAX];
- const char *oid_str = 0;
const Odr_oid *oid = r->request_format;
r->last_in_set = 0;
r->basename = "Default";
r->output_format = r->request_format;
- oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf);
-
if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
/* this section returns a small record */