{
struct http_session *s_next = s->next;
iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
+ session_destroy(s->psession);
nmem_destroy(s->nmem);
s = s_next;
}
{ /* destroying for real */
yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
+ session_destroy(s->psession);
http_session_use(-1);
nmem_destroy(s->nmem);
}
{ PAZPAR2_RECORD_FAIL, "Record command failed"},
{ PAZPAR2_NOT_IMPLEMENTED, "Not implemented"},
{ PAZPAR2_NO_SERVICE, "No service"},
+ { PAZPAR2_ALREADY_BLOCKED, "Already blocked in session on: "},
{ PAZPAR2_LAST_ERROR, "Last error"},
{ 0, 0 }
};
http_send_response(c);
}
+static void response_open_no_status(struct http_channel *c, const char *command)
+{
+ wrbuf_rewind(c->wrbuf);
+ wrbuf_printf(c->wrbuf, "%s<%s>",
+ HTTP_COMMAND_RESPONSE_PREFIX, command);
+}
+
+static void response_open(struct http_channel *c, const char *command)
+{
+ response_open_no_status(c, command);
+ wrbuf_puts(c->wrbuf, "<status>OK</status>");
+}
+
+static void response_close(struct http_channel *c, const char *command)
+{
+ struct http_response *rs = c->response;
+
+ wrbuf_printf(c->wrbuf, "</%s>", command);
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+ http_send_response(c);
+}
+
unsigned int make_sessionid(void)
{
static int seq = 0; /* thread pr */
static struct http_session *locate_session(struct http_channel *c)
{
- struct http_response *rs = c->response;
struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
struct http_session *p;
const char *session = http_argbyname(rq, "session");
http_sessions_t http_sessions = c->http_sessions;
static void cmd_exit(struct http_channel *c)
{
- char buf[1024];
- struct http_response *rs = c->response;
yaz_log(YLOG_WARN, "exit");
- sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "<exit><status>OK</status></exit>");
- rs->payload = nmem_strdup(c->nmem, buf);
- http_send_response(c);
+
+ response_open(c, "exit");
+ response_close(c, "exit");
http_close_server(c->server);
}
static void cmd_init(struct http_channel *c)
{
- char buf[1024];
struct http_request *r = c->request;
const char *clear = http_argbyname(r, "clear");
const char *content_type = http_lookup_header(r->headers, "Content-Type");
if (process_settings(s->psession, c->request, c->response) < 0)
return;
-
- sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX
- "<init><status>OK</status><session>%d", sesid);
+
+ response_open(c, "init");
+ wrbuf_printf(c->wrbuf, "<session>%d", sesid);
if (c->server->server_id)
{
- strcat(buf, ".");
- strcat(buf, c->server->server_id);
+ wrbuf_puts(c->wrbuf, ".");
+ wrbuf_puts(c->wrbuf, c->server->server_id);
}
- strcat(buf, "</session>"
- "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>");
- rs->payload = nmem_strdup(c->nmem, buf);
- http_send_response(c);
+ wrbuf_puts(c->wrbuf, "</session>"
+ "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>");
+
+ response_close(c, "init");
}
static void apply_local_setting(void *client_data,
release_session(c, s);
return;
}
- rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<settings><status>OK</status></settings>";
- http_send_response(c);
+ response_open(c, "settings");
+ response_close(c, "settings");
release_session(c, s);
}
-static void cmd_termlist(struct http_channel *c)
+static void termlist_response(struct http_channel *c)
{
- struct http_response *rs = c->response;
struct http_request *rq = c->request;
struct http_session *s = locate_session(c);
const char *name = http_argbyname(rq, "name");
int num = 15;
int status;
- if (!s)
- return;
-
- status = session_active_clients(s->psession);
-
if (nums)
num = atoi(nums);
- wrbuf_rewind(c->wrbuf);
+ status = session_active_clients(s->psession);
- wrbuf_puts(c->wrbuf, "<termlist>\n");
+ response_open_no_status(c, "termlist");
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
perform_termlist(c, s->psession, name, num);
- wrbuf_puts(c->wrbuf, "</termlist>\n");
- rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "termlist");
+ release_session(c, s);
+}
+
+static void termlist_result_ready(void *data)
+{
+ struct http_channel *c = (struct http_channel *) data;
+ yaz_log(c->http_sessions->log_level, "termlist watch released");
+ termlist_response(c);
+}
+
+static void cmd_termlist(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
+ struct http_session *s = locate_session(c);
+ const char *block = http_argbyname(rq, "block");
+ int active_clients;
+ if (!s)
+ return;
+
+ active_clients = session_active_clients(s->psession);
+
+ if (block && !strcmp("1", block) && active_clients)
+ {
+ // if there is already a watch/block. we do not block this one
+ if (session_set_watch(s->psession, SESSION_WATCH_TERMLIST,
+ termlist_result_ready, c, c) != 0)
+ {
+ yaz_log(YLOG_WARN, "Attempt to block multiple times on termlist block. Not supported!");
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist");
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on command termlist", s, s->session_id);
+ }
+ release_session(c, s);
+ return;
+ }
+
+ termlist_response(c);
release_session(c, s);
}
static void cmd_session_status(struct http_channel *c)
{
- struct http_response *rs = c->response;
struct http_session *s = locate_session(c);
if (!s)
return;
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<sessionstatus><status>OK</status>\n");
+ response_open(c, "session-status");
session_status(c, s);
- wrbuf_puts(c->wrbuf, "</sessionstatus>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "session-status");
release_session(c, s);
-
}
int sessions_count(void);
static void cmd_server_status(struct http_channel *c)
{
- struct http_response *rs = c->response;
int sessions = sessions_count();
int clients = clients_count();
int resultsets = resultsets_count();
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<server-status>\n");
- wrbuf_printf(c->wrbuf, " <sessions>%u</sessions>\n", sessions);
+
+ response_open(c, "server-status");
+ wrbuf_printf(c->wrbuf, "\n <sessions>%u</sessions>\n", sessions);
wrbuf_printf(c->wrbuf, " <clients>%u</clients>\n", clients);
/* Only works if yaz has been compiled with enabling of this */
wrbuf_printf(c->wrbuf, " <resultsets>%u</resultsets>\n",resultsets);
}
yaz_mutex_leave(http_sessions->mutex);
*/
- wrbuf_puts(c->wrbuf, "</server-status>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "server-status");
xmalloc_trav(0);
}
-
-static void cmd_bytarget(struct http_channel *c)
-{
- struct http_response *rs = c->response;
- 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);
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<bytarget><status>OK</status>");
-
+ response_open(c, "bytarget");
+ if (count == 0)
+ yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!");
for (i = 0; i < count; i++)
{
wrbuf_puts(c->wrbuf, "\n<target>");
wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+ if (ht[i].diagnostic)
+ {
+ wrbuf_puts(c->wrbuf, "<addinfo>");
+ if (ht[i].addinfo)
+ wrbuf_xmlputs(c->wrbuf, ht[i].addinfo);
+ wrbuf_puts(c->wrbuf, "</addinfo>\n");
+ }
+
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
wrbuf_puts(c->wrbuf, "<state>");
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);
+}
- wrbuf_puts(c->wrbuf, "</bytarget>");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+static void bytarget_result_ready(void *data)
+{
+ struct http_channel *c = (struct http_channel *) data;
+ yaz_log(c->http_sessions->log_level, "bytarget watch released");
+ bytarget_response(c);
+}
+
+
+static void cmd_bytarget(struct http_channel *c)
+{
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
+ struct http_session *s = locate_session(c);
+ const char *block = http_argbyname(rq, "block");
+ int no_active;
+
+ if (!s)
+ return;
+
+ no_active = session_active_clients(s->psession);
+
+ if (block && !strcmp("1",block) && no_active)
+ {
+ // 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(YLOG_WARN, "Attempt to block multiple times on bytarget block. Not supported!");
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget");
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on command bytarget", s, s->session_id);
+ }
+ release_session(c, s);
+ return;
+ }
+ bytarget_response(c);
release_session(c, s);
}
client_get_database(r->client), PZ_NAME);
wrbuf_puts(w, "<location id=\"");
- wrbuf_xmlputs(w, client_get_database(r->client)->database->url);
+ wrbuf_xmlputs(w, client_get_id(r->client));
wrbuf_puts(w, "\" ");
wrbuf_puts(w, "name=\"");
}
else
{
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<record>\n");
- wrbuf_puts(c->wrbuf, "<recid>");
+ response_open_no_status(c, "record");
+ wrbuf_puts(c->wrbuf, "\n<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "</recid>\n");
if (prev_r)
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
write_subrecord(r, c->wrbuf, service, 1);
- wrbuf_puts(c->wrbuf, "</record>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "record");
}
show_single_stop(s->psession, rec);
release_session(c, s);
static void cmd_record_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
+ yaz_log(c->http_sessions->log_level, "record watch released");
cmd_record(c);
}
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
+
}
rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
- wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", active);
+ response_open(c, "show");
+ wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);
wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
wrbuf_printf(c->wrbuf, "<total>" ODR_INT_PRINTF "</total>\n", total_hits);
wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
show_range_stop(s->psession, rl);
- wrbuf_puts(c->wrbuf, "</show>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "show");
release_session(c, s);
}
static void show_records_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
+ yaz_log(c->http_sessions->log_level, "show watch released");
show_records(c, -1);
}
+int show_count = 0;
+
static void cmd_show(struct http_channel *c)
{
- struct http_request *rq = c->request;
+ struct http_request *rq = c->request;
+ struct http_response *rs = c->response;
struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
+ const char *sort = http_argbyname(rq, "sort");
+ struct reclist_sortparms *sp;
int status;
if (!s)
return;
+ if (!sort)
+ sort = "relevance";
+
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+ {
+ error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
+ release_session(c, s);
+ return;
+ }
+ session_sort(s->psession, sp->name, sp->increasing);
+
status = session_active_clients(s->psession);
if (block)
{
// 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)
+ 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);
+ "%p Session %u: Blocking on command show (preferred targets)", s, s->session_id);
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Attempt to block multiple times on show (preferred targets) block. Not supported!");
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)");
}
release_session(c, s);
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,
- show_records_ready, c, c) != 0)
+ show_records_ready, c, c) != 0
+// || (++show_count % 6 == 0)
+ )
{
- yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id);
+ yaz_log(YLOG_WARN, "Attempt to block multiple times on show block. Not supported!");
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "show");
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on command show", s, s->session_id);
}
release_session(c, s);
return;
static void cmd_ping(struct http_channel *c)
{
- struct http_response *rs = c->response;
struct http_session *s = locate_session(c);
if (!s)
return;
- rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<ping><status>OK</status></ping>";
- http_send_response(c);
+ response_open(c, "ping");
+ response_close(c, "ping");
release_session(c, s);
}
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);
release_session(c, s);
return;
}
- rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<search><status>OK</status></search>";
- http_send_response(c);
+ response_open(c, "search");
+ response_close(c, "search");
release_session(c, s);
}
static void cmd_stat(struct http_channel *c)
{
- struct http_response *rs = c->response;
struct http_session *s = locate_session(c);
struct statistics stat;
int clients;
progress = (stat.num_clients - clients) / (float)stat.num_clients;
}
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<stat>");
+ response_open_no_status(c, "stat");
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", stat.num_records);
wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
wrbuf_printf(c->wrbuf, "<progress>%.2f</progress>\n", progress);
- wrbuf_puts(c->wrbuf, "</stat>");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "stat");
release_session(c, s);
}
static void cmd_info(struct http_channel *c)
{
char yaz_version_str[20];
- struct http_response *rs = c->response;
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<info>\n");
+ response_open_no_status(c, "info");
wrbuf_puts(c->wrbuf, " <version>\n");
wrbuf_puts(c->wrbuf, " <pazpar2");
#ifdef PAZPAR2_VERSION_SHA1
wrbuf_xmlputs(c->wrbuf, VERSION);
wrbuf_puts(c->wrbuf, "</pazpar2>");
-
yaz_version(yaz_version_str, 0);
wrbuf_puts(c->wrbuf, " <yaz compiled=\"");
wrbuf_xmlputs(c->wrbuf, YAZ_VERSION);
info_services(c->server, c->wrbuf);
- wrbuf_puts(c->wrbuf, "</info>");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "info");
}
struct {