+/* $Id: http_command.c,v 1.32 2007-04-10 08:48:56 adam Exp $
+ Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+ */
+
/*
- * $Id: http_command.c,v 1.18 2007-01-11 17:14:06 quinn Exp $
+ * $Id: http_command.c,v 1.32 2007-04-10 08:48:56 adam Exp $
*/
#include <stdio.h>
struct session *psession;
unsigned int session_id;
int timestamp;
+ NMEM nmem;
struct http_session *next;
};
struct http_session *http_session_create()
{
- struct http_session *r = xmalloc(sizeof(*r));
- r->psession = new_session();
+ NMEM nmem = nmem_create();
+ struct http_session *r = nmem_malloc(nmem, sizeof(*r));
+
+ r->psession = new_session(nmem);
r->session_id = 0;
r->timestamp = 0;
+ r->nmem = nmem;
r->next = session_list;
session_list = r;
r->timeout_iochan = iochan_create(-1, session_timeout, 0);
}
iochan_destroy(s->timeout_iochan);
destroy_session(s->psession);
- xfree(s);
+ nmem_destroy(s->nmem);
}
static void error(struct http_response *rs, char *code, char *msg, char *txt)
}
// 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;
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<term>\n");
- wrbuf_printf(wrbuf, "<name>%s</name>\n", ht[i].id);
+ wrbuf_printf(wrbuf, "<id>%s</id>\n", ht[i].id);
+ wrbuf_printf(wrbuf, "<name>%s</name>\n", ht[i].name);
wrbuf_printf(wrbuf, "<frequency>%d</frequency>\n", ht[i].hits);
wrbuf_printf(wrbuf, "<state>%s</state>\n", ht[i].state);
wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
int len;
int i;
char *name = http_argbyname(rq, "name");
+ char *nums = http_argbyname(rq, "num");
+ int num = 15;
int status;
if (!s)
name = "subject";
if (strlen(name) > 255)
return;
+ if (nums)
+ num = atoi(nums);
wrbuf_rewind(c->wrbuf);
wrbuf_printf(c->wrbuf, "\n<list name=\"%s\">\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<term>");
wrbuf_printf(c->wrbuf, "<name>%s</name>", p[i]->term);
name++;
}
wrbuf_puts(c->wrbuf, "</termlist>");
- rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_buf(c->wrbuf));
+ rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
}
wrbuf_puts(c->wrbuf, "</bytarget>");
- rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
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]");
}
}
+static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service)
+{
+ wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">\n",
+ r->client->database->url,
+ r->client->database->name ? r->client->database->name : "");
+ write_metadata(w, service, r->metadata, 1);
+ wrbuf_puts(w, "</location>\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;
wrbuf_puts(c->wrbuf, "<record>\n");
wrbuf_printf(c->wrbuf, "<recid>%d</recid>", 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, "</record>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
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;
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, "<show>\n<status>OK</status>\n");
}
wrbuf_puts(c->wrbuf, "</show>\n");
- rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
- nmem_destroy(nmem_show);
}
static void show_records_ready(void *data)
struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
char *query = http_argbyname(rq, "query");
+ char *filter = http_argbyname(rq, "filter");
char *res;
if (!s)
error(rs, "417", "Must supply query", 0);
return;
}
- res = search(s->psession, query);
+ res = search(s->psession, query, filter);
if (res)
{
error(rs, "417", res, res);
wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
wrbuf_puts(c->wrbuf, "</stat>");
- rs->payload = nmem_strdup(c->nmem, wrbuf_buf(c->wrbuf));
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
static void cmd_info(struct http_channel *c)
{
- struct http_request *rq = c->request;
+ char yaz_version_str[20];
struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
- if (!s)
- return;
+ wrbuf_rewind(c->wrbuf);
+ wrbuf_puts(c->wrbuf, "<info>\n");
+ wrbuf_printf(c->wrbuf, " <version>\n");
+ wrbuf_printf(c->wrbuf, " <pazpar2>%s</pazpar2>\n", VERSION);
+
+ yaz_version(yaz_version_str, 0);
+ wrbuf_printf(c->wrbuf, " <yaz compiled=\"%s\">%s</yaz>\n",
+ YAZ_VERSION, yaz_version_str);
+ wrbuf_printf(c->wrbuf, " </version>\n");
+
+ wrbuf_puts(c->wrbuf, "</info>");
+ rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+ http_send_response(c);
}
struct {
projects / pazpar2-moved-to-github.git / blobdiff