X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=9fc50a8059c1c2d5dda4562a451b4c4a42fd80e5;hb=ab0c408e57e6d12f3b9fbe71727616e45e80e8d9;hp=2097eeedd82c8c71d44d5c5a863b58222bafa17d;hpb=ce825b4ae09b931986cb203fb44da4f05762da97;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 2097eee..9fc50a8 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -726,6 +726,9 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic);
if (ht[i].diagnostic)
{
+ wrbuf_puts(c->wrbuf, "");
+ wrbuf_xmlputs(c->wrbuf, ht[i].message);
+ wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, "");
if (ht[i].addinfo)
wrbuf_xmlputs(c->wrbuf, ht[i].addinfo);
@@ -826,7 +829,7 @@ static void cmd_bytarget(struct http_channel *c)
}
static void write_metadata(WRBUF w, struct conf_service *service,
- struct record_metadata **ml, int full)
+ struct record_metadata **ml, int full, int indent)
{
int imeta;
@@ -839,7 +842,10 @@ static void write_metadata(WRBUF w, struct conf_service *service,
for (md = ml[imeta]; md; md = md->next)
{
struct record_metadata_attr *attr = md->attributes;
- wrbuf_printf(w, "\nname);
+ int i;
+ for (i = 0; i < indent; i++)
+ wrbuf_putc(w, ' ');
+ wrbuf_printf(w, "name);
for (; attr; attr = attr->next)
{
@@ -862,7 +868,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
wrbuf_puts(w, "[can't represent]");
break;
}
- wrbuf_printf(w, "", cmd->name);
+ wrbuf_printf(w, "\n", cmd->name);
}
}
}
@@ -873,20 +879,20 @@ static void write_subrecord(struct record *r, WRBUF w,
const char *name = session_setting_oneval(
client_get_database(r->client), PZ_NAME);
- wrbuf_puts(w, "client));
wrbuf_puts(w, "\"\n");
- wrbuf_puts(w, " name=\"");
+ wrbuf_puts(w, " name=\"");
wrbuf_xmlputs(w, *name ? name : "Unknown");
wrbuf_puts(w, "\" ");
wrbuf_puts(w, "checksum=\"");
wrbuf_printf(w, "%u", r->checksum);
- wrbuf_puts(w, "\">");
+ wrbuf_puts(w, "\">\n");
- write_metadata(w, service, r->metadata, show_details);
- wrbuf_puts(w, "\n");
+ write_metadata(w, service, r->metadata, show_details, 2);
+ wrbuf_puts(w, " \n");
}
static void show_raw_record_error(void *data, const char *addinfo)
@@ -1024,26 +1030,26 @@ static void show_record(struct http_channel *c, struct http_session *s)
{
struct record *r;
response_open_no_status(c, "record");
- wrbuf_puts(c->wrbuf, "\n");
+ wrbuf_puts(c->wrbuf, "\n ");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "\n");
if (prev_r)
{
- wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, prev_r->recid);
wrbuf_puts(c->wrbuf, "\n");
}
if (next_r)
{
- wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, next_r->recid);
wrbuf_puts(c->wrbuf, "\n");
}
- wrbuf_printf(c->wrbuf, "%d\n",
+ wrbuf_printf(c->wrbuf, " %d\n",
session_active_clients(s->psession));
- write_metadata(c->wrbuf, service, rec->metadata, 1);
+ write_metadata(c->wrbuf, service, rec->metadata, 1, 1);
for (r = rec->records; r; r = r->next)
- write_subrecord(r, c->wrbuf, service, 1);
+ write_subrecord(r, c->wrbuf, service, 2);
response_close(c, "record");
}
show_single_stop(s->psession, rec);
@@ -1131,15 +1137,23 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
struct conf_service *service = s->psession->service;
wrbuf_puts(c->wrbuf, "\n");
- write_metadata(c->wrbuf, service, rec->metadata, 0);
+ write_metadata(c->wrbuf, service, rec->metadata, 0, 1);
for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++)
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", ccount);
if (strstr(sort, "relevance"))
- wrbuf_printf(c->wrbuf, "%d\n",
+ {
+ wrbuf_printf(c->wrbuf, " %d\n",
rec->relevance_score);
- wrbuf_puts(c->wrbuf, "");
+ if (service->rank_debug)
+ {
+ wrbuf_printf(c->wrbuf, " \n");
+ wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain1));
+ wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain2));
+ wrbuf_printf(c->wrbuf, " \n");
+ }
+ }
+ wrbuf_puts(c->wrbuf, " ");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, "\n");
@@ -1194,7 +1208,7 @@ static void cmd_show(struct http_channel *c)
release_session(c, s);
return;
}
- session_sort(s->psession, sp->name, sp->increasing, sp->type == Metadata_sortkey_position);
+ session_sort(s->psession, sp);
status = session_active_clients(s->psession);