X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=8887e91e3dc2323561dc582ed604590cfac559a7;hb=51616c6be3de7b3818379384e2e23600fd4e01c8;hp=436d4e160396a42138a16da4980fe2927005d291;hpb=60c3cfd002b4e1f2dc17432ced13a804c7fe8e21;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 436d4e1..8887e91 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 Index Data
+ Copyright (C) 2006-2012 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@ -49,16 +49,16 @@ void print_meminfo(WRBUF wrbuf)
struct mallinfo minfo;
minfo = mallinfo();
wrbuf_printf(wrbuf, " \n"
- " %d\n"
+ " %d\n"
" %d\n"
" %d\n"
" %d\n"
" %d\n"
- " %d\n"
+ " %d\n"
" %d\n"
" %d\n"
" %d\n"
- " \n",
+ " \n",
minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
}
@@ -93,6 +93,16 @@ struct http_sessions {
static YAZ_MUTEX g_http_session_mutex = 0;
static int g_http_sessions = 0;
+int get_version(struct http_request *rq) {
+ const char *version = http_argbyname(rq, "version");
+ int version_no = 0;
+ if (version && strcmp(version, "")) {
+ version_no = atoi(version);
+ }
+ return version_no;
+}
+
+
int http_session_use(int delta)
{
int sessions;
@@ -126,7 +136,7 @@ void http_sessions_destroy(http_sessions_t hs)
{
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;
}
@@ -166,7 +176,7 @@ struct http_session *http_session_create(struct conf_service *service,
r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
iochan_setdata(r->timeout_iochan, r);
- yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout);
+ yaz_log(http_sessions->log_level, "Session %u created. timeout chan=%p timeout=%d", sesid, r->timeout_iochan, service->session_timeout);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
iochan_add(service->server->iochan_man, r->timeout_iochan);
@@ -180,7 +190,7 @@ void http_session_destroy(struct http_session *s)
http_sessions_t http_sessions = s->http_sessions;
- yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
+ yaz_log(http_sessions->log_level, "Session %u destroy", s->session_id);
yaz_mutex_enter(http_sessions->mutex);
/* only if http_session has no active http sessions on it can be destroyed */
if (s->destroy_counter == s->activity_counter)
@@ -197,15 +207,15 @@ void http_session_destroy(struct http_session *s)
yaz_mutex_leave(http_sessions->mutex);
if (must_destroy)
{ /* destroying for real */
- yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
+ yaz_log(http_sessions->log_level, "Session %u destroyed", s->session_id);
iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
+ session_destroy(s->psession);
http_session_use(-1);
nmem_destroy(s->nmem);
}
else {
- yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed delayed. Active clients (%d-%d). Waiting for new timeout.",
- s, s->session_id, s->activity_counter, s->destroy_counter);
+ yaz_log(http_sessions->log_level, "Session %u destroying delayed. Active clients (%d-%d). Waiting for new timeout.",
+ s->session_id, s->activity_counter, s->destroy_counter);
}
}
@@ -229,6 +239,7 @@ static const char *get_msg(enum pazpar2_error_code code)
{ 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 }
};
@@ -242,7 +253,7 @@ static const char *get_msg(enum pazpar2_error_code code)
return "No error";
}
-static void error(struct http_response *rs,
+static void error(struct http_response *rs,
enum pazpar2_error_code code,
const char *addinfo)
{
@@ -250,7 +261,7 @@ static void error(struct http_response *rs,
WRBUF text = wrbuf_alloc();
const char *http_status = "417";
const char *msg = get_msg(code);
-
+
rs->msg = nmem_strdup(c->nmem, msg);
strcpy(rs->code, http_status);
@@ -267,6 +278,28 @@ static void error(struct http_response *rs,
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, "OK");
+}
+
+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 */
@@ -287,7 +320,7 @@ unsigned int make_sessionid(void)
yaz_log(YLOG_WARN|YLOG_ERRNO, "gettimeofday");
exit(1);
}
- /* at most 256 sessions per second ..
+ /* at most 256 sessions per second ..
(long long would be more appropriate)*/
res = t.tv_sec;
res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
@@ -298,8 +331,8 @@ unsigned int make_sessionid(void)
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;
@@ -368,18 +401,15 @@ static int process_settings(struct session *se, struct http_request *rq,
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 "OK");
- 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");
@@ -387,8 +417,8 @@ static void cmd_init(struct http_channel *c)
struct http_session *s;
struct http_response *rs = c->response;
struct conf_service *service = 0; /* no service (yet) */
-
- if (r->content_len && content_type &&
+
+ if (r->content_len && content_type &&
!yaz_strcmp_del("text/xml", content_type, "; "))
{
xmlDoc *doc = xmlParseMemory(r->content_buf, r->content_len);
@@ -407,7 +437,7 @@ static void cmd_init(struct http_channel *c)
return;
}
}
-
+
if (!service)
{
const char *service_name = http_argbyname(c->request, "service");
@@ -420,27 +450,29 @@ static void cmd_init(struct http_channel *c)
}
sesid = make_sessionid();
s = http_session_create(service, c->http_sessions, sesid);
-
- yaz_log(c->http_sessions->log_level, "%p Session init %u ", s, sesid);
+
+ yaz_log(c->http_sessions->log_level, "Session init %u ", sesid);
if (!clear || *clear == '0')
session_init_databases(s->psession);
else
- yaz_log(YLOG_LOG, "HTTP Session %u init: No databases preloaded", sesid);
-
+ yaz_log(YLOG_LOG, "Session %u init: No databases preloaded", sesid);
+
if (process_settings(s->psession, c->request, c->response) < 0)
return;
-
- sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX
- "OK%d", sesid);
+
+ response_open(c, "init");
+ wrbuf_printf(c->wrbuf, "%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, ""
- "" PAZPAR2_PROTOCOL_VERSION "");
- rs->payload = nmem_strdup(c->nmem, buf);
- http_send_response(c);
+ wrbuf_puts(c->wrbuf, ""
+ "" PAZPAR2_PROTOCOL_VERSION "");
+
+ wrbuf_printf(c->wrbuf, "%d\n", 1000 * ((s->psession->service->session_timeout >= 20) ?
+ (s->psession->service->session_timeout - 10) : 50));
+ response_close(c, "init");
}
static void apply_local_setting(void *client_data,
@@ -463,165 +495,131 @@ static void cmd_settings(struct http_channel *c)
if (!s)
return;
- if (rq->content_len && content_type &&
+ if (rq->content_len && content_type &&
!yaz_strcmp_del("text/xml", content_type, "; "))
{
xmlDoc *doc = xmlParseMemory(rq->content_buf, rq->content_len);
xmlNode *root_n;
+ int ret;
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ release_session(c,s);
return;
}
root_n = xmlDocGetRootElement(doc);
-
- settings_read_node_x(root_n, s->psession, apply_local_setting);
-
+ ret = settings_read_node_x(root_n, s->psession, apply_local_setting);
xmlFreeDoc(doc);
+ if (ret)
+ {
+ error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ release_session(c,s);
+ return;
+ }
}
if (process_settings(s->psession, rq, rs) < 0)
{
release_session(c, s);
return;
}
- rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK";
- http_send_response(c);
+ response_open(c, "settings");
+ response_close(c, "settings");
release_session(c, s);
}
-// Compares two hitsbytarget nodes by hitcount
-static int cmp_ht(const void *p1, const void *p2)
+static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status)
{
- const struct hitsbytarget *h1 = p1;
- const struct hitsbytarget *h2 = p2;
- return h2->hits - h1->hits;
-}
+ struct http_request *rq = c->request;
+ const char *name = http_argbyname(rq, "name");
+ const char *nums = http_argbyname(rq, "num");
+ int version = get_version(rq);
+ int num = 15;
+ int status;
-// This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static int targets_termlist(WRBUF wrbuf, struct session *se, int num,
- NMEM nmem)
-{
- struct hitsbytarget *ht;
- int count, i;
+ if (nums)
+ num = atoi(nums);
- ht = hitsbytarget(se, &count, nmem);
- qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
- for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
- {
+ status = session_active_clients(s->psession);
- // do only print terms which have display names
-
- wrbuf_puts(wrbuf, "\n");
-
- wrbuf_puts(wrbuf, "");
- wrbuf_xmlputs(wrbuf, ht[i].id);
- wrbuf_puts(wrbuf, "\n");
-
- wrbuf_puts(wrbuf, "");
- if (!ht[i].name || !ht[i].name[0])
- wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
- else
- wrbuf_xmlputs(wrbuf, ht[i].name);
- wrbuf_puts(wrbuf, "\n");
-
- wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n",
- ht[i].hits);
-
- wrbuf_puts(wrbuf, "");
- wrbuf_xmlputs(wrbuf, ht[i].state);
- wrbuf_puts(wrbuf, "\n");
-
- wrbuf_printf(wrbuf, "%d\n",
- ht[i].diagnostic);
- wrbuf_puts(wrbuf, "\n");
+ response_open_no_status(c, "termlist");
+ /* new protocol add a status to response. Triggered by a status parameter */
+ if (cmd_status != 0) {
+ wrbuf_printf(c->wrbuf, "%s\n", cmd_status);
}
- return count;
+ wrbuf_printf(c->wrbuf, "%d\n", status);
+
+ perform_termlist(c, s->psession, name, num, version);
+
+ response_close(c, "termlist");
}
-static void cmd_termlist(struct http_channel *c)
+static void termlist_result_ready(void *data)
{
- struct http_response *rs = c->response;
+ struct http_channel *c = (struct http_channel *) data;
struct http_request *rq = c->request;
+ const char *report = http_argbyname(rq, "report");
+ const char *status = 0;
struct http_session *s = locate_session(c);
- const char *name = http_argbyname(rq, "name");
- const char *nums = http_argbyname(rq, "num");
- int num = 15;
- int status;
- WRBUF debug_log = 0;
+ if (report && !strcmp("status", report))
+ status = "OK";
+ if (s) {
+ yaz_log(c->http_sessions->log_level, "Session %u termlist watch released", s->session_id);
+ termlist_response(c, s, status);
+ release_session(c,s);
+ }
+}
+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");
+ const char *report = http_argbyname(rq, "report");
+ int report_status = 0;
+ int report_error = 0;
+ const char *status_message = 0;
+ int active_clients;
+ if (report && !strcmp("error", report)) {
+ report_error = 1;
+ status_message = "OK";
+ }
+ if (report && !strcmp("status", report)) {
+ report_status = 1;
+ status_message = "OK";
+ }
if (!s)
return;
- status = session_active_clients(s->psession);
-
- if (!name)
- name = "subject";
- if (strlen(name) > 255)
- return;
- if (nums)
- num = atoi(nums);
-
- debug_log = wrbuf_alloc();
-
- wrbuf_rewind(c->wrbuf);
-
- wrbuf_puts(c->wrbuf, "\n");
- wrbuf_printf(c->wrbuf, "%d\n", status);
- while (*name)
+ active_clients = session_active_clients(s->psession);
+ if (block && !strcmp("1", block) && active_clients)
{
- char tname[256];
- const char *tp;
-
- if (!(tp = strchr(name, ',')))
- tp = name + strlen(name);
- strncpy(tname, name, tp - name);
- tname[tp - name] = '\0';
- wrbuf_puts(c->wrbuf, "wrbuf, tname);
- wrbuf_puts(c->wrbuf, "\">\n");
- if (!strcmp(tname, "xtargets"))
+ // 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)
{
- int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem);
- wrbuf_printf(debug_log, " xtargets: %d", targets);
+ yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on termlist block. Not supported!", s->session_id);
+ if (report_error) {
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist");
+ release_session(c, s);
+ return;
+ }
+ else if (report_status) {
+ status_message = "WARNING (Already blocked on termlist)";
+ }
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring termlist block. Return current result", s->session_id);
+ }
}
else
{
- int len;
- struct termlist_score **p =
- get_termlist_score(s->psession, tname, &len);
- if (p && len)
- wrbuf_printf(debug_log, " %s: %d", tname, len);
- if (p)
- {
- int i;
- for (i = 0; i < len && i < num; i++)
- {
- // prevnt sending empty term elements
- if (!p[i]->term || !p[i]->term[0])
- continue;
-
- wrbuf_puts(c->wrbuf, "");
- wrbuf_puts(c->wrbuf, "");
- wrbuf_xmlputs(c->wrbuf, p[i]->term);
- wrbuf_puts(c->wrbuf, "");
-
- wrbuf_printf(c->wrbuf,
- "%d",
- p[i]->frequency);
- wrbuf_puts(c->wrbuf, "\n");
- }
- }
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command termlist", s->session_id);
+ release_session(c, s);
+ return;
}
- wrbuf_puts(c->wrbuf, "
\n");
- name = tp;
- if (*name == ',')
- name++;
}
- wrbuf_puts(c->wrbuf, "\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);
+
+ termlist_response(c, s, status_message);
release_session(c, s);
}
@@ -638,19 +636,14 @@ static void session_status(struct http_channel *c, struct http_session *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 "OK\n");
+ response_open(c, "session-status");
session_status(c, s);
- wrbuf_puts(c->wrbuf, "\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);
@@ -663,13 +656,12 @@ int resultsets_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 "\n");
- wrbuf_printf(c->wrbuf, " %u\n", sessions);
+
+ response_open(c, "server-status");
+ wrbuf_printf(c->wrbuf, "\n %u\n", sessions);
wrbuf_printf(c->wrbuf, " %u\n", clients);
/* Only works if yaz has been compiled with enabling of this */
wrbuf_printf(c->wrbuf, " %u\n",resultsets);
@@ -693,28 +685,28 @@ static void cmd_server_status(struct http_channel *c)
}
yaz_mutex_leave(http_sessions->mutex);
*/
- wrbuf_puts(c->wrbuf, "\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, struct http_session *s, const char *cmd_status) {
+ int count, i;
struct hitsbytarget *ht;
+ struct http_request *rq = c->request;
const char *settings = http_argbyname(rq, "settings");
- int count, i;
-
- if (!s)
- return;
- ht = hitsbytarget(s->psession, &count, c->nmem);
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK");
+ int version = get_version(rq);
+ ht = get_hitsbytarget(s->psession, &count, c->nmem);
+ if (!cmd_status)
+ /* Old protocol, always ok */
+ response_open(c, "bytarget");
+ else {
+ /* New protocol, OK or WARNING (...)*/
+ response_open_no_status(c, "bytarget");
+ wrbuf_printf(c->wrbuf, "%s", cmd_status);
+ }
+ if (count == 0)
+ yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!");
for (i = 0; i < count; i++)
{
wrbuf_puts(c->wrbuf, "\n");
@@ -723,7 +715,7 @@ static void cmd_bytarget(struct http_channel *c)
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "\n");
- if (ht[i].name && ht[i].name[0])
+ if (ht[i].name && ht[i].name[0])
{
wrbuf_puts(c->wrbuf, "");
wrbuf_xmlputs(c->wrbuf, ht[i].name);
@@ -732,8 +724,19 @@ static void cmd_bytarget(struct http_channel *c)
wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic);
- wrbuf_printf(c->wrbuf, "%d\n", ht[i].records);
+ if (ht[i].diagnostic)
+ {
+ wrbuf_puts(c->wrbuf, "");
+ if (ht[i].addinfo)
+ wrbuf_xmlputs(c->wrbuf, ht[i].addinfo);
+ wrbuf_puts(c->wrbuf, "\n");
+ }
+ wrbuf_printf(c->wrbuf, "%d\n", ht[i].records - ht[i].filtered);
+ if (version >= 2) {
+ wrbuf_printf(c->wrbuf, "%d\n", ht[i].filtered);
+ wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", ht[i].approximation);
+ }
wrbuf_puts(c->wrbuf, "");
wrbuf_xmlputs(c->wrbuf, ht[i].state);
wrbuf_puts(c->wrbuf, "\n");
@@ -743,17 +746,87 @@ static void cmd_bytarget(struct http_channel *c)
wrbuf_puts(c->wrbuf, ht[i].settings_xml);
wrbuf_puts(c->wrbuf, "\n");
}
+ if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) {
+ wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, ht[i].suggestions_xml);
+ wrbuf_puts(c->wrbuf, "");
+ }
wrbuf_puts(c->wrbuf, "");
}
+ response_close(c, "bytarget");
+}
- wrbuf_puts(c->wrbuf, "");
- 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;
+ struct http_session *s = locate_session(c);
+ const char *status_message = "OK";
+ if (s) {
+ yaz_log(c->http_sessions->log_level, "Session %u: bytarget watch released", s->session_id);
+ bytarget_response(c, s, status_message);
+ release_session(c, s);
+ }
+ else {
+ yaz_log(c->http_sessions->log_level, "No Session found for released bytarget watch");
+ }
+}
+
+
+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");
+ const char *report = http_argbyname(rq, "report");
+ int report_error = 0;
+ int report_status = 0;
+ const char *status_message = "OK";
+ int no_active;
+
+ if (report && !strcmp("error", report)) {
+ report_error = 1;
+ }
+ if (report && !strcmp("status", report)) {
+ report_status = 1;
+ }
+
+ 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, "Session %u: Attempt to block multiple times on bytarget block. Not supported!", s->session_id);
+ if (report_error) {
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget");
+ release_session(c, s);
+ return;
+ }
+ else if (report_status) {
+ status_message = "WARNING (Already blocked on bytarget)";
+ }
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring bytarget block. Return current result.", s->session_id);
+ }
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command bytarget", s->session_id);
+ release_session(c, s);
+ return;
+ }
+ }
+ bytarget_response(c, s, status_message);
release_session(c, s);
}
static void write_metadata(WRBUF w, struct conf_service *service,
- struct record_metadata **ml, int full)
+ struct record_metadata **ml, int full, int indent)
{
int imeta;
@@ -766,7 +839,10 @@ static void write_metadata(WRBUF w, struct conf_service *service,
for (md = ml[imeta]; md; md = md->next)
{
struct record_metadata_attr *attr = md->attributes;
- wrbuf_printf(w, "\nname);
+ int i;
+ for (i = 0; i < indent; i++)
+ wrbuf_putc(w, ' ');
+ wrbuf_printf(w, "name);
for (; attr; attr = attr->next)
{
@@ -787,8 +863,9 @@ static void write_metadata(WRBUF w, struct conf_service *service,
break;
default:
wrbuf_puts(w, "[can't represent]");
+ break;
}
- wrbuf_printf(w, "", cmd->name);
+ wrbuf_printf(w, "\n", cmd->name);
}
}
}
@@ -799,16 +876,20 @@ static void write_subrecord(struct record *r, WRBUF w,
const char *name = session_setting_oneval(
client_get_database(r->client), PZ_NAME);
- wrbuf_puts(w, "client)->database->url);
- wrbuf_puts(w, "\" ");
+ wrbuf_puts(w, " client));
+ wrbuf_puts(w, "\"\n");
- wrbuf_puts(w, "name=\"");
+ wrbuf_puts(w, " name=\"");
wrbuf_xmlputs(w, *name ? name : "Unknown");
- wrbuf_puts(w, "\">");
+ wrbuf_puts(w, "\" ");
+
+ wrbuf_puts(w, "checksum=\"");
+ wrbuf_printf(w, "%u", r->checksum);
+ wrbuf_puts(w, "\">\n");
- write_metadata(w, service, r->metadata, show_details);
- wrbuf_puts(w, "\n");
+ write_metadata(w, service, r->metadata, show_details, 2);
+ wrbuf_puts(w, " \n");
}
static void show_raw_record_error(void *data, const char *addinfo)
@@ -860,18 +941,17 @@ void show_raw_reset(void *data, struct http_channel *c, void *data2)
static void cmd_record_ready(void *data);
-static void cmd_record(struct http_channel *c)
+static void show_record(struct http_channel *c, struct http_session *s)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
- struct http_session *s = locate_session(c);
struct record_cluster *rec, *prev_r, *next_r;
- struct record *r;
struct conf_service *service;
const char *idstr = http_argbyname(rq, "id");
const char *offsetstr = http_argbyname(rq, "offset");
const char *binarystr = http_argbyname(rq, "binary");
-
+ const char *checksumstr = http_argbyname(rq, "checksum");
+
if (!s)
return;
service = s->psession->service;
@@ -892,39 +972,50 @@ static void cmd_record(struct http_channel *c)
{
error(rs, PAZPAR2_RECORD_MISSING, idstr);
}
- release_session(c, s);
return;
}
- if (offsetstr)
+ if (offsetstr || checksumstr)
{
- int offset = atoi(offsetstr);
const char *syntax = http_argbyname(rq, "syntax");
const char *esn = http_argbyname(rq, "esn");
int i;
struct record*r = rec->records;
int binary = 0;
+ const char *nativesyntax = http_argbyname(rq, "nativesyntax");
if (binarystr && *binarystr != '0')
binary = 1;
- for (i = 0; i < offset && r; r = r->next, i++)
- ;
- if (!r)
+ if (checksumstr)
{
- error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
+ long v = atol(checksumstr);
+ for (i = 0; r; r = r->next)
+ if (v == r->checksum)
+ break;
+ if (!r)
+ error(rs, PAZPAR2_RECORD_FAIL, "no record");
}
else
{
+ int offset = atoi(offsetstr);
+ for (i = 0; i < offset && r; r = r->next, i++)
+ ;
+ if (!r)
+ error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
+ }
+ if (r)
+ {
http_channel_observer_t obs =
http_add_observer(c, r->client, show_raw_reset);
int ret = client_show_raw_begin(r->client, r->position,
- syntax, esn,
- obs /* data */,
- show_raw_record_error,
- (binary ?
- show_raw_record_ok_binary :
- show_raw_record_ok),
- (binary ? 1 : 0));
+ syntax, esn,
+ obs /* data */,
+ show_raw_record_error,
+ (binary ?
+ show_raw_record_ok_binary :
+ show_raw_record_ok),
+ (binary ? 1 : 0),
+ nativesyntax);
if (ret == -1)
{
http_remove_observer(obs);
@@ -934,58 +1025,72 @@ static void cmd_record(struct http_channel *c)
}
else
{
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n");
- wrbuf_puts(c->wrbuf, "");
+ struct record *r;
+ response_open_no_status(c, "record");
+ wrbuf_puts(c->wrbuf, "\n ");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "\n");
if (prev_r)
{
- wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, prev_r->recid);
wrbuf_puts(c->wrbuf, "\n");
}
if (next_r)
{
- wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, next_r->recid);
wrbuf_puts(c->wrbuf, "\n");
}
- wrbuf_printf(c->wrbuf, "%d\n",
+ wrbuf_printf(c->wrbuf, " %d\n",
session_active_clients(s->psession));
- write_metadata(c->wrbuf, service, rec->metadata, 1);
+ write_metadata(c->wrbuf, service, rec->metadata, 1, 1);
for (r = rec->records; r; r = r->next)
- write_subrecord(r, c->wrbuf, service, 1);
- wrbuf_puts(c->wrbuf, "\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ write_subrecord(r, c->wrbuf, service, 2);
+ 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;
+ struct http_session *s = locate_session(c);
+ if (s) {
+ yaz_log(c->http_sessions->log_level, "Session %u: record watch released", s->session_id);
+ show_record(c, s);
+ release_session(c,s);
+ }
+}
- cmd_record(c);
+static void cmd_record(struct http_channel *c)
+{
+ struct http_session *s = locate_session(c);
+ if (s) {
+ show_record(c, s);
+ release_session(c,s);
+ }
}
-static void show_records(struct http_channel *c, int active)
+
+static void show_records(struct http_channel *c, struct http_session *s, int active)
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
- struct http_session *s = locate_session(c);
struct record_cluster **rl;
struct reclist_sortparms *sp;
const char *start = http_argbyname(rq, "start");
const char *num = http_argbyname(rq, "num");
const char *sort = http_argbyname(rq, "sort");
+ int version = get_version(rq);
+
int startn = 0;
int numn = 20;
int total;
Odr_int total_hits;
+ Odr_int approx_hits;
int i;
-
+ struct conf_service *service = 0;
if (!s)
return;
@@ -997,23 +1102,27 @@ static void show_records(struct http_channel *c, int active)
startn = atoi(start);
if (num)
numn = atoi(num);
- if (!sort)
- sort = "relevance";
- if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+
+ service = s->psession->service;
+ if (!sort) {
+ sort = service->default_sort;
+ }
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
{
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
- release_session(c, s);
return;
+
}
-
- rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
+ rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits, &approx_hits);
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\nOK\n");
- wrbuf_printf(c->wrbuf, "%d\n", active);
+ response_open(c, "show");
+ wrbuf_printf(c->wrbuf, "\n%d\n", active);
wrbuf_printf(c->wrbuf, "%d\n", total);
wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", total_hits);
+ if (version >= 2) {
+ wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", approx_hits);
+ }
wrbuf_printf(c->wrbuf, "%d\n", startn);
wrbuf_printf(c->wrbuf, "%d\n", numn);
@@ -1025,15 +1134,23 @@ static void show_records(struct http_channel *c, int active)
struct conf_service *service = s->psession->service;
wrbuf_puts(c->wrbuf, "\n");
- write_metadata(c->wrbuf, service, rec->metadata, 0);
+ write_metadata(c->wrbuf, service, rec->metadata, 0, 1);
for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++)
write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
- if (ccount > 1)
- wrbuf_printf(c->wrbuf, "%d\n", ccount);
+ wrbuf_printf(c->wrbuf, " %d\n", ccount);
if (strstr(sort, "relevance"))
- wrbuf_printf(c->wrbuf, "%d\n",
+ {
+ wrbuf_printf(c->wrbuf, " %d\n",
rec->relevance_score);
- wrbuf_puts(c->wrbuf, "");
+ if (service->rank_debug)
+ {
+ wrbuf_printf(c->wrbuf, " \n");
+ wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain1));
+ wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain2));
+ wrbuf_printf(c->wrbuf, " \n");
+ }
+ }
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, "\n");
@@ -1041,29 +1158,55 @@ static void show_records(struct http_channel *c, int active)
show_range_stop(s->psession, rl);
- wrbuf_puts(c->wrbuf, "\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
- release_session(c, s);
+ response_close(c, "show");
}
static void show_records_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
- show_records(c, -1);
+ struct http_session *s = locate_session(c);
+ if (s) {
+ yaz_log(c->http_sessions->log_level, "Session %u: show watch released", s->session_id);
+ show_records(c, s, -1);
+ }
+ else {
+ /* some error message */
+ }
+ release_session(c,s);
}
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");
- int status;
+ const char *sort = http_argbyname(rq, "sort");
+ const char *block_error = http_argbyname(rq, "report");
+ struct conf_service *service = 0;
+ struct reclist_sortparms *sp;
+ int status;
+ int report_error = 0;
+ if (block_error && !strcmp("1", block_error)) {
+ report_error = 1;
+ }
if (!s)
return;
+ service = s->psession->service;
+ if (!sort) {
+ sort = service->default_sort;
+ }
+
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
+ {
+ error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
+ release_session(c, s);
+ return;
+ }
+ session_sort(s->psession, sp);
+
status = session_active_clients(s->psession);
if (block)
@@ -1072,39 +1215,63 @@ static void cmd_show(struct http_channel *c)
{
// 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);
+ "Session %u: Blocking on command show (preferred targets)", s->session_id);
+ release_session(c, s);
+ return;
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show (preferred targets) block. Not supported!",
+ s->session_id);
+ if (report_error) {
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)");
+ release_session(c, s);
+ return;
+ }
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring show(preferred) block. Returning current result.", s->session_id);
+ }
}
- 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)
{
- yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id);
+ yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show block. Not supported!", s->session_id);
+ if (report_error) {
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "show");
+ release_session(c, s);
+ return;
+ }
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring show block. Returning current result.", s->session_id);
+ }
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command show", s->session_id);
+ release_session(c, s);
+ return;
}
- release_session(c, s);
- return;
}
}
- show_records(c, status);
+ show_records(c, s, status);
release_session(c, s);
}
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 "OK";
- http_send_response(c);
+ response_open(c, "ping");
+ response_close(c, "ping");
release_session(c, s);
}
@@ -1117,11 +1284,16 @@ static void cmd_search(struct http_channel *c)
const char *filter = http_argbyname(rq, "filter");
const char *maxrecs = http_argbyname(rq, "maxrecs");
const char *startrecs = http_argbyname(rq, "startrecs");
+ const char *limit = http_argbyname(rq, "limit");
+ const char *sort = http_argbyname(rq, "sort");
enum pazpar2_error_code code;
const char *addinfo = 0;
+ struct reclist_sortparms *sp;
+ struct conf_service *service = 0;
if (!s)
return;
+
if (!query)
{
error(rs, PAZPAR2_MISSING_PARAMETER, "query");
@@ -1134,22 +1306,33 @@ static void cmd_search(struct http_channel *c)
release_session(c, s);
return;
}
- code = search(s->psession, query, startrecs, maxrecs, filter, &addinfo);
+ service = s->psession->service;
+ if (!sort) {
+ sort = service->default_sort;
+ }
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
+ {
+ error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
+ release_session(c, s);
+ return;
+ }
+
+ code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
+ &addinfo, sp);
if (code)
{
error(rs, code, addinfo);
release_session(c, s);
return;
}
- rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK";
- 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;
@@ -1167,8 +1350,7 @@ static void cmd_stat(struct http_channel *c)
progress = (stat.num_clients - clients) / (float)stat.num_clients;
}
- wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "");
+ response_open_no_status(c, "stat");
wrbuf_printf(c->wrbuf, "%d\n", clients);
wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", stat.num_hits);
wrbuf_printf(c->wrbuf, "%d\n", stat.num_records);
@@ -1180,19 +1362,15 @@ static void cmd_stat(struct http_channel *c)
wrbuf_printf(c->wrbuf, "%d\n", stat.num_failed);
wrbuf_printf(c->wrbuf, "%d\n", stat.num_error);
wrbuf_printf(c->wrbuf, "\n", progress);
- wrbuf_puts(c->wrbuf, "");
- 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 "\n");
+ response_open_no_status(c, "info");
wrbuf_puts(c->wrbuf, " \n");
wrbuf_puts(c->wrbuf, " wrbuf, VERSION);
wrbuf_puts(c->wrbuf, "");
-
yaz_version(yaz_version_str, 0);
wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION);
@@ -1211,12 +1388,10 @@ static void cmd_info(struct http_channel *c)
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, " \n");
-
+
info_services(c->server, c->wrbuf);
- wrbuf_puts(c->wrbuf, "");
- rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
- http_send_response(c);
+ response_close(c, "info");
}
struct {