#include <yaz/oid_db.h>
#include <yaz/snprintf.h>
-#define USE_TIMING 0
+#define USE_TIMING 1
#if USE_TIMING
#include <yaz/timing.h>
#endif
prt = pp2_charset_token_create(service->charsets, icu_chain_id);
if (!prt)
{
- yaz_log(YLOG_FATAL, "Unknown ICU chain '%s' for facet of type '%s'",
+ session_log(s, YLOG_FATAL,
+ "Unknown ICU chain '%s' for facet of type '%s'",
icu_chain_id, type);
wrbuf_destroy(facet_wrbuf);
wrbuf_destroy(display_wrbuf);
static void session_clear_set(struct session *se, struct reclist_sortparms *sp)
{
reclist_destroy(se->reclist);
- se->reclist = 0;
if (nmem_total(se->nmem))
session_log(se, YLOG_DEBUG, "NMEN operation usage %zd",
nmem_total(se->nmem));
int type = sp->type;
int clients_research = 0;
- yaz_log(YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d", field, increasing, type);
+ session_log(se, YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d",
+ field, increasing, type);
/* see if we already have sorted for this criteria */
for (sr = se->sorted_results; sr; sr = sr->next)
{
- if (!reclist_sortparms_cmp(sr,sp))
+ if (!reclist_sortparms_cmp(sr, sp))
break;
}
if (sr)
clients_research += client_parse_sort(cl, sp);
}
if (clients_research) {
- yaz_log(YLOG_DEBUG, "Reset results due to %d clients researching", clients_research);
+ session_log(se, YLOG_DEBUG,
+ "Reset results due to %d clients researching",
+ clients_research);
session_clear_set(se, sp);
}
else {
client_start_search(cl);
}
else {
- yaz_log(YLOG_DEBUG, "Client %s: No re-start/ingest in show. Wrong client state: %d",
+ session_log(se, YLOG_DEBUG,
+ "Client %s: No re-start/ingest in show. Wrong client state: %d",
client_get_id(cl), client_get_state(cl));
}
session->number_of_warnings_unknown_elements = 0;
session->number_of_warnings_unknown_metadata = 0;
session->num_termlists = 0;
- session->reclist = 0;
+ session->reclist = reclist_create(nmem);
session->clients_active = 0;
session->clients_cached = 0;
session->settings_modified = 0;
session_enter(se, "show_single_start");
*prev_r = 0;
*next_r = 0;
- if (se->reclist)
- {
- reclist_limit(se->reclist, se);
+ reclist_limit(se->reclist, se);
- reclist_enter(se->reclist);
- while ((r = reclist_read_record(se->reclist)))
+ reclist_enter(se->reclist);
+ while ((r = reclist_read_record(se->reclist)))
+ {
+ if (!strcmp(r->recid, id))
{
- if (!strcmp(r->recid, id))
- {
- *next_r = reclist_read_record(se->reclist);
- break;
- }
- *prev_r = r;
+ *next_r = reclist_read_record(se->reclist);
+ break;
}
- reclist_leave(se->reclist);
+ *prev_r = r;
}
+ reclist_leave(se->reclist);
if (!r)
session_leave(se, "show_single_start");
return r;
reclist_leave(se->reclist);
#if USE_TIMING
yaz_timing_stop(t);
- yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f",
+ session_log(se, YLOG_LOG, "show %6.5f %3.2f %3.2f",
yaz_timing_get_real(t), yaz_timing_get_user(t),
yaz_timing_get_sys(t));
yaz_timing_destroy(&t);
int hits = (int) client_get_hits(cl);
term_factor = MAX(hits, maxrecs) / MAX(1, maxrecs);
assert(term_factor >= 1);
- yaz_log(YLOG_DEBUG, "Using term factor: %d (%d / %d)", term_factor, MAX(hits, maxrecs), MAX(1, maxrecs));
+ session_log(se, YLOG_DEBUG, "Using term factor: %d (%d / %d)",
+ term_factor, MAX(hits, maxrecs), MAX(1, maxrecs));
}
}
va_start(ap, fmt);
yaz_vsnprintf(buf, sizeof(buf)-30, fmt, ap);
- yaz_log(level, "Session %u: %s", s->session_id, buf);
+ yaz_log(level, "Session %u: %s", s ? s->session_id : 0, buf);
va_end(ap);
}