-/* $Id: http_command.c,v 1.40 2007-04-19 16:07:20 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.
*/
/*
- * $Id: http_command.c,v 1.40 2007-04-19 16:07:20 adam Exp $
+ * $Id: http_command.c,v 1.42 2007-05-15 15:50:48 adam Exp $
*/
#include <stdio.h>
#include "http.h"
#include "http_command.h"
#include "settings.h"
+#include "client.h"
// Update this when the protocol changes
#define PAZPAR2_PROTOCOL_VERSION "1"
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)
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)
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);