X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=e9d1ff8b85e0be4a37b64c1f0120e345e9b085d9;hb=6639c716d02ad6117ae6053ca18160dbb21a404a;hp=8ec3264deda56f1d06c1ed1387bc9eb90be7f364;hpb=4dbb25eef6b8fc15f058729ab84c6d492aefb42e;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 8ec3264..e9d1ff8 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" @@ -53,7 +52,8 @@ struct http_session { struct http_session *next; }; -static struct http_session *session_list = 0; +static struct http_session *session_list = 0; /* thread pr */ + void http_session_destroy(struct http_session *s); static void session_timeout(IOCHAN i, int event) @@ -62,12 +62,12 @@ static void session_timeout(IOCHAN i, int event) http_session_destroy(s); } -struct http_session *http_session_create(void) +struct http_session *http_session_create(struct conf_service *service) { NMEM nmem = nmem_create(); struct http_session *r = nmem_malloc(nmem, sizeof(*r)); - r->psession = new_session(nmem); + r->psession = new_session(nmem, service); r->session_id = 0; r->timestamp = 0; r->nmem = nmem; @@ -75,7 +75,7 @@ struct http_session *http_session_create(void) 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; @@ -155,7 +155,7 @@ static void error(struct http_response *rs, unsigned int make_sessionid(void) { - static int seq = 0; + static int seq = 0; /* thread pr */ unsigned int res; seq++; @@ -185,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) @@ -207,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; @@ -237,22 +237,59 @@ static int process_settings(struct session *se, struct http_request *rq, static void cmd_exit(struct http_channel *c) { yaz_log(YLOG_WARN, "exit"); - http_close_server(); + http_close_server(c->server); } static void cmd_init(struct http_channel *c) { - unsigned int sesid; char buf[1024]; - const char *clear = http_argbyname(c->request, "clear"); - struct http_session *s = http_session_create(); + 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) + { + 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) @@ -263,15 +300,42 @@ static void cmd_init(struct http_channel *c) 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 = "OK"; @@ -333,8 +397,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; @@ -357,7 +421,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); @@ -550,24 +614,29 @@ static void cmd_record(struct http_channel *c) struct http_response *rs = c->response; struct http_request *rq = c->request; struct http_session *s = locate_session(rq, rs); - struct record_cluster *rec; + struct record_cluster *rec, *prev_r, *next_r; struct record *r; - struct conf_service *service = global_parameters.server->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"); return; } wrbuf_rewind(c->wrbuf); - if (!(rec = show_single(s->psession, idstr))) + 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); @@ -595,23 +664,20 @@ static void cmd_record(struct http_channel *c) } else { - void *data2; 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), - &data2, - (binary ? 1 : 0)); + 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)); if (ret == -1) { http_remove_observer(obs); error(rs, PAZPAR2_NO_SESSION, 0); - return; } } } @@ -621,6 +687,20 @@ static void cmd_record(struct http_channel *c) wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, rec->recid); wrbuf_puts(c->wrbuf, "\n"); + if (prev_r) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, prev_r->recid); + wrbuf_puts(c->wrbuf, "\n"); + } + if (next_r) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, next_r->recid); + wrbuf_puts(c->wrbuf, "\n"); + } + wrbuf_printf(c->wrbuf, "%d\n", + session_active_clients(s->psession)); write_metadata(c->wrbuf, service, rec->metadata, 1); for (r = rec->records; r; r = r->next) write_subrecord(r, c->wrbuf, service, 1); @@ -644,9 +724,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; @@ -666,7 +746,7 @@ static void show_records(struct http_channel *c, int active) numn = atoi(num); if (!sort) sort = "relevance"; - if (!(sp = reclist_parse_sortparms(c->nmem, sort))) + if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service))) { error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); return; @@ -687,7 +767,7 @@ static void show_records(struct http_channel *c, int active) int ccount; struct record *p; struct record_cluster *rec = rl[i]; - struct conf_service *service = global_parameters.server->service; + struct conf_service *service = s->psession->service; wrbuf_puts(c->wrbuf, "\n"); write_metadata(c->wrbuf, service, rec->metadata, 0); @@ -718,7 +798,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) @@ -784,8 +864,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; @@ -858,7 +938,11 @@ static void cmd_info(struct http_channel *c) wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, "wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1); +#endif + wrbuf_puts(c->wrbuf, ">"); wrbuf_xmlputs(c->wrbuf, VERSION); wrbuf_puts(c->wrbuf, ""); @@ -897,7 +981,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;