X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=f304e6131a8b52546c8655a373c9f847995f91eb;hb=bec266c19b530f61fa576d2b27198ada7d7f5fe3;hp=0ee4d7c4f685b9852186bfbe3f3971b7fbe18205;hpb=066ce0916d351e215cd192a06b08a7491cf1071e;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 0ee4d7c..f304e61 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,5 @@ /* - * $Id: http_command.c,v 1.19 2007-01-12 23:07:54 adam Exp $ + * $Id: http_command.c,v 1.26 2007-01-18 18:11:19 quinn Exp $ */ #include @@ -157,7 +157,7 @@ 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) +static void targets_termlist(WRBUF wrbuf, struct session *se, int num) { struct hitsbytarget *ht; int count, i; @@ -165,10 +165,10 @@ static void targets_termlist(WRBUF wrbuf, struct session *se) if (!(ht = hitsbytarget(se, &count))) return; qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht); - for (i = 0; i < count && i < 15; i++) + for (i = 0; i < count && i < num && ht[i].hits > 0; i++) { wrbuf_puts(wrbuf, "\n\n"); - wrbuf_printf(wrbuf, "%s\n", ht[i].id); + wrbuf_printf(wrbuf, "%s\n", ht[i].name); wrbuf_printf(wrbuf, "%d\n", ht[i].hits); wrbuf_printf(wrbuf, "%s\n", ht[i].state); wrbuf_printf(wrbuf, "%d\n", ht[i].diagnostic); @@ -185,6 +185,8 @@ static void cmd_termlist(struct http_channel *c) int len; int i; char *name = http_argbyname(rq, "name"); + char *nums = http_argbyname(rq, "num"); + int num = 15; int status; if (!s) @@ -196,6 +198,8 @@ static void cmd_termlist(struct http_channel *c) name = "subject"; if (strlen(name) > 255) return; + if (nums) + num = atoi(nums); wrbuf_rewind(c->wrbuf); @@ -213,12 +217,12 @@ static void cmd_termlist(struct http_channel *c) wrbuf_printf(c->wrbuf, "\n\n", tname); if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession); + targets_termlist(c->wrbuf, s->psession, num); else { p = termlist(s->psession, tname, &len); if (p) - for (i = 0; i < len; i++) + for (i = 0; i < len && i < num; i++) { wrbuf_puts(c->wrbuf, "\n"); wrbuf_printf(c->wrbuf, "%s", p[i]->term); @@ -291,9 +295,9 @@ static void write_metadata(WRBUF w, struct conf_service *service, wrbuf_puts(w, md->data.text); break; case Metadata_type_year: - wrbuf_printf(w, "%d", md->data.year.year1); - if (md->data.year.year1 != md->data.year.year2) - wrbuf_printf(w, "-%d", md->data.year.year2); + wrbuf_printf(w, "%d", md->data.number.min); + if (md->data.number.min != md->data.number.max) + wrbuf_printf(w, "-%d", md->data.number.max); break; default: wrbuf_puts(w, "[can't represent]"); @@ -303,12 +307,22 @@ static void write_metadata(WRBUF w, struct conf_service *service, } } +static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service) +{ + wrbuf_printf(w, "\n", + r->client->database->url, + r->client->database->name ? r->client->database->name : ""); + write_metadata(w, service, r->metadata, 1); + wrbuf_puts(w, "\n"); +} + 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 *r; struct conf_service *service = global_parameters.server->service; char *idstr = http_argbyname(rq, "id"); int id; @@ -330,6 +344,8 @@ static void cmd_record(struct http_channel *c) wrbuf_puts(c->wrbuf, "\n"); 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); wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf)); http_send_response(c); @@ -341,9 +357,10 @@ static void show_records(struct http_channel *c, int active) struct http_response *rs = c->response; struct http_session *s = locate_session(rq, rs); struct record_cluster **rl; - NMEM nmem_show; + struct reclist_sortparms *sp; char *start = http_argbyname(rq, "start"); char *num = http_argbyname(rq, "num"); + char *sort = http_argbyname(rq, "sort"); int startn = 0; int numn = 20; int total; @@ -361,9 +378,15 @@ static void show_records(struct http_channel *c, int active) startn = atoi(start); if (num) numn = atoi(num); + if (!sort) + sort = "relevance"; + if (!(sp = reclist_parse_sortparms(c->nmem, sort))) + { + error(rs, "500", "Bad sort parameters", 0); + return; + } - nmem_show = nmem_create(); - rl = show(s->psession, startn, &numn, &total, &total_hits, nmem_show); + rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem); wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, "\nOK\n"); @@ -393,7 +416,6 @@ static void show_records(struct http_channel *c, int active) wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf)); http_send_response(c); - nmem_destroy(nmem_show); } static void show_records_ready(void *data) @@ -501,12 +523,11 @@ static void cmd_stat(struct http_channel *c) static void cmd_info(struct http_channel *c) { - char yaz_version_str[8]; - struct http_request *rq = c->request; + char yaz_version_str[20]; struct http_response *rs = c->response; wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, "\n"); wrbuf_printf(c->wrbuf, " \n"); wrbuf_printf(c->wrbuf, " %s\n", VERSION); @@ -515,7 +536,7 @@ static void cmd_info(struct http_channel *c) YAZ_VERSION, yaz_version_str); wrbuf_printf(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf)); http_send_response(c); }