X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=aa73f9149e70e89ed56216a58b713798e838077d;hb=e22e7b20d6fa0731db95e3bf17c66f002784828b;hp=10eb26757353ab1be68d167f0073be2a9e8c0a5f;hpb=7343ec3dfe4f684f62187cb5558fcb4b03247c12;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 10eb267..aa73f91 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -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;
@@ -460,6 +470,8 @@ static void cmd_init(struct http_channel *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");
}
@@ -488,6 +500,7 @@ static void cmd_settings(struct http_channel *c)
{
xmlDoc *doc = xmlParseMemory(rq->content_buf, rq->content_len);
xmlNode *root_n;
+ int ret;
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
@@ -495,10 +508,14 @@ static void cmd_settings(struct http_channel *c)
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)
{
@@ -513,8 +530,9 @@ static void cmd_settings(struct http_channel *c)
static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status)
{
struct http_request *rq = c->request;
- const char *name = http_argbyname(rq, "name");
- const char *nums = http_argbyname(rq, "num");
+ const char *name = http_argbyname(rq, "name");
+ const char *nums = http_argbyname(rq, "num");
+ int version = get_version(rq);
int num = 15;
int status;
@@ -530,7 +548,7 @@ static void termlist_response(struct http_channel *c, struct http_session *s, co
}
wrbuf_printf(c->wrbuf, "%d\n", status);
- perform_termlist(c, s->psession, name, num);
+ perform_termlist(c, s->psession, name, num, version);
response_close(c, "termlist");
}
@@ -541,9 +559,9 @@ static void termlist_result_ready(void *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);
if (report && !strcmp("status", report))
status = "OK";
- 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, status);
@@ -560,7 +578,7 @@ static void cmd_termlist(struct http_channel *c)
const char *report = http_argbyname(rq, "report");
int report_status = 0;
int report_error = 0;
- const char *status_message;
+ const char *status_message = 0;
int active_clients;
if (report && !strcmp("error", report)) {
report_error = 1;
@@ -586,9 +604,12 @@ static void cmd_termlist(struct http_channel *c)
release_session(c, s);
return;
}
- if (report_status) {
+ 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
{
@@ -673,7 +694,7 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
struct hitsbytarget *ht;
struct http_request *rq = c->request;
const char *settings = http_argbyname(rq, "settings");
-
+ int version = get_version(rq);
ht = get_hitsbytarget(s->psession, &count, c->nmem);
if (!cmd_status)
/* Old protocol, always ok */
@@ -681,7 +702,7 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
else {
/* New protocol, OK or WARNING (...)*/
response_open_no_status(c, "bytarget");
- wrbuf_printf(c->wrbuf, "%s\n", cmd_status);
+ wrbuf_printf(c->wrbuf, "%s", cmd_status);
}
if (count == 0)
@@ -711,8 +732,11 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
wrbuf_puts(c->wrbuf, "\n");
}
- wrbuf_printf(c->wrbuf, "%d\n", ht[i].records);
-
+ 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");
@@ -755,18 +779,18 @@ static void cmd_bytarget(struct http_channel *c)
struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
const char *report = http_argbyname(rq, "report");
- int block_error = 0;
+ int report_error = 0;
int report_status = 0;
const char *status_message = "OK";
+ int no_active;
+
if (report && !strcmp("error", report)) {
- block_error = 1;
+ report_error = 1;
}
if (report && !strcmp("status", report)) {
report_status = 1;
}
- int no_active;
-
if (!s)
return;
@@ -778,14 +802,17 @@ static void cmd_bytarget(struct http_channel *c)
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 (block_error) {
+ if (report_error) {
error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget");
release_session(c, s);
return;
}
- if (report_status) {
+ 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
{
@@ -848,10 +875,14 @@ static void write_subrecord(struct record *r, WRBUF w,
wrbuf_puts(w, "client));
- wrbuf_puts(w, "\" ");
+ wrbuf_puts(w, "\"\n");
- wrbuf_puts(w, "name=\"");
+ wrbuf_puts(w, " name=\"");
wrbuf_xmlputs(w, *name ? name : "Unknown");
+ wrbuf_puts(w, "\" ");
+
+ wrbuf_puts(w, "checksum=\"");
+ wrbuf_printf(w, "%u", r->checksum);
wrbuf_puts(w, "\">");
write_metadata(w, service, r->metadata, show_details);
@@ -912,11 +943,11 @@ 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 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;
@@ -940,9 +971,8 @@ static void show_record(struct http_channel *c, struct http_session *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;
@@ -953,14 +983,25 @@ static void show_record(struct http_channel *c, struct http_session *s)
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,
@@ -981,6 +1022,7 @@ static void show_record(struct http_channel *c, struct http_session *s)
}
else
{
+ struct record *r;
response_open_no_status(c, "record");
wrbuf_puts(c->wrbuf, "\n");
wrbuf_xmlputs(c->wrbuf, rec->recid);
@@ -1037,10 +1079,13 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
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;
if (!s)
@@ -1063,12 +1108,15 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
}
- 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);
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);
@@ -1120,10 +1168,14 @@ static void cmd_show(struct http_channel *c)
struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
const char *sort = http_argbyname(rq, "sort");
- const char *block_error = http_argbyname(rq, "error");
+ const char *block_error = http_argbyname(rq, "report");
+
struct reclist_sortparms *sp;
int status;
-
+ int report_error = 0;
+ if (block_error && !strcmp("1", block_error)) {
+ report_error = 1;
+ }
if (!s)
return;
@@ -1136,7 +1188,8 @@ static void cmd_show(struct http_channel *c)
release_session(c, s);
return;
}
- session_sort(s->psession, sp->name, sp->increasing);
+ session_sort(s->psession, sp->name, sp->increasing,
+ sp->type == Metadata_sortkey_position);
status = session_active_clients(s->psession);
@@ -1155,12 +1208,16 @@ static void cmd_show(struct http_channel *c)
}
else
{
- yaz_log(YLOG_WARN, "Attempt to block multiple times on show (preferred targets) block. Not supported!");
- if (block_error && !strcmp("1", block_error)) {
+ 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);
+ }
}
}
@@ -1170,12 +1227,15 @@ static void cmd_show(struct http_channel *c)
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
show_records_ready, c, c) != 0)
{
- yaz_log(YLOG_WARN, "Attempt to block multiple times on show block. Not supported!");
- if (block_error && !strcmp("1", block_error)) {
+ 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
{