xmalloc_trav(0);
}
-
-static void cmd_bytarget(struct http_channel *c)
-{
- struct http_request *rq = c->request;
- struct http_session *s = locate_session(c);
+static void bytarget_response(struct http_channel *c) {
+ int count, i;
struct hitsbytarget *ht;
+ struct http_request *rq = c->request;
const char *settings = http_argbyname(rq, "settings");
- int count, i;
+ struct http_session *s = locate_session(c);
- if (!s)
- return;
ht = get_hitsbytarget(s->psession, &count, c->nmem);
response_open(c, "bytarget");
wrbuf_puts(c->wrbuf, ht[i].settings_xml);
wrbuf_puts(c->wrbuf, "</settings>\n");
}
+ if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) {
+ wrbuf_puts(c->wrbuf, "<suggestions>");
+ wrbuf_puts(c->wrbuf, ht[i].suggestions_xml);
+ wrbuf_puts(c->wrbuf, "</suggestions>");
+ }
wrbuf_puts(c->wrbuf, "</target>");
}
response_close(c, "bytarget");
release_session(c, s);
}
+static void bytarget_result_ready(void *data)
+{
+ struct http_channel *c = (struct http_channel *) data;
+
+ bytarget_response(c);
+}
+
+
+static void cmd_bytarget(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_session *s = locate_session(c);
+ const char *block = http_argbyname(rq, "block");
+ struct hitsbytarget *ht;
+
+ if (!s)
+ return;
+
+ if (block && strcmp("1",*block) == 0)
+ {
+ // if there is already a watch/block. we do not block this one
+ if (session_set_watch(s->psession, SESSION_WATCH_BYTARGET,
+ bytarget_result_ready, c, c) != 0)
+ {
+ yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_bytarget", s, s->session_id);
+ }
+ release_session(c, s);
+ return;
+ }
+ bytarget_response(c);
+ release_session(c, s);
+}
+
static void write_metadata(WRBUF w, struct conf_service *service,
struct record_metadata **ml, int full)
{
if (!sort)
sort = "relevance";
- status = session_active_clients(s->psession);
-
if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
{
error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
}
- search_sort(s->psession, sp->name, sp->increasing);
+ session_sort(s->psession, sp->name, sp->increasing);
+
+ status = session_active_clients(s->psession);
if (block)
{
return;
}
- else if (status && reclist_get_num_records(s->psession->reclist) == 0)
+ else if (status)
{
// if there is already a watch/block. we do not block this one
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
release_session(c, s);
return;
}
- code = search(s->psession, query, startrecs, maxrecs, filter, limit,
- &addinfo);
+ code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
+ &addinfo, "relevance", 0);
if (code)
{
error(rs, code, addinfo);
}
response_open(c, "search");
response_close(c, "search");
- http_send_response(c);
release_session(c, s);
}