projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regression test, test_http.sh, moved to sub directory test. The test
[pazpar2-moved-to-github.git]
/
src
/
http_command.c
diff --git
a/src/http_command.c
b/src/http_command.c
index
f44fdf3
..
879159d
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-1,4
+1,4
@@
-/* $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.
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.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 <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 "http.h"
#include "http_command.h"
#include "settings.h"
+#include "client.h"
// Update this when the protocol changes
#define PAZPAR2_PROTOCOL_VERSION "1"
// Update this when the protocol changes
#define PAZPAR2_PROTOCOL_VERSION "1"
@@
-118,9
+119,12
@@
static void error(struct http_response *rs, char *code, char *msg, char *txt)
unsigned int make_sessionid()
{
unsigned int make_sessionid()
{
+ static int seq = 0;
+#if 1
+ return ++seq;
+#else
struct timeval t;
unsigned int res;
struct timeval t;
unsigned int res;
- static int seq = 0;
seq++;
if (gettimeofday(&t, 0) < 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;
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 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)
{
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\">",
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);
*name ? name : "Unknown");
if (show_details)
write_metadata(w, service, r->metadata, 1);