-/* $Id: http_command.c,v 1.46 2007-06-05 13:36:40 marc Exp $
+/* $Id: http_command.c,v 1.52 2007-06-13 13:04:34 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
*/
/*
- * $Id: http_command.c,v 1.46 2007-06-05 13:36:40 marc Exp $
+ * $Id: http_command.c,v 1.52 2007-06-13 13:04:34 adam Exp $
*/
#include <stdio.h>
};
static struct http_session *session_list = 0;
-
void http_session_destroy(struct http_session *s);
static void session_timeout(IOCHAN i, int event)
*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"},
+ { 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),
- "<error code=\"general\">%s%s%s</error>", msg, sep,
- extra ? extra : "");
+ "<error code=\"%d\" msg=\"%s\">%s</error>", (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);
}
if (!session)
{
- error(rs, "417", "Must supply session", 0);
+ error(rs, PAZPAR2_MISSING_PARAMETER, "session");
return 0;
}
id = atoi(session);
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;
}
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];
qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
{
+
+ // do only print terms which have display names
+
wrbuf_puts(wrbuf, "<term>\n");
- //wrbuf_printf(wrbuf, "<id>%s</id>\n", ht[i].id);
wrbuf_puts(wrbuf, "<id>");
wrbuf_xmlputs(wrbuf, ht[i].id);
wrbuf_puts(wrbuf, "</id>\n");
-
+
wrbuf_puts(wrbuf, "<name>");
- wrbuf_xmlputs(wrbuf, ht[i].name);
+ if (!ht[i].name || !ht[i].name[0])
+ wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
+ else
+ wrbuf_xmlputs(wrbuf, ht[i].name);
wrbuf_puts(wrbuf, "</name>\n");
-
+
wrbuf_printf(wrbuf, "<frequency>%d</frequency>\n", ht[i].hits);
-
- //wrbuf_printf(wrbuf, "<state>%s</state>\n", ht[i].state);
+
wrbuf_puts(wrbuf, "<state>");
wrbuf_xmlputs(wrbuf, ht[i].state);
wrbuf_puts(wrbuf, "</state>\n");
-
- wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+
+ wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n",
+ ht[i].diagnostic);
wrbuf_puts(wrbuf, "</term>\n");
}
}
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, "<termlist>");
- wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>", status);
+ wrbuf_puts(c->wrbuf, "<termlist>\n");
+ wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
while (*name)
{
char tname[256];
strncpy(tname, name, tp - name);
tname[tp - name] = '\0';
- wrbuf_puts(c->wrbuf, "\n<list name=\"");
+ wrbuf_puts(c->wrbuf, "<list name=\"");
wrbuf_xmlputs(c->wrbuf, tname);
wrbuf_puts(c->wrbuf, "\">\n");
if (!strcmp(tname, "xtargets"))
{
p = termlist(s->psession, tname, &len);
if (p)
- for (i = 0; i < len && i < num; i++)
- {
- wrbuf_puts(c->wrbuf, "\n<term>");
+ for (i = 0; i < len && i < num; i++){
+ // prevnt sending empty term elements
+ if (!p[i]->term || !p[i]->term[0])
+ continue;
+
+ wrbuf_puts(c->wrbuf, "<term>");
wrbuf_puts(c->wrbuf, "<name>");
wrbuf_xmlputs(c->wrbuf, p[i]->term);
wrbuf_puts(c->wrbuf, "</name>");
-
- wrbuf_printf(c->wrbuf, "<frequency>%d</frequency>", p[i]->frequency);
- wrbuf_puts(c->wrbuf, "</term>");
- }
+
+ wrbuf_printf(c->wrbuf,
+ "<frequency>%d</frequency>",
+ p[i]->frequency);
+ wrbuf_puts(c->wrbuf, "</term>\n");
+ }
}
- wrbuf_puts(c->wrbuf, "\n</list>");
+ wrbuf_puts(c->wrbuf, "</list>\n");
name = tp;
if (*name == ',')
name++;
}
- wrbuf_puts(c->wrbuf, "</termlist>");
+ wrbuf_puts(c->wrbuf, "</termlist>\n");
rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
return;
if (!(ht = hitsbytarget(s->psession, &count)))
{
- error(rs, "500", "Failed to retrieve hitcounts", 0);
+ error(rs, PAZPAR2_HITCOUNTS_FAILED, 0);
return;
}
wrbuf_rewind(c->wrbuf);
{
wrbuf_puts(c->wrbuf, "\n<target>");
- //wrbuf_printf(c->wrbuf, "<id>%s</id>\n", ht[i].id);
wrbuf_puts(c->wrbuf, "<id>");
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "</id>\n");
wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
- //wrbuf_printf(c->wrbuf, "<state>%s</state>\n", ht[i].state);
wrbuf_puts(c->wrbuf, "<state>");
wrbuf_xmlputs(c->wrbuf, ht[i].state);
- wrbuf_puts(c->wrbuf, "</state\n");
+ wrbuf_puts(c->wrbuf, "</state>\n");
wrbuf_puts(c->wrbuf, "</target>");
}
switch (cmd->type)
{
case Metadata_type_generic:
- wrbuf_puts(w, md->data.text);
+ wrbuf_xmlputs(w, md->data.text);
break;
case Metadata_type_year:
wrbuf_printf(w, "%d", md->data.number.min);
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)))
{
- error(rs, "500", "Record missing", 0);
+ error(rs, PAZPAR2_RECORD_MISSING, idstr);
return;
}
wrbuf_puts(c->wrbuf, "<record>\n");
- wrbuf_printf(c->wrbuf, "<recid>%d</recid>", rec->recid);
+ wrbuf_printf(c->wrbuf, "<recid>%d</recid>\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);
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;
}
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 = "<search><status>OK</status></search>";
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<info>\n");
wrbuf_puts(c->wrbuf, " <version>\n");
- //wrbuf_printf(c->wrbuf, " <pazpar2>%s</pazpar2>\n", VERSION);
wrbuf_puts(c->wrbuf, "<pazpar2>");
wrbuf_xmlputs(c->wrbuf, VERSION);
wrbuf_puts(c->wrbuf, "</pazpar2>");
yaz_version(yaz_version_str, 0);
- //wrbuf_printf(c->wrbuf, " <yaz compiled=\"%s\">%s</yaz>\n",
- // YAZ_VERSION, yaz_version_str);
wrbuf_puts(c->wrbuf, " <yaz compiled=\"");
wrbuf_xmlputs(c->wrbuf, YAZ_VERSION);
wrbuf_puts(c->wrbuf, "\">");
if (!command)
{
- error(rs, "417", "Must supply command", 0);
+ error(rs, PAZPAR2_MISSING_PARAMETER, "command");
return;
}
for (i = 0; commands[i].name; i++)
break;
}
if (!commands[i].name)
- error(rs, "417", "Unknown command", command);
+ error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "command");
return;
}