X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=616a48cdbbbaa28c3a36253456c40db48eee01ee;hb=fdf549621a2712e2e7fafd5966bbbf9a5c891adf;hp=13f421d1088cda8cb717fb858c58d0282982545f;hpb=15790e226ac62ed0813c89ba29fcd9b3d564fe19;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 13f421d..616a48c 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -33,11 +33,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include "util.h" #include "eventl.h" +#include "parameters.h" #include "pazpar2.h" #include "http.h" -#include "http_command.h" #include "settings.h" #include "client.h" @@ -76,7 +75,7 @@ struct http_session *http_session_create(struct conf_service *service) 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; @@ -186,7 +185,7 @@ unsigned int make_sessionid(void) static struct http_session *locate_session(struct http_request *rq, struct http_response *rs) { struct http_session *p; - char *session = http_argbyname(rq, "session"); + const char *session = http_argbyname(rq, "session"); unsigned int id; if (!session) @@ -208,7 +207,7 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ // 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; @@ -243,26 +242,47 @@ static void cmd_exit(struct http_channel *c) 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; - - if (!service) + struct conf_service *service; + + if (content_type && !yaz_strcmp_del("text/xml", content_type, "; ")) { - error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "service"); - return; + 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); } - + else + { + 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) @@ -343,8 +363,8 @@ static void cmd_termlist(struct http_channel *c) struct termlist_score **p; int len; int i; - char *name = http_argbyname(rq, "name"); - char *nums = http_argbyname(rq, "num"); + const char *name = http_argbyname(rq, "name"); + const char *nums = http_argbyname(rq, "num"); int num = 15; int status; @@ -367,7 +387,7 @@ static void cmd_termlist(struct http_channel *c) while (*name) { char tname[256]; - char *tp; + const char *tp; if (!(tp = strchr(name, ','))) tp = name + strlen(name); @@ -562,13 +582,14 @@ static void cmd_record(struct http_channel *c) 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"); @@ -577,7 +598,11 @@ static void cmd_record(struct http_channel *c) 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); @@ -665,9 +690,9 @@ static void show_records(struct http_channel *c, int active) struct http_session *s = locate_session(rq, rs); struct record_cluster **rl; struct reclist_sortparms *sp; - char *start = http_argbyname(rq, "start"); - char *num = http_argbyname(rq, "num"); - char *sort = http_argbyname(rq, "sort"); + const char *start = http_argbyname(rq, "start"); + const char *num = http_argbyname(rq, "num"); + const char *sort = http_argbyname(rq, "sort"); int startn = 0; int numn = 20; int total; @@ -739,7 +764,7 @@ static void cmd_show(struct http_channel *c) struct http_request *rq = c->request; struct http_response *rs = c->response; struct http_session *s = locate_session(rq, rs); - char *block = http_argbyname(rq, "block"); + const char *block = http_argbyname(rq, "block"); int status; if (!s) @@ -805,8 +830,8 @@ static void cmd_search(struct http_channel *c) struct http_request *rq = c->request; struct http_response *rs = c->response; struct http_session *s = locate_session(rq, rs); - char *query = http_argbyname(rq, "query"); - char *filter = http_argbyname(rq, "filter"); + const char *query = http_argbyname(rq, "query"); + const char *filter = http_argbyname(rq, "filter"); enum pazpar2_error_code code; const char *addinfo = 0; @@ -922,7 +947,7 @@ struct { void http_command(struct http_channel *c) { - char *command = http_argbyname(c->request, "command"); + const char *command = http_argbyname(c->request, "command"); struct http_response *rs = http_create_response(c); int i;