X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=e12e74b2e7404da62add1b49bbcd880e5fb1efc8;hb=cccecb6f3bb45546b1a0972b95f8467202b9e304;hp=b68aa36273b37ec8cd420de7b0a0eab14e25a372;hpb=c70eb36a1e27ba0439a9ddc2f46188933c55be7a;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index b68aa36..e12e74b 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.35 2007-04-15 03:26:47 quinn Exp $
+/* $Id: http_command.c,v 1.38 2007-04-16 21:14:38 quinn Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -20,7 +20,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  */
 
 /*
- * $Id: http_command.c,v 1.35 2007-04-15 03:26:47 quinn Exp $
+ * $Id: http_command.c,v 1.38 2007-04-16 21:14:38 quinn Exp $
  */
 
 #include <stdio.h>
@@ -46,6 +46,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "http_command.h"
 #include "settings.h"
 
+// Update this when the protocol changes
+#define PAZPAR2_PROTOCOL_VERSION "1"
+
 extern struct parameters global_parameters;
 extern IOCHAN channel_list;
 
@@ -201,7 +204,8 @@ static void cmd_init(struct http_channel *c)
     s->session_id = sesid;
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
-    sprintf(buf, "<init><status>OK</status><session>%u</session></init>", sesid);
+    sprintf(buf, "<init><status>OK</status><session>%u</session>"
+            "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>", sesid);
     rs->payload = nmem_strdup(c->nmem, buf);
     http_send_response(c);
 }
@@ -362,7 +366,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
             continue;
         for (md = ml[imeta]; md; md = md->next)
         {
-            wrbuf_printf(w, "<md-%s>", cmd->name);
+            wrbuf_printf(w, "\n<md-%s>", cmd->name);
             switch (cmd->type)
             {
                 case Metadata_type_generic:
@@ -386,7 +390,7 @@ static void write_subrecord(struct record *r, WRBUF w,
 {
     char *name = session_setting_oneval(r->client->database, PZ_NAME);
 
-    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">\n",
+    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
             r->client->database->database->url,
             *name ? name : "Unknown");
     if (show_details)