/* 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
{
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;
}
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);
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)
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);
}
}
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;
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ release_session(c,s);
return;
}
root_n = xmlDocGetRootElement(doc);
release_session(c, s);
}
-static void termlist_response(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;
perform_termlist(c, s->psession, name, num);
response_close(c, "termlist");
- 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);
+ 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)
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!");
+ 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, "%p Session %u: Blocking on command termlist", s, s->session_id);
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command termlist", s->session_id);
}
release_session(c, s);
return;
}
- termlist_response(c);
+ termlist_response(c, s);
release_session(c, s);
}
size_t session_get_memory_status(struct session *session);
-static void (struct http_channel *c, struct http_session *s)
+static void session_status(struct http_channel *c, struct http_session *s)
{
size_t session_nmem;
wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n", s->activity_counter);
xmalloc_trav(0);
}
-static void bytarget_response(struct http_channel *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");
- struct http_session *s = locate_session(c);
ht = get_hitsbytarget(s->psession, &count, c->nmem);
response_open(c, "bytarget");
wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+ if (ht[i].diagnostic)
+ {
+ wrbuf_puts(c->wrbuf, "<addinfo>");
+ if (ht[i].addinfo)
+ wrbuf_xmlputs(c->wrbuf, ht[i].addinfo);
+ wrbuf_puts(c->wrbuf, "</addinfo>\n");
+ }
+
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
wrbuf_puts(c->wrbuf, "<state>");
wrbuf_puts(c->wrbuf, "</target>");
}
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);
+ 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");
+ }
}
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!");
+ 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, "%p Session %u: Blocking on command bytarget", s, s->session_id);
+ yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command bytarget", s->session_id);
}
release_session(c, s);
return;
}
- bytarget_response(c);
+ bytarget_response(c, s);
release_session(c, s);
}
break;
default:
wrbuf_puts(w, "[can't represent]");
+ break;
}
wrbuf_printf(w, "</md-%s>", cmd->name);
}
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;
{
error(rs, PAZPAR2_RECORD_MISSING, idstr);
}
- release_session(c, s);
return;
}
if (offsetstr)
int i;
struct record*r = rec->records;
int binary = 0;
-
+ const char *nativesyntax = http_argbyname(rq, "nativesyntax");
+
if (binarystr && *binarystr != '0')
binary = 1;
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);
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;
- yaz_log(c->http_sessions->log_level, "record watch released");
- cmd_record(c);
+ 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);
+ }
+}
+
+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");
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);
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;
- yaz_log(c->http_sessions->log_level, "show watch released");
- 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)
show_records_ready, c, c) == 0)
{
yaz_log(c->http_sessions->log_level,
- "%p Session %u: Blocking on command show (preferred targets)", s, s->session_id);
+ "Session %u: Blocking on command show (preferred targets)", s->session_id);
}
else
{
{
// 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 command 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);
}
projects / pazpar2-moved-to-github.git / blobdiff