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

diff --git a/src/http_command.c b/src/http_command.c
index d68cce9..e12e74b 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.33 2007-04-11 02:14:15 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.33 2007-04-11 02:14:15 quinn Exp $
+ * $Id: http_command.c,v 1.38 2007-04-16 21:14:38 quinn Exp $
  */
 
 #include <stdio.h>
@@ -44,6 +44,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "pazpar2.h"
 #include "http.h"
 #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;
@@ -200,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);
 }
@@ -361,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:
@@ -380,12 +385,16 @@ static void write_metadata(WRBUF w, struct conf_service *service,
     }
 }
 
-static void write_subrecord(struct record *r, WRBUF w, struct conf_service *service)
+static void write_subrecord(struct record *r, WRBUF w,
+        struct conf_service *service, int show_details)
 {
-    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">\n",
+    char *name = session_setting_oneval(r->client->database, PZ_NAME);
+
+    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
             r->client->database->database->url,
-            r->client->database->database->name ? r->client->database->database->name : "");
-    write_metadata(w, service, r->metadata, 1);
+            *name ? name : "Unknown");
+    if (show_details)
+        write_metadata(w, service, r->metadata, 1);
     wrbuf_puts(w, "</location>\n");
 }
 
@@ -418,7 +427,7 @@ static void cmd_record(struct http_channel *c)
     wrbuf_printf(c->wrbuf, "<recid>%d</recid>", rec->recid);
     write_metadata(c->wrbuf, service, rec->metadata, 1);
     for (r = rec->records; r; r = r->next)
-        write_subrecord(r, c->wrbuf, service);
+        write_subrecord(r, c->wrbuf, service, 1);
     wrbuf_puts(c->wrbuf, "</record>\n");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
@@ -479,7 +488,7 @@ static void show_records(struct http_channel *c, int active)
         wrbuf_puts(c->wrbuf, "<hit>\n");
         write_metadata(c->wrbuf, service, rec->metadata, 0);
         for (ccount = 0, p = rl[i]->records; p;  p = p->next, ccount++)
-            ;
+            write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
         if (ccount > 1)
             wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
         wrbuf_printf(c->wrbuf, "<recid>%d</recid>\n", rec->recid);