X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp_command.c;h=340e7c03a27f3c692da5648dab87dba0f60d9fb2;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=16c890ab577c5657dfd76ee5d50d8db1ff66b0c7;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 16c890a..340e7c0 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -595,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;
             }
         }
     }
@@ -820,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, "<stat>");
     wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
@@ -838,6 +841,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);
@@ -851,7 +855,11 @@ static void cmd_info(struct http_channel *c)
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, "<info>\n");
     wrbuf_puts(c->wrbuf, " <version>\n");
-    wrbuf_puts(c->wrbuf, "<pazpar2>");
+    wrbuf_puts(c->wrbuf, "<pazpar2");
+#ifdef PAZPAR2_VERSION_SHA1
+    wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
+#endif
+    wrbuf_puts(c->wrbuf, ">");
     wrbuf_xmlputs(c->wrbuf, VERSION);
     wrbuf_puts(c->wrbuf, "</pazpar2>");
 
@@ -919,7 +927,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
  */
+