X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=ffe6b6d853fedbf3ccdffe737e2cc54f3ead3563;hb=ee0c5796c67648c25249bf34c035d512f98e87b4;hp=7f7f98a7948ba0104ae80e7785dca71ca018e84b;hpb=69277f297f927ad4639025ce4f58460ffd548bdf;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 7f7f98a..ffe6b6d 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -126,7 +126,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;
}
@@ -199,7 +199,7 @@ void http_session_destroy(struct http_session *s)
{ /* 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);
}
@@ -229,6 +229,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 }
};
@@ -320,8 +321,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;
@@ -508,7 +509,7 @@ static void cmd_settings(struct http_channel *c)
release_session(c, s);
}
-static void cmd_termlist(struct http_channel *c)
+static void termlist_response(struct http_channel *c)
{
struct http_request *rq = c->request;
struct http_session *s = locate_session(c);
@@ -517,14 +518,11 @@ static void cmd_termlist(struct http_channel *c)
int num = 15;
int status;
- if (!s)
- return;
-
- status = session_active_clients(s->psession);
-
if (nums)
num = atoi(nums);
+ status = session_active_clients(s->psession);
+
response_open_no_status(c, "termlist");
wrbuf_printf(c->wrbuf, "%d\n", status);
@@ -534,6 +532,46 @@ static void cmd_termlist(struct http_channel *c)
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);
+}
+
size_t session_get_memory_status(struct session *session);
static void session_status(struct http_channel *c, struct http_session *s)
@@ -600,20 +638,17 @@ static void cmd_server_status(struct http_channel *c)
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");
-
+ if (count == 0)
+ yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!");
for (i = 0; i < count; i++)
{
wrbuf_puts(c->wrbuf, "\n");
@@ -642,12 +677,58 @@ 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");
release_session(c, s);
}
+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);
+}
+
static void write_metadata(WRBUF w, struct conf_service *service,
struct record_metadata **ml, int full)
{
@@ -696,7 +777,7 @@ static void write_subrecord(struct record *r, WRBUF w,
client_get_database(r->client), PZ_NAME);
wrbuf_puts(w, "client)->database->url);
+ wrbuf_xmlputs(w, client_get_id(r->client));
wrbuf_puts(w, "\" ");
wrbuf_puts(w, "name=\"");
@@ -860,7 +941,7 @@ static void cmd_record(struct http_channel *c)
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);
}
@@ -898,6 +979,7 @@ static void show_records(struct http_channel *c, int active)
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
+
}
@@ -941,20 +1023,34 @@ static void show_records(struct http_channel *c, int active)
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);
}
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)
@@ -963,22 +1059,32 @@ 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);
+ "%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)
{
- 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;
@@ -1025,8 +1131,8 @@ static void cmd_search(struct http_channel *c)
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);
@@ -1035,7 +1141,6 @@ static void cmd_search(struct http_channel *c)
}
response_open(c, "search");
response_close(c, "search");
- http_send_response(c);
release_session(c, s);
}