X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=2e8a6eadb540e3d8dc69499f3ce6f7017096598d;hb=bbefc8e129c52134c62405c693846876541aac0e;hp=2097eeedd82c8c71d44d5c5a863b58222bafa17d;hpb=ce825b4ae09b931986cb203fb44da4f05762da97;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 2097eee..2e8a6ea 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 2006-2013 Index Data
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
@@ -162,7 +162,7 @@ struct http_session *http_session_create(struct conf_service *service,
char tmp_str[50];
sprintf(tmp_str, "session#%u", sesid);
- r->psession = new_session(nmem, service, sesid);
+ r->psession = session_create(nmem, service, sesid);
r->session_id = sesid;
r->timestamp = 0;
r->nmem = nmem;
@@ -405,7 +405,8 @@ static void cmd_exit(struct http_channel *c)
response_open(c, "exit");
response_close(c, "exit");
- http_close_server(c->server);
+ if (global_parameters.debug_mode)
+ http_close_server(c->server);
}
static void cmd_init(struct http_channel *c)
@@ -726,6 +727,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);
@@ -821,12 +825,14 @@ static void cmd_bytarget(struct http_channel *c)
return;
}
}
+ session_enter_ro(s->psession, "cmd_bytarget");
bytarget_response(c, s, status_message);
+ session_leave_ro(s->psession, "cmd_bytarget");
release_session(c, s);
}
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 +845,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 +871,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 +882,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 +1033,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);
@@ -1108,7 +1117,6 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
{
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
return;
-
}
rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits, &approx_hits);
@@ -1131,22 +1139,29 @@ 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");
}
show_range_stop(s->psession, rl);
-
response_close(c, "show");
}
@@ -1194,7 +1209,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);
@@ -1250,7 +1265,9 @@ static void cmd_show(struct http_channel *c)
}
}
}
+ session_enter_ro(s->psession, "show_records");
show_records(c, s, status);
+ session_leave_ro(s->psession, "show_records");
release_session(c, s);
}
@@ -1340,17 +1357,17 @@ static void cmd_stat(struct http_channel *c)
}
response_open_no_status(c, "stat");
- wrbuf_printf(c->wrbuf, "%d\n", clients);
- wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", stat.num_hits);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_records);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_clients);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_no_connection);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_connecting);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_working);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_idle);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_failed);
- wrbuf_printf(c->wrbuf, "%d\n", stat.num_error);
- wrbuf_printf(c->wrbuf, "\n", progress);
+ wrbuf_printf(c->wrbuf, "\n %d\n", clients);
+ wrbuf_printf(c->wrbuf, " " ODR_INT_PRINTF "\n", stat.num_hits);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_records);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_clients);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_no_connection);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_connecting);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_working);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_idle);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_failed);
+ wrbuf_printf(c->wrbuf, " %d\n", stat.num_error);
+ wrbuf_printf(c->wrbuf, " \n", progress);
response_close(c, "stat");
release_session(c, s);
}
@@ -1358,26 +1375,39 @@ static void cmd_stat(struct http_channel *c)
static void cmd_info(struct http_channel *c)
{
char yaz_version_str[20];
+ char yaz_sha1_str[42];
response_open_no_status(c, "info");
- wrbuf_puts(c->wrbuf, " \n");
+ wrbuf_puts(c->wrbuf, "\n \n");
wrbuf_puts(c->wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
#endif
wrbuf_puts(c->wrbuf, ">");
wrbuf_xmlputs(c->wrbuf, VERSION);
- wrbuf_puts(c->wrbuf, "");
+ wrbuf_puts(c->wrbuf, "\n");
- yaz_version(yaz_version_str, 0);
+ yaz_version(yaz_version_str, yaz_sha1_str);
wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION);
+ wrbuf_puts(c->wrbuf, "\" sha1=\"");
+ wrbuf_xmlputs(c->wrbuf, yaz_sha1_str);
wrbuf_puts(c->wrbuf, "\">");
wrbuf_xmlputs(c->wrbuf, yaz_version_str);
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, " \n");
-
+#if HAVE_UNISTD_H
+ {
+ char hostname_str[64];
+ if (gethostname(hostname_str, sizeof(hostname_str)) == 0)
+ {
+ wrbuf_puts(c->wrbuf, " ");
+ wrbuf_xmlputs(c->wrbuf, hostname_str);
+ wrbuf_puts(c->wrbuf, "\n");
+ }
+ }
+#endif
info_services(c->server, c->wrbuf);
response_close(c, "info");