X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=854de136f9ad8a83b7ee732284427d725b75de8d;hb=6d01755305a7afba15ed4bc90ac9c149ee7d130e;hp=a4f7405b5905d7294ab80389761af815921a77e7;hpb=44981e9f52420f6a42bb1ac55712f74a31d17020;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index a4f7405..854de13 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
@@ -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;
}
@@ -166,7 +166,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 +180,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 +197,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 +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;
@@ -440,11 +441,11 @@ 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;
@@ -490,6 +491,7 @@ static void cmd_settings(struct http_channel *c)
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ release_session(c,s);
return;
}
root_n = xmlDocGetRootElement(doc);
@@ -508,29 +510,68 @@ 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_session *s)
{
struct http_request *rq = c->request;
- 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;
- 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);
perform_termlist(c, s->psession, name, num);
response_close(c, "termlist");
+}
+
+static void termlist_result_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 termlist watch released", s->session_id);
+ termlist_response(c, s);
+ 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");
+ 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, "Session %u: Attempt to block multiple times on termlist block. Not supported!", s->session_id);
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist");
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command termlist", s->session_id);
+ }
+ release_session(c, s);
+ return;
+ }
+
+ termlist_response(c, s);
release_session(c, s);
}
@@ -600,20 +641,16 @@ 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, struct http_session *s) {
+ 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 = 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");
@@ -631,6 +668,14 @@ 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);
+ 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);
wrbuf_puts(c->wrbuf, "");
@@ -642,9 +687,61 @@ 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");
+}
+
+static void bytarget_result_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: bytarget watch released", s->session_id);
+ bytarget_response(c, s);
+ 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");
+ 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, "Session %u: Attempt to block multiple times on bytarget block. Not supported!", s->session_id);
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget");
+ }
+ 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);
release_session(c, s);
}
@@ -683,6 +780,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
break;
default:
wrbuf_puts(w, "[can't represent]");
+ break;
}
wrbuf_printf(w, "", cmd->name);
}
@@ -696,7 +794,7 @@ static void write_subrecord(struct record *r, WRBUF w,
client_get_database(r->client), PZ_NAME);
wrbuf_puts(w, "client));
+ wrbuf_xmlputs(w, client_get_id(r->client));
wrbuf_puts(w, "\" ");
wrbuf_puts(w, "name=\"");
@@ -756,11 +854,10 @@ 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;
@@ -788,7 +885,6 @@ static void cmd_record(struct http_channel *c)
{
error(rs, PAZPAR2_RECORD_MISSING, idstr);
}
- release_session(c, s);
return;
}
if (offsetstr)
@@ -799,7 +895,8 @@ static void cmd_record(struct http_channel *c)
int i;
struct record*r = rec->records;
int binary = 0;
-
+ const char *nativesyntax = http_argbyname(rq, "nativesyntax");
+
if (binarystr && *binarystr != '0')
binary = 1;
@@ -814,13 +911,14 @@ static void cmd_record(struct http_channel *c)
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);
@@ -854,21 +952,33 @@ static void cmd_record(struct http_channel *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;
+ 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");
@@ -896,10 +1006,9 @@ static void show_records(struct http_channel *c, int active)
if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->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);
@@ -935,26 +1044,46 @@ static void show_records(struct http_channel *c, int active)
show_range_stop(s->psession, rl);
response_close(c, "show");
- release_session(c, s);
}
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");
+ 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,28 +1092,39 @@ 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);
+ }
+ 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
+ )
+ {
+ 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 cmd_show", s, s->session_id);
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command show", s->session_id);
}
release_session(c, s);
return;
}
}
- show_records(c, status);
+ show_records(c, s, status);
release_session(c, s);
}
@@ -1025,8 +1165,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 +1175,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);
}