From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 25 Mar 2009 09:52:02 +0000 (+0000)
Subject: I hate failed merges
X-Git-Tag: v1.1.0~34^2
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=d0a576c466b4aad3cc044a459c4e36f719738ec5;hp=6267b857abe8e71547f34e00b6813e086dace360;p=pazpar2-moved-to-github.git

I hate failed merges
---

diff --git a/doc/common b/doc/common
index 3194c01..95d92dd 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit 3194c01cfd794ce4553ffd568e0cdc3640dc3f05
+Subproject commit 95d92dd6e49fe3807fd1d6c664b3883580290103
diff --git a/js/pz2.js b/js/pz2.js
index b5dbca9..4f089a1 100644
--- a/js/pz2.js
+++ b/js/pz2.js
@@ -349,6 +349,9 @@ pz2.prototype =
                                         .childNodes[0].nodeValue ),
                         "error": 
                             Number( data.getElementsByTagName("error")[0]
+                                        .childNodes[0].nodeValue ),
+                        "progress": 
+                            Number( data.getElementsByTagName("progress")[0]
                                         .childNodes[0].nodeValue )
                     };
                     
diff --git a/src/http_command.c b/src/http_command.c
index 610daee..8ec3264 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -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);