Refactor stuff from logic.c: connection stuff in connection.[ch],

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index 6442499..35bed6b 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.37 2007-04-16 21:11:26 quinn Exp $
+/* $Id: http_command.c,v 1.41 2007-04-23 21:05:23 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.37 2007-04-16 21:11:26 quinn Exp $
+ * $Id: http_command.c,v 1.41 2007-04-23 21:05:23 adam Exp $
  */
 
 #include <stdio.h>
@@ -45,13 +45,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "http.h"
 #include "http_command.h"
 #include "settings.h"
+#include "client.h"
 
 // Update this when the protocol changes
 #define PAZPAR2_PROTOCOL_VERSION "1"
 
-extern struct parameters global_parameters;
-extern IOCHAN channel_list;
-
 struct http_session {
     IOCHAN timeout_iochan;     // NOTE: This is NOT associated with a socket
     struct session *psession;
@@ -85,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;
 }
 
@@ -205,8 +203,7 @@ static void cmd_init(struct http_channel *c)
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
     sprintf(buf, "<init><status>OK</status><session>%u</session>"
-            "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>"
-            "<id>$Id: http_command.c,v 1.37 2007-04-16 21:11:26 quinn Exp $</id></init>", sesid);
+            "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>", sesid);
     rs->payload = nmem_strdup(c->nmem, buf);
     http_send_response(c);
 }
@@ -389,10 +386,10 @@ static void write_metadata(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);
+    char *name = session_setting_oneval(client_get_database(r->client), PZ_NAME);
 
     wrbuf_printf(w, "<location id=\"%s\" name=\"%s\">",
-            r->client->database->database->url,
+            client_get_database(r->client)->database->url,
             *name ? name : "Unknown");
     if (show_details)
         write_metadata(w, service, r->metadata, 1);