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

diff --git a/src/http_command.c b/src/http_command.c
index 9ca5481..340e7c0 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -593,45 +593,22 @@ static void cmd_record(struct http_channel *c)
             error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
             return;
         }
-        else if (syntax == 0 && esn == 0)
-        {
-            http_channel_observer_t obs =
-                http_add_observer(c, r->client, show_raw_reset);
-            int ret = client_show_raw_immediate(
-                r->client, r->position, syntax, esn, 
-                obs,
-                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;
-            }
-        }
         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;
             }
         }
     }
@@ -878,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>");