X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=1a38a82e6fd610c015243e20d0a345a6cea1efc7;hb=2628f9508a3b56be7071f2db91f9f4fd1f6f2d52;hp=0cc172ba09fab39f7a9a3bdc9927d4cdf8321a38;hpb=49088b6680bed3c069be10ff0cb7cc16f3733729;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 0cc172b..1a38a82 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 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
@@ -62,7 +62,7 @@ static void session_timeout(IOCHAN i, int event)
http_session_destroy(s);
}
-struct http_session *http_session_create()
+struct http_session *http_session_create(void)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
@@ -153,7 +153,7 @@ static void error(struct http_response *rs,
http_send_response(c);
}
-unsigned int make_sessionid()
+unsigned int make_sessionid(void)
{
static int seq = 0;
unsigned int res;
@@ -422,6 +422,13 @@ static void cmd_bytarget(struct http_channel *c)
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "\n");
+ if (ht[i].name && ht[i].name[0])
+ {
+ wrbuf_puts(c->wrbuf, "");
+ wrbuf_xmlputs(c->wrbuf, ht[i].name);
+ wrbuf_puts(c->wrbuf, "\n");
+ }
+
wrbuf_printf(c->wrbuf, "%d\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic);
wrbuf_printf(c->wrbuf, "%d\n", ht[i].records);
@@ -485,8 +492,7 @@ static void write_subrecord(struct record *r, WRBUF w,
wrbuf_xmlputs(w, *name ? name : "Unknown");
wrbuf_puts(w, "\">");
- if (show_details)
- write_metadata(w, service, r->metadata, 1);
+ write_metadata(w, service, r->metadata, show_details);
wrbuf_puts(w, "\n");
}
@@ -589,23 +595,20 @@ static void cmd_record(struct http_channel *c)
}
else
{
- void *data2;
http_channel_observer_t obs =
http_add_observer(c, r->client, show_raw_reset);
- int ret =
- client_show_raw_begin(r->client, r->position, syntax, esn,
- obs /* data */,
- show_raw_record_error,
- (binary ?
- show_raw_record_ok_binary :
- show_raw_record_ok),
- &data2,
- (binary ? 1 : 0));
+ int ret = client_show_raw_begin(r->client, r->position,
+ syntax, esn,
+ obs /* data */,
+ show_raw_record_error,
+ (binary ?
+ show_raw_record_ok_binary :
+ show_raw_record_ok),
+ (binary ? 1 : 0));
if (ret == -1)
{
http_remove_observer(obs);
error(rs, PAZPAR2_NO_SESSION, 0);
- return;
}
}
}
@@ -814,12 +817,18 @@ static void cmd_stat(struct http_channel *c)
struct statistics stat;
int clients;
+ float progress = 0;
+
if (!s)
return;
clients = session_active_clients(s->psession);
statistics(s->psession, &stat);
+ if (stat.num_clients > 0) {
+ progress = (stat.num_clients - clients) / (float)stat.num_clients;
+ }
+
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "");
wrbuf_printf(c->wrbuf, "%d\n", clients);
@@ -832,6 +841,7 @@ static void cmd_stat(struct http_channel *c)
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_puts(c->wrbuf, "");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
@@ -913,7 +923,9 @@ void http_command(struct http_channel *c)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+