X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=052f0251331270ab9a4c86c9267ef0ab738f96db;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=9c560464b33d91601e057015fc5bae51dd27e436;hpb=3c94e0ffce0f67640094e9448fcd1d2dba6ffba4;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 9c56046..052f025 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,4 +1,4 @@ -/* $Id: http_command.c,v 1.54 2007-06-15 19:35:17 adam Exp $ +/* $Id: http_command.c,v 1.62 2007-09-10 16:25:50 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.54 2007-06-15 19:35:17 adam Exp $ + * $Id: http_command.c,v 1.62 2007-09-10 16:25:50 adam Exp $ */ #include @@ -243,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) @@ -281,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++) { @@ -362,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); @@ -404,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"); @@ -454,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); @@ -472,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); @@ -495,7 +497,7 @@ static void show_raw_record_error(void *data, const char *addinfo) http_remove_observer(obs); - error(rs, PAZPAR2_NOT_IMPLEMENTED, addinfo); + error(rs, PAZPAR2_RECORD_FAIL, addinfo); } static void show_raw_record_ok(void *data, const char *buf, size_t sz) @@ -517,6 +519,8 @@ void show_raw_reset(void *data, struct http_channel *c) 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; @@ -528,8 +532,6 @@ static void cmd_record(struct http_channel *c) const char *idstr = http_argbyname(rq, "id"); const char *offsetstr = http_argbyname(rq, "offset"); - int id; - if (!s) return; if (!idstr) @@ -538,10 +540,13 @@ 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; } if (offsetstr) @@ -577,7 +582,7 @@ static void cmd_record(struct http_channel *c) else { wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%d\n", rec->recid); + 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); @@ -587,6 +592,13 @@ static void cmd_record(struct http_channel *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) { struct http_request *rq = c->request; @@ -645,7 +657,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"); } @@ -679,13 +691,12 @@ static void cmd_show(struct http_channel *c) if (status && (!s->psession->reclist || !s->psession->reclist->num_records)) { // if there is already a watch/block. we do not block this one - if (session_set_watch(s->psession, - SESSION_WATCH_RECORDS, - show_records_ready, c, c) == 0) + if (session_set_watch(s->psession, SESSION_WATCH_SHOW, + show_records_ready, c, c) != 0) { yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); - return; } + return; } }