#include <yaz/oid_db.h>
#include <yaz/snprintf.h>
-#define USE_TIMING 1
+#define USE_TIMING 0
#if USE_TIMING
#include <yaz/timing.h>
#endif
WRBUF w = wrbuf_alloc();
const char *name = session_setting_oneval(client_get_database(cl),
PZ_NAME);
-
res[*count].id = client_get_id(cl);
res[*count].name = *name ? name : "Unknown";
res[*count].hits = client_get_hits(cl);
res[*count].approximation = client_get_approximation(cl);
- res[*count].records = client_get_num_records(cl);
- res[*count].filtered = client_get_num_records_filtered(cl);
+ res[*count].records = client_get_num_records(cl,
+ &res[*count].filtered,
+ 0, 0);
res[*count].diagnostic =
client_get_diagnostic(cl, &res[*count].message,
&res[*count].addinfo);
}
else
{
- session_log(se, YLOG_LOG, "%s: no more to fetch",
- client_get_id(cl));
+ int filtered;
+ int ingest_failures;
+ int record_failures;
+ int num = client_get_num_records(
+ cl, &filtered, &ingest_failures, &record_failures);
+
+ session_log(se, YLOG_LOG, "%s: hits=" ODR_INT_PRINTF
+ " fetched=%d filtered=%d",
+ client_get_id(cl),
+ client_get_hits(cl),
+ num, filtered);
+ if (ingest_failures || record_failures)
+ {
+ session_log(se, YLOG_WARN, "%s:"
+ " ingest failures=%d record failures=%d",
+ client_get_id(cl),
+ ingest_failures, record_failures);
+ }
}
}
else
{
int ret = 0;
struct session *se = client_get_session(cl);
- struct conf_service *service = se->service;
-
- insert_settings_values(sdb, xdoc, root, service);
if (!check_record_filter(root, sdb))
{
return ret;
}
-int ingest_xml_record(struct client *cl, xmlDoc *xdoc,
- int record_no, NMEM nmem);
-
/** \brief ingest XML record
\param cl client holds the result set for record
\param rec record buffer (0 terminated)
struct session_database *sdb = client_get_database(cl);
struct conf_service *service = se->service;
xmlDoc *xdoc = normalize_record(se, sdb, service, rec, nmem);
- int r = ingest_xml_record(cl, xdoc, record_no, nmem);
+ int r = ingest_xml_record(cl, xdoc, record_no, nmem, 0);
client_store_xdoc(cl, record_no, xdoc);
return r;
}
int ingest_xml_record(struct client *cl, xmlDoc *xdoc,
- int record_no, NMEM nmem)
+ int record_no, NMEM nmem, int cached_copy)
{
struct session *se = client_get_session(cl);
struct session_database *sdb = client_get_database(cl);
if (sroot->type == XML_ELEMENT_NODE &&
!strcmp((const char *) sroot->name, "record"))
{
+ if (!cached_copy)
+ insert_settings_values(sdb, xdoc, root, service);
r = ingest_sub_record(cl, xdoc, sroot, record_no, nmem, sdb,
mk);
}
mk->value = nmem_strdup(nmem, mergekey_norm);
mk->next = 0;
+ if (!cached_copy)
+ insert_settings_values(sdb, xdoc, root, service);
r = ingest_sub_record(cl, xdoc, root, record_no, nmem, sdb, mk);
}
}
if (check_limit_local(cl, record, record_no))
{
- session_log(se, YLOG_LOG, "Facet filtered out record no %d from %s",
- record_no, sdb->database->id);
if (type)
xmlFree(type);
if (value)