X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=35bed6baa9168dbd4d9867248637e259f0c9f54e;hb=1ea74f79189dfde78b3b65e7355774da84efd0dc;hp=aeb8686c47997ed41c1dc29eef55a1f233a17470;hpb=cc29eab9f928f6cd0f4231cb2e554e2ac7b0b1f3;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index aeb8686..35bed6b 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,4 +1,4 @@ -/* $Id: http_command.c,v 1.32 2007-04-10 08:48:56 adam Exp $ +/* $Id: http_command.c,v 1.41 2007-04-23 21:05:23 adam Exp $ Copyright (c) 2006-2007, Index Data. This file is part of Pazpar2. @@ -20,7 +20,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA */ /* - * $Id: http_command.c,v 1.32 2007-04-10 08:48:56 adam Exp $ + * $Id: http_command.c,v 1.41 2007-04-23 21:05:23 adam Exp $ */ #include @@ -44,9 +44,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "pazpar2.h" #include "http.h" #include "http_command.h" +#include "settings.h" +#include "client.h" -extern struct parameters global_parameters; -extern IOCHAN channel_list; +// Update this when the protocol changes +#define PAZPAR2_PROTOCOL_VERSION "1" struct http_session { IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket @@ -81,8 +83,8 @@ struct http_session *http_session_create() r->timeout_iochan = iochan_create(-1, session_timeout, 0); iochan_setdata(r->timeout_iochan, r); iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout); - r->timeout_iochan->next = channel_list; - channel_list = r->timeout_iochan; + + pazpar2_add_channel(r->timeout_iochan); return r; } @@ -151,13 +153,43 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ return 0; } +// 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_argument *a; + + for (a = rq->arguments; a; a = a->next) + if (strchr(a->name, '[')) + { + char **res; + int num; + char *dbname; + char *setting; + + // Nmem_strsplit *rules*!!! + nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num); + if (num != 2) + { + error(rs, "417", "Malformed setting argument", 0); + yaz_log(YLOG_WARN, "Malformed setting: %s", a->name); + return -1; + } + setting = res[0]; + dbname = res[1]; + session_apply_setting(se, dbname, setting, + nmem_strdup(se->session_nmem, a->value)); + } + return 0; +} + static void cmd_exit(struct http_channel *c) { yaz_log(YLOG_WARN, "exit"); exit(0); } - static void cmd_init(struct http_channel *c) { unsigned int sesid; @@ -168,11 +200,29 @@ static void cmd_init(struct http_channel *c) yaz_log(YLOG_DEBUG, "HTTP Session init"); sesid = make_sessionid(); s->session_id = sesid; - sprintf(buf, "OK%u", sesid); + if (process_settings(s->psession, c->request, c->response) < 0) + return; + sprintf(buf, "OK%u" + "" PAZPAR2_PROTOCOL_VERSION "", sesid); rs->payload = nmem_strdup(c->nmem, buf); http_send_response(c); } +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); + + if (!s) + return; + + if (process_settings(s->psession, rq, rs) < 0) + return; + rs->payload = "OK"; + http_send_response(c); +} + // Compares two hitsbytarget nodes by hitcount static int cmp_ht(const void *p1, const void *p2) { @@ -314,7 +364,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, continue; for (md = ml[imeta]; md; md = md->next) { - wrbuf_printf(w, "", cmd->name); + wrbuf_printf(w, "\n", cmd->name); switch (cmd->type) { case Metadata_type_generic: @@ -333,12 +383,16 @@ static void write_metadata(WRBUF w, struct conf_service *service, } } -static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service) +static void write_subrecord(struct record *r, WRBUF w, + struct conf_service *service, int show_details) { - wrbuf_printf(w, "\n", - r->client->database->url, - r->client->database->name ? r->client->database->name : ""); - write_metadata(w, service, r->metadata, 1); + char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME); + + wrbuf_printf(w, "", + client_get_database(r->client)->database->url, + *name ? name : "Unknown"); + if (show_details) + write_metadata(w, service, r->metadata, 1); wrbuf_puts(w, "\n"); } @@ -371,7 +425,7 @@ static void cmd_record(struct http_channel *c) wrbuf_printf(c->wrbuf, "%d", rec->recid); write_metadata(c->wrbuf, service, rec->metadata, 1); for (r = rec->records; r; r = r->next) - write_subrecord(r, c->wrbuf, service); + write_subrecord(r, c->wrbuf, service, 1); wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -432,7 +486,7 @@ static void show_records(struct http_channel *c, int active) wrbuf_puts(c->wrbuf, "\n"); write_metadata(c->wrbuf, service, rec->metadata, 0); for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++) - ; + write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details if (ccount > 1) wrbuf_printf(c->wrbuf, "%d\n", ccount); wrbuf_printf(c->wrbuf, "%d\n", rec->recid); @@ -573,6 +627,7 @@ struct { void (*fun)(struct http_channel *c); } commands[] = { { "init", cmd_init }, + { "settings", cmd_settings }, { "stat", cmd_stat }, { "bytarget", cmd_bytarget }, { "show", cmd_show },