Add <progress /> tag to support a progress bar. The value is between 0 ... 1

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index ba4b670..8ec3264 100644 (file)
--- 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;
@@ -820,12 +820,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, "<stat>");
     wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
@@ -838,6 +844,7 @@ static void cmd_stat(struct http_channel *c)
     wrbuf_printf(c->wrbuf, "<idle>%d</idle>\n", stat.num_idle);
     wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
     wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
+    wrbuf_printf(c->wrbuf, "<progress>%.2f</progress>\n", progress);
     wrbuf_puts(c->wrbuf, "</stat>");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
@@ -919,7 +926,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
  */
+