X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=447eb06026cc4cad6d9cdba17bdde79dd5994fb9;hb=22fe11dc47be6b8a98851d6ff077f1a1d492f35c;hp=52ccacd53c4ee67c6324f97720a5ad3d496e2537;hpb=69e16a2f160e0cf5ee051058e0571e184d41665c;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 52ccacd..447eb06 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,4 +1,4 @@ -/* $Id: http_command.c,v 1.48 2007-06-06 09:00:56 marc Exp $ +/* $Id: http_command.c,v 1.63 2007-10-02 10:11:56 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.48 2007-06-06 09:00:56 marc Exp $ + * $Id: http_command.c,v 1.63 2007-10-02 10:11:56 adam Exp $ */ #include @@ -60,7 +60,6 @@ struct http_session { }; static struct http_session *session_list = 0; - void http_session_destroy(struct http_session *s); static void session_timeout(IOCHAN i, int event) @@ -98,27 +97,61 @@ void http_session_destroy(struct http_session *s) *p = (*p)->next; break; } + yaz_log(YLOG_LOG, "Destroying session %u", s->session_id); iochan_destroy(s->timeout_iochan); destroy_session(s->psession); nmem_destroy(s->nmem); } +static const char *get_msg(enum pazpar2_error_code code) +{ + struct pazpar2_error_msg { + enum pazpar2_error_code code; + const char *msg; + }; + static const struct pazpar2_error_msg ar[] = { + { PAZPAR2_NO_SESSION, "Session does not exist or it has expired"}, + { PAZPAR2_MISSING_PARAMETER, "Missing parameter"}, + { PAZPAR2_MALFORMED_PARAMETER_VALUE, "Malformed parameter value"}, + { PAZPAR2_MALFORMED_PARAMETER_ENCODING, "Malformed parameter encoding"}, + { PAZPAR2_MALFORMED_SETTING, "Malformed setting argument"}, + { PAZPAR2_HITCOUNTS_FAILED, "Failed to retrieve hitcounts"}, + { PAZPAR2_RECORD_MISSING, "Record missing"}, + { PAZPAR2_NO_TARGETS, "No targets"}, + { PAZPAR2_CONFIG_TARGET, "Target cannot be configured"}, + { PAZPAR2_RECORD_FAIL, "Record command failed"}, + { PAZPAR2_NOT_IMPLEMENTED, "Not implemented"}, + { PAZPAR2_LAST_ERROR, "Last error"}, + { 0, 0 } + }; + int i = 0; + while (ar[i].msg) + { + if (code == ar[i].code) + return ar[i].msg; + i++; + } + return "No error"; +} + static void error(struct http_response *rs, - const char *code, const char *msg, const char *extra) + enum pazpar2_error_code code, + const char *addinfo) { struct http_channel *c = rs->channel; char text[1024]; - char *sep = extra ? ": " : ""; + const char *http_status = "417"; + const char *msg = get_msg(code); rs->msg = nmem_strdup(c->nmem, msg); - strcpy(rs->code, code); + strcpy(rs->code, http_status); yaz_snprintf(text, sizeof(text), - "%s%s%s", msg, sep, - extra ? extra : ""); + "%s", (int) code, + msg, addinfo ? addinfo : ""); - yaz_log(YLOG_WARN, "HTTP %s %s%s%s", code, msg, sep, - extra ? extra : ""); + yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status, + msg, addinfo ? ": " : "" , addinfo ? addinfo : ""); rs->payload = nmem_strdup(c->nmem, text); http_send_response(c); } @@ -156,7 +189,7 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ if (!session) { - error(rs, "417", "Must supply session", 0); + error(rs, PAZPAR2_MISSING_PARAMETER, "session"); return 0; } id = atoi(session); @@ -166,7 +199,7 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ iochan_activity(p->timeout_iochan); return p; } - error(rs, "417", "Session does not exist, or it has expired", 0); + error(rs, PAZPAR2_NO_SESSION, session); return 0; } @@ -189,7 +222,7 @@ static int process_settings(struct session *se, struct http_request *rq, nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num); if (num != 2) { - error(rs, "417", "Malformed setting argument", a->name); + error(rs, PAZPAR2_MALFORMED_SETTING, a->name); return -1; } setting = res[0]; @@ -210,10 +243,15 @@ 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_response *rs = c->response; 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) @@ -248,13 +286,13 @@ static int cmp_ht(const void *p1, const void *p2) } // This implements functionality somewhat similar to 'bytarget', but in a termlist form -static void targets_termlist(WRBUF wrbuf, struct session *se, int num) +static void targets_termlist(WRBUF wrbuf, struct session *se, int num, + NMEM nmem) { struct hitsbytarget *ht; int count, i; - if (!(ht = hitsbytarget(se, &count))) - return; + ht = hitsbytarget(se, &count, nmem); qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht); for (i = 0; i < count && i < num && ht[i].hits > 0; i++) { @@ -263,7 +301,6 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num) wrbuf_puts(wrbuf, "\n"); - //wrbuf_printf(wrbuf, "%s\n", ht[i].id); wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].id); wrbuf_puts(wrbuf, "\n"); @@ -277,7 +314,6 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num) wrbuf_printf(wrbuf, "%d\n", ht[i].hits); - //wrbuf_printf(wrbuf, "%s\n", ht[i].state); wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].state); wrbuf_puts(wrbuf, "\n"); @@ -331,7 +367,7 @@ static void cmd_termlist(struct http_channel *c) wrbuf_xmlputs(c->wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession, num); + targets_termlist(c->wrbuf, s->psession, num, c->nmem); else { p = termlist(s->psession, tname, &len); @@ -373,11 +409,7 @@ static void cmd_bytarget(struct http_channel *c) if (!s) return; - if (!(ht = hitsbytarget(s->psession, &count))) - { - error(rs, "500", "Failed to retrieve hitcounts", 0); - return; - } + ht = hitsbytarget(s->psession, &count, c->nmem); wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "OK"); @@ -385,7 +417,6 @@ static void cmd_bytarget(struct http_channel *c) { wrbuf_puts(c->wrbuf, "\n"); - //wrbuf_printf(c->wrbuf, "%s\n", ht[i].id); wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, ht[i].id); wrbuf_puts(c->wrbuf, "\n"); @@ -394,7 +425,6 @@ static void cmd_bytarget(struct http_channel *c) wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic); wrbuf_printf(c->wrbuf, "%d\n", ht[i].records); - //wrbuf_printf(c->wrbuf, "%s\n", ht[i].state); wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, ht[i].state); wrbuf_puts(c->wrbuf, "\n"); @@ -425,7 +455,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, switch (cmd->type) { case Metadata_type_generic: - wrbuf_puts(w, md->data.text); + wrbuf_xmlputs(w, md->data.text.disp); break; case Metadata_type_year: wrbuf_printf(w, "%d", md->data.number.min); @@ -443,7 +473,8 @@ static void write_metadata(WRBUF w, struct conf_service *service, static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service, int show_details) { - char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME); + const char *name = session_setting_oneval( + client_get_database(r->client), PZ_NAME); wrbuf_puts(w, "client)->database->url); @@ -458,6 +489,38 @@ static void write_subrecord(struct record *r, WRBUF w, wrbuf_puts(w, "\n"); } +static void show_raw_record_error(void *data, const char *addinfo) +{ + http_channel_observer_t obs = data; + struct http_channel *c = http_channel_observer_chan(obs); + struct http_response *rs = c->response; + + http_remove_observer(obs); + + error(rs, PAZPAR2_RECORD_FAIL, addinfo); +} + +static void show_raw_record_ok(void *data, const char *buf, size_t sz) +{ + http_channel_observer_t obs = data; + struct http_channel *c = http_channel_observer_chan(obs); + struct http_response *rs = c->response; + + http_remove_observer(obs); + + wrbuf_write(c->wrbuf, buf, sz); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); +} + +void show_raw_reset(void *data, struct http_channel *c) +{ + struct client *client = data; + client_show_raw_reset(client); +} + +static void cmd_record_ready(void *data); + static void cmd_record(struct http_channel *c) { struct http_response *rs = c->response; @@ -466,31 +529,82 @@ static void cmd_record(struct http_channel *c) struct record_cluster *rec; struct record *r; struct conf_service *service = global_parameters.server->service; - char *idstr = http_argbyname(rq, "id"); - int id; - + const char *idstr = http_argbyname(rq, "id"); + const char *offsetstr = http_argbyname(rq, "offset"); + if (!s) return; if (!idstr) { - error(rs, "417", "Must supply id", 0); + error(rs, PAZPAR2_MISSING_PARAMETER, "id"); return; } wrbuf_rewind(c->wrbuf); - id = atoi(idstr); - if (!(rec = show_single(s->psession, id))) + if (!(rec = show_single(s->psession, idstr))) { - error(rs, "500", "Record missing", 0); + if (session_set_watch(s->psession, SESSION_WATCH_RECORD, + cmd_record_ready, c, c) != 0) + { + error(rs, PAZPAR2_RECORD_MISSING, idstr); + } return; } - wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%d\n", rec->recid); - write_metadata(c->wrbuf, service, rec->metadata, 1); - for (r = rec->records; r; r = r->next) - 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); + if (offsetstr) + { + int offset = atoi(offsetstr); + const char *syntax = http_argbyname(rq, "syntax"); + const char *esn = http_argbyname(rq, "esn"); + int i; + struct record*r = rec->records; + + for (i = 0; i < offset && r; r = r->next, i++) + ; + if (!r) + { + error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given"); + return; + } + else + { + 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, + show_raw_record_ok); + if (ret == -1) + { + http_remove_observer(obs); + error(rs, PAZPAR2_RECORD_FAIL, "show already active"); + return; + } + else if (ret == -2) + { + http_remove_observer(obs); + error(rs, PAZPAR2_NO_SESSION, 0); + return; + } + } + } + else + { + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_printf(c->wrbuf, "%s\n", rec->recid); + write_metadata(c->wrbuf, service, rec->metadata, 1); + for (r = rec->records; r; r = r->next) + 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); + } +} + +static void cmd_record_ready(void *data) +{ + struct http_channel *c = (struct http_channel *) data; + + cmd_record(c); } static void show_records(struct http_channel *c, int active) @@ -524,7 +638,7 @@ static void show_records(struct http_channel *c, int active) sort = "relevance"; if (!(sp = reclist_parse_sortparms(c->nmem, sort))) { - error(rs, "500", "Bad sort parameters", 0); + error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); return; } @@ -551,7 +665,7 @@ static void show_records(struct http_channel *c, int active) 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); + wrbuf_printf(c->wrbuf, "%s\n", rec->recid); wrbuf_puts(c->wrbuf, "\n"); } @@ -584,8 +698,12 @@ static void cmd_show(struct http_channel *c) { if (status && (!s->psession->reclist || !s->psession->reclist->num_records)) { - session_set_watch(s->psession, SESSION_WATCH_RECORDS, show_records_ready, c); - yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); + // 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) + { + yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); + } return; } } @@ -636,24 +754,25 @@ static void cmd_search(struct http_channel *c) struct http_session *s = locate_session(rq, rs); char *query = http_argbyname(rq, "query"); char *filter = http_argbyname(rq, "filter"); - char *res; + enum pazpar2_error_code code; + const char *addinfo = 0; if (!s) return; if (!query) { - error(rs, "417", "Must supply query", 0); + error(rs, PAZPAR2_MISSING_PARAMETER, "query"); return; } if (!utf_8_valid(query)) { - error(rs, "417", "Query not UTF-8 encoded", 0); + error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query"); return; } - res = search(s->psession, query, filter); - if (res) + code = search(s->psession, query, filter, &addinfo); + if (code) { - error(rs, "417", res, 0); + error(rs, code, addinfo); return; } rs->payload = "OK"; @@ -702,15 +821,12 @@ static void cmd_info(struct http_channel *c) wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, " \n"); - //wrbuf_printf(c->wrbuf, " %s\n", VERSION); wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, VERSION); wrbuf_puts(c->wrbuf, ""); yaz_version(yaz_version_str, 0); - //wrbuf_printf(c->wrbuf, " %s\n", - // YAZ_VERSION, yaz_version_str); wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION); wrbuf_puts(c->wrbuf, "\">"); @@ -755,7 +871,7 @@ void http_command(struct http_channel *c) if (!command) { - error(rs, "417", "Must supply command", 0); + error(rs, PAZPAR2_MISSING_PARAMETER, "command"); return; } for (i = 0; commands[i].name; i++) @@ -765,7 +881,7 @@ void http_command(struct http_channel *c) break; } if (!commands[i].name) - error(rs, "417", "Unknown command", command); + error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "command"); return; }