}
// This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static void targets_termlist(WRBUF wrbuf, struct session *se, int num,
+static int targets_termlist(WRBUF wrbuf, struct session *se, int num,
NMEM nmem)
{
struct hitsbytarget *ht;
ht[i].diagnostic);
wrbuf_puts(wrbuf, "</term>\n");
}
+ return count;
}
static void cmd_termlist(struct http_channel *c)
const char *nums = http_argbyname(rq, "num");
int num = 15;
int status;
+ WRBUF debug_log = wrbuf_alloc();
if (!s)
return;
tp = name + strlen(name);
strncpy(tname, name, tp - name);
tname[tp - name] = '\0';
-
wrbuf_puts(c->wrbuf, "<list name=\"");
wrbuf_xmlputs(c->wrbuf, tname);
wrbuf_puts(c->wrbuf, "\">\n");
- if (!strcmp(tname, "xtargets"))
- targets_termlist(c->wrbuf, s->psession, num, c->nmem);
+ if (!strcmp(tname, "xtargets")) {
+ int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem);
+ wrbuf_printf(debug_log, " xtargets: %d", targets);
+ }
else
{
p = termlist(s->psession, tname, &len);
- if (p)
+ if (p && len)
+ wrbuf_printf(debug_log, " %s: %d", tname, len);
+ if (p) {
for (i = 0; i < len && i < num; i++){
// prevnt sending empty term elements
if (!p[i]->term || !p[i]->term[0])
p[i]->frequency);
wrbuf_puts(c->wrbuf, "</term>\n");
}
+ }
}
wrbuf_puts(c->wrbuf, "</list>\n");
name = tp;
name++;
}
wrbuf_puts(c->wrbuf, "</termlist>\n");
+ yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log));
+ wrbuf_destroy(debug_log);
rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
release_session(c,s);
if (block)
{
- if (status && reclist_get_num_records(s->psession->reclist) == 0)
+ if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) {
+ // if there is already a watch/block. we do not block this one
+ if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
+ show_records_ready, c, c) != 0)
+ {
+ yaz_log(c->http_sessions->log_level,
+ "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id);
+ }
+ release_session(c,s);
+ return;
+
+ }
+ else if (status && reclist_get_num_records(s->psession->reclist) == 0)
{
// if there is already a watch/block. we do not block this one
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,