X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=f44fdf372477ba6a29e8046db48cf54a44d16599;hb=f030fa5726d942a82ffebb2ee22e35338ccfed78;hp=64f638d18da3bfe84adf2013c06d60daafdaa090;hpb=7f39c2c107bb09afb58c55a1c3ed91cde6bcdea7;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 64f638d..f44fdf3 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.34 2007-04-11 18:42:25 quinn Exp $
+/* $Id: http_command.c,v 1.40 2007-04-19 16:07:20 adam 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.34 2007-04-11 18:42:25 quinn Exp $
+ * $Id: http_command.c,v 1.40 2007-04-19 16:07:20 adam Exp $
  */
 
 #include <stdio.h>
@@ -46,8 +46,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "http_command.h"
 #include "settings.h"
 
-extern struct parameters global_parameters;
-extern IOCHAN channel_list;
+// Update this when the protocol changes
+#define PAZPAR2_PROTOCOL_VERSION "1"
 
 struct http_session {
     IOCHAN timeout_iochan;     // NOTE: This is NOT associated with a socket
@@ -82,8 +82,8 @@ struct http_session *http_session_create()
     r->timeout_iochan = iochan_create(-1, session_timeout, 0);
     iochan_setdata(r->timeout_iochan, r);
     iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout);
-    r->timeout_iochan->next = channel_list;
-    channel_list = r->timeout_iochan;
+
+    pazpar2_add_channel(r->timeout_iochan);
     return r;
 }
 
@@ -201,7 +201,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 +363,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:
@@ -381,14 +382,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)
 {
     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");
-    write_metadata(w, service, r->metadata, 1);
+    if (show_details)
+        write_metadata(w, service, r->metadata, 1);
     wrbuf_puts(w, "</location>\n");
 }
 
@@ -421,7 +424,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);
@@ -482,7 +485,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);