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

diff --git a/src/http_command.c b/src/http_command.c
index d68cce9..879159d 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.42 2007-05-15 15:50:48 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.33 2007-04-11 02:14:15 quinn Exp $
+ * $Id: http_command.c,v 1.42 2007-05-15 15:50:48 adam Exp $
  */
 
 #include <stdio.h>
@@ -44,9 +44,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "pazpar2.h"
 #include "http.h"
 #include "http_command.h"
+#include "settings.h"
+#include "client.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
@@ -81,8 +83,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;
 }
 
@@ -117,9 +119,12 @@ static void error(struct http_response *rs, char *code, char *msg, char *txt)
 
 unsigned int make_sessionid()
 {
+    static int seq = 0;
+#if 1
+    return ++seq;
+#else
     struct timeval t;
     unsigned int res;
-    static int seq = 0;
 
     seq++;
     if (gettimeofday(&t, 0) < 0)
@@ -127,6 +132,7 @@ unsigned int make_sessionid()
     res = t.tv_sec;
     res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
     return res;
+#endif
 }
 
 static struct http_session *locate_session(struct http_request *rq, struct http_response *rs)
@@ -200,7 +206,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 +368,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 +387,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",
-            r->client->database->database->url,
-            r->client->database->database->name ? r->client->database->database->name : "");
-    write_metadata(w, service, r->metadata, 1);
+    char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME);
+
+    wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
+            client_get_database(r->client)->database->url,
+            *name ? name : "Unknown");
+    if (show_details)
+        write_metadata(w, service, r->metadata, 1);
     wrbuf_puts(w, "</location>\n");
 }
 
@@ -418,7 +429,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 +490,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);