#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
-#include "util.h"
#include "eventl.h"
+#include "parameters.h"
#include "pazpar2.h"
#include "http.h"
#include "settings.h"
// Update this when the protocol changes
#define PAZPAR2_PROTOCOL_VERSION "1"
+#define HTTP_COMMAND_RESPONSE_PREFIX "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+
struct http_session {
IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket
struct session *psession;
session_list = r;
r->timeout_iochan = iochan_create(-1, session_timeout, 0);
iochan_setdata(r->timeout_iochan, r);
- iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout);
+ iochan_settimeout(r->timeout_iochan, service->session_timeout);
pazpar2_add_channel(r->timeout_iochan);
return r;
rs->msg = nmem_strdup(c->nmem, msg);
strcpy(rs->code, http_status);
- wrbuf_printf(text, "<error code=\"%d\" msg=\"%s\">", (int) code,
+ wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX "<error code=\"%d\" msg=\"%s\">", (int) code,
msg);
if (addinfo)
wrbuf_xmlputs(text, addinfo);
// Decode settings parameters and apply to session
// Syntax: setting[target]=value
static int process_settings(struct session *se, struct http_request *rq,
- struct http_response *rs)
+ struct http_response *rs)
{
struct http_argument *a;
static void cmd_init(struct http_channel *c)
{
- unsigned int sesid;
char buf[1024];
- const char *clear = http_argbyname(c->request, "clear");
- const char *service_name = http_argbyname(c->request, "service");
- struct conf_service *service = locate_service(c->server,
- service_name);
- struct http_session *s = http_session_create(service);
+ struct http_request *r = c->request;
+ const char *clear = http_argbyname(r, "clear");
+ const char *content_type = http_lookup_header(r->headers, "Content-Type");
+ unsigned int sesid;
+ struct http_session *s;
struct http_response *rs = c->response;
-
+ struct conf_service *service = 0; /* no service (yet) */
+
+ if (r->content_len && content_type &&
+ !yaz_strcmp_del("text/xml", content_type, "; "))
+ {
+ xmlDoc *doc = xmlParseMemory(r->content_buf, r->content_len);
+ xmlNode *root_n;
+ if (!doc)
+ {
+ error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ return;
+ }
+ root_n = xmlDocGetRootElement(doc);
+ service = service_create(c->server, root_n);
+ xmlFreeDoc(doc);
+ if (!service)
+ {
+ error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ return;
+ }
+ }
+
if (!service)
{
- error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "service");
- return;
+ const char *service_name = http_argbyname(c->request, "service");
+ service = locate_service(c->server, service_name);
+ if (!service)
+ {
+ error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "service");
+ return;
+ }
+ service_incref(service);
}
-
+ s = http_session_create(service);
+
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
session_init_databases(s->psession);
else
yaz_log(YLOG_LOG, "No databases preloaded");
+
sesid = make_sessionid();
s->session_id = sesid;
if (process_settings(s->psession, c->request, c->response) < 0)
return;
- sprintf(buf, "<init><status>OK</status><session>%u</session>"
+ sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "<init><status>OK</status><session>%u</session>"
"<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>", sesid);
rs->payload = nmem_strdup(c->nmem, buf);
http_send_response(c);
}
+static void apply_local_setting(void *client_data,
+ struct setting *set)
+{
+ struct session *se = (struct session *) client_data;
+
+ session_apply_setting(se, nmem_strdup(se->session_nmem, set->target),
+ nmem_strdup(se->session_nmem, set->name),
+ nmem_strdup(se->session_nmem, set->value));
+}
+
static void cmd_settings(struct http_channel *c)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
struct http_session *s = locate_session(rq, rs);
+ const char *content_type = http_lookup_header(rq->headers, "Content-Type");
if (!s)
return;
+ if (rq->content_len && content_type &&
+ !yaz_strcmp_del("text/xml", content_type, "; "))
+ {
+ xmlDoc *doc = xmlParseMemory(rq->content_buf, rq->content_len);
+ xmlNode *root_n;
+ if (!doc)
+ {
+ error(rs, PAZPAR2_MALFORMED_SETTING, 0);
+ return;
+ }
+ root_n = xmlDocGetRootElement(doc);
+
+ settings_read_node_x(root_n, s->psession, apply_local_setting);
+
+ xmlFreeDoc(doc);
+ }
if (process_settings(s->psession, rq, rs) < 0)
return;
- rs->payload = "<settings><status>OK</status></settings>";
+ rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<settings><status>OK</status></settings>";
http_send_response(c);
}
return;
ht = hitsbytarget(s->psession, &count, c->nmem);
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, "<bytarget><status>OK</status>");
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<bytarget><status>OK</status>");
for (i = 0; i < count; i++)
{
struct http_session *s = locate_session(rq, rs);
struct record_cluster *rec, *prev_r, *next_r;
struct record *r;
- struct conf_service *service = s->psession->service;
+ 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");
if (!s)
return;
+ service = s->psession->service;
if (!idstr)
{
error(rs, PAZPAR2_MISSING_PARAMETER, "id");
wrbuf_rewind(c->wrbuf);
if (!(rec = show_single(s->psession, idstr, &prev_r, &next_r)))
{
- if (session_set_watch(s->psession, SESSION_WATCH_RECORD,
+ if (session_active_clients(s->psession) == 0)
+ {
+ error(rs, PAZPAR2_RECORD_MISSING, idstr);
+ }
+ else if (session_set_watch(s->psession, SESSION_WATCH_RECORD,
cmd_record_ready, c, c) != 0)
{
error(rs, PAZPAR2_RECORD_MISSING, idstr);
}
else
{
- wrbuf_puts(c->wrbuf, "<record>\n");
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<record>\n");
wrbuf_puts(c->wrbuf, "<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "</recid>\n");
rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem);
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, "<show>\n<status>OK</status>\n");
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", active);
wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
wrbuf_printf(c->wrbuf, "<total>%d</total>\n", total_hits);
write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
if (ccount > 1)
wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
+ if (strstr(sort, "relevance"))
+ wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n", rec->relevance);
wrbuf_puts(c->wrbuf, "<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "</recid>\n");
if (block)
{
- if (status && (!s->psession->reclist || !s->psession->reclist->num_records))
+ if (status && reclist_get_num_records(s->psession->reclist) == 0)
{
// if there is already a watch/block. we do not block this one
if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
struct http_session *s = locate_session(rq, rs);
if (!s)
return;
- rs->payload = "<ping><status>OK</status></ping>";
+ rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<ping><status>OK</status></ping>";
http_send_response(c);
}
error(rs, code, addinfo);
return;
}
- rs->payload = "<search><status>OK</status></search>";
+ rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<search><status>OK</status></search>";
http_send_response(c);
}
}
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, "<stat>");
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<stat>");
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
wrbuf_printf(c->wrbuf, "<hits>%d</hits>\n", stat.num_hits);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", stat.num_records);
struct http_response *rs = c->response;
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, "<info>\n");
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<info>\n");
wrbuf_puts(c->wrbuf, " <version>\n");
wrbuf_puts(c->wrbuf, "<pazpar2");
#ifdef PAZPAR2_VERSION_SHA1