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

diff --git a/src/http_command.c b/src/http_command.c
index 98d84fd..879159d 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,4 +1,4 @@
-/* $Id: http_command.c,v 1.39 2007-04-19 15:31:23 adam 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.39 2007-04-19 15:31:23 adam Exp $
+ * $Id: http_command.c,v 1.42 2007-05-15 15:50:48 adam Exp $
  */
 
 #include <stdio.h>
@@ -45,6 +45,7 @@ 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"
@@ -82,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;
 }
 
@@ -118,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)
@@ -128,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)
@@ -385,10 +390,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);