X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=9bcf77e437ff2db3f634dc0e75eb68d7bad24e5c;hb=5a145dc87e4756afc3e247cded32a9666457f065;hp=eaf4785f3073e24a24d740a23cef41ec12166a56;hpb=4d488222cc06d4329916b4c8365cd9ac7c534455;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index eaf4785..9bcf77e 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,7 +1,5 @@ -/* $Id: http_command.c,v 1.51 2007-06-13 08:04:03 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -14,13 +12,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ /* - * $Id: http_command.c,v 1.51 2007-06-13 08:04:03 adam Exp $ + * $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $ */ #include @@ -38,7 +36,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -#include "config.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -97,6 +94,7 @@ 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); @@ -118,6 +116,9 @@ static const char *get_msg(enum pazpar2_error_code code) { 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; @@ -135,20 +136,23 @@ static void error(struct http_response *rs, const char *addinfo) { struct http_channel *c = rs->channel; - char text[1024]; + WRBUF text = wrbuf_alloc(); const char *http_status = "417"; const char *msg = get_msg(code); - + rs->msg = nmem_strdup(c->nmem, msg); strcpy(rs->code, http_status); - yaz_snprintf(text, sizeof(text), - "%s", (int) code, - msg, addinfo ? addinfo : ""); + wrbuf_printf(text, "", (int) code, + msg); + if (addinfo) + wrbuf_xmlputs(text, addinfo); + wrbuf_puts(text, ""); yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status, msg, addinfo ? ": " : "" , addinfo ? addinfo : ""); - rs->payload = nmem_strdup(c->nmem, text); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(text)); + wrbuf_destroy(text); http_send_response(c); } @@ -239,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) @@ -277,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++) { @@ -358,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); @@ -400,11 +409,7 @@ static void cmd_bytarget(struct http_channel *c) if (!s) return; - if (!(ht = hitsbytarget(s->psession, &count))) - { - error(rs, PAZPAR2_HITCOUNTS_FAILED, 0); - return; - } + ht = hitsbytarget(s->psession, &count, c->nmem); wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "OK"); @@ -450,7 +455,7 @@ static void write_metadata(WRBUF w, struct conf_service *service, switch (cmd->type) { case Metadata_type_generic: - wrbuf_xmlputs(w, md->data.text); + wrbuf_xmlputs(w, md->data.text.disp); break; case Metadata_type_year: wrbuf_printf(w, "%d", md->data.number.min); @@ -468,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); @@ -483,6 +489,55 @@ 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); +} + + +static void show_raw_record_ok_binary(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)); + + rs->content_type = "application/octet-stream"; + http_send_response(c); +} + + +void show_raw_reset(void *data, struct http_channel *c, void *data2) +{ + struct client *client = data; + client_show_raw_remove(client, data2); +} + +static void cmd_record_ready(void *data); + static void cmd_record(struct http_channel *c) { struct http_response *rs = c->response; @@ -491,9 +546,10 @@ 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"); + const char *binarystr = http_argbyname(rq, "binary"); + if (!s) return; if (!idstr) @@ -502,20 +558,74 @@ static void cmd_record(struct http_channel *c) return; } wrbuf_rewind(c->wrbuf); - id = atoi(idstr); - if (!(rec = show_single(s->psession, id))) + if (!(rec = show_single(s->psession, idstr))) { - error(rs, PAZPAR2_RECORD_MISSING, idstr); + 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; + int binary = 0; + + if (binarystr && *binarystr != '0') + binary = 1; + + for (i = 0; i < offset && r; r = r->next, i++) + ; + if (!r) + { + error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given"); + return; + } + 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)); + if (ret == -1) + { + 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) @@ -576,7 +686,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"); } @@ -609,8 +719,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; } }