projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
221661c
)
Fix C90 warnings. Made the report error testing similar. Add warning for return witho...
author
Dennis Schafroth
<dennis@indexdata.com>
Tue, 6 Mar 2012 15:23:13 +0000
(16:23 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Tue, 6 Mar 2012 15:23:13 +0000
(16:23 +0100)
src/http_command.c
patch
|
blob
|
history
diff --git
a/src/http_command.c
b/src/http_command.c
index
595f9cf
..
e3c0c69
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-541,9
+541,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_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";
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);
if (s) {
yaz_log(c->http_sessions->log_level, "Session %u termlist watch released", s->session_id);
termlist_response(c, s, status);
@@
-586,9
+586,12
@@
static void cmd_termlist(struct http_channel *c)
release_session(c, s);
return;
}
release_session(c, s);
return;
}
- if (report_status) {
+ else if (report_status) {
status_message = "WARNING (Already blocked on termlist)";
}
status_message = "WARNING (Already blocked on termlist)";
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring termlist block. Return current result", s->session_id);
+ }
}
else
{
}
else
{
@@
-755,18
+758,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");
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 report_status = 0;
const char *status_message = "OK";
+ int no_active;
+
if (report && !strcmp("error", report)) {
if (report && !strcmp("error", report)) {
- block_error = 1;
+ report_error = 1;
}
if (report && !strcmp("status", report)) {
report_status = 1;
}
}
if (report && !strcmp("status", report)) {
report_status = 1;
}
- int no_active;
-
if (!s)
return;
if (!s)
return;
@@
-778,14
+781,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);
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;
}
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)";
}
status_message = "WARNING (Already blocked on bytarget)";
}
+ else {
+ yaz_log(YLOG_WARN, "Session %u: Ignoring bytarget block. Return current result.", s->session_id);
+ }
}
else
{
}
else
{
@@
-1120,10
+1126,13
@@
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");
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;
struct reclist_sortparms *sp;
int status;
-
+ int report_error = 0;
+ if (block_error && !strcmp("1", block_error)) {
+ report_error = 1;
+ }
if (!s)
return;
if (!s)
return;
@@
-1155,12
+1164,16
@@
static void cmd_show(struct http_channel *c)
}
else
{
}
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;
}
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
+1183,15
@@
static void cmd_show(struct http_channel *c)
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
show_records_ready, c, c) != 0)
{
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;
}
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
{
}
else
{