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
Happy new year
[pazpar2-moved-to-github.git]
/
src
/
http_command.c
diff --git
a/src/http_command.c
b/src/http_command.c
index
68b56af
..
16c890a
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-17,26
+17,22
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
-/*
- * $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $
- */
-
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
-#include <sys/uio.h>
+#if HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <stdlib.h>
-#include <strings.h>
-#include <ctype.h>
+#include <string.h>
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <sys/time.h>
-#include <yaz/snprintf.h>
-#if HAVE_CONFIG_H
-#include <cconfig.h>
#endif
#endif
-
+#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
#include <yaz/yaz-util.h>
-#include "config.h"
#include "util.h"
#include "eventl.h"
#include "pazpar2.h"
#include "util.h"
#include "eventl.h"
#include "pazpar2.h"
@@
-66,7
+62,7
@@
static void session_timeout(IOCHAN i, int event)
http_session_destroy(s);
}
http_session_destroy(s);
}
-struct http_session *http_session_create()
+struct http_session *http_session_create(void)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
@@
-157,7
+153,7
@@
static void error(struct http_response *rs,
http_send_response(c);
}
http_send_response(c);
}
-unsigned int make_sessionid()
+unsigned int make_sessionid(void)
{
static int seq = 0;
unsigned int res;
{
static int seq = 0;
unsigned int res;
@@
-167,6
+163,9
@@
unsigned int make_sessionid()
res = seq;
else
{
res = seq;
else
{
+#ifdef WIN32
+ res = seq;
+#else
struct timeval t;
if (gettimeofday(&t, 0) < 0)
struct timeval t;
if (gettimeofday(&t, 0) < 0)
@@
-178,6
+177,7
@@
unsigned int make_sessionid()
(long long would be more appropriate)*/
res = t.tv_sec;
res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
(long long would be more appropriate)*/
res = t.tv_sec;
res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
+#endif
}
return res;
}
}
return res;
}
@@
-237,7
+237,7
@@
static int process_settings(struct session *se, struct http_request *rq,
static void cmd_exit(struct http_channel *c)
{
yaz_log(YLOG_WARN, "exit");
static void cmd_exit(struct http_channel *c)
{
yaz_log(YLOG_WARN, "exit");
- exit(0);
+ http_close_server();
}
static void cmd_init(struct http_channel *c)
}
static void cmd_init(struct http_channel *c)
@@
-422,6
+422,13
@@
static void cmd_bytarget(struct http_channel *c)
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "</id>\n");
wrbuf_xmlputs(c->wrbuf, ht[i].id);
wrbuf_puts(c->wrbuf, "</id>\n");
+ if (ht[i].name && ht[i].name[0])
+ {
+ wrbuf_puts(c->wrbuf, "<name>");
+ wrbuf_xmlputs(c->wrbuf, ht[i].name);
+ wrbuf_puts(c->wrbuf, "</name>\n");
+ }
+
wrbuf_printf(c->wrbuf, "<hits>%d</hits>\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
wrbuf_printf(c->wrbuf, "<hits>%d</hits>\n", ht[i].hits);
wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
@@
-485,8
+492,7
@@
static void write_subrecord(struct record *r, WRBUF w,
wrbuf_xmlputs(w, *name ? name : "Unknown");
wrbuf_puts(w, "\">");
wrbuf_xmlputs(w, *name ? name : "Unknown");
wrbuf_puts(w, "\">");
- if (show_details)
- write_metadata(w, service, r->metadata, 1);
+ write_metadata(w, service, r->metadata, show_details);
wrbuf_puts(w, "</location>\n");
}
wrbuf_puts(w, "</location>\n");
}
@@
-533,8
+539,8
@@
static void show_raw_record_ok_binary(void *data, const char *buf, size_t sz)
void show_raw_reset(void *data, struct http_channel *c, void *data2)
{
void show_raw_reset(void *data, struct http_channel *c, void *data2)
{
- struct client *client = data;
- client_show_raw_remove(client, data2);
+ //struct client *client = data;
+ //client_show_raw_remove(client, data2);
}
static void cmd_record_ready(void *data);
}
static void cmd_record_ready(void *data);
@@
-612,7
+618,9
@@
static void cmd_record(struct http_channel *c)
else
{
wrbuf_puts(c->wrbuf, "<record>\n");
else
{
wrbuf_puts(c->wrbuf, "<record>\n");
- wrbuf_printf(c->wrbuf, "<recid>%s</recid>\n", rec->recid);
+ wrbuf_puts(c->wrbuf, "<recid>");
+ wrbuf_xmlputs(c->wrbuf, rec->recid);
+ wrbuf_puts(c->wrbuf, "</recid>\n");
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
write_subrecord(r, c->wrbuf, service, 1);
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
write_subrecord(r, c->wrbuf, service, 1);
@@
-687,7
+695,9
@@
static void show_records(struct http_channel *c, int active)
write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
if (ccount > 1)
wrbuf_printf(c->wrbuf, "<count>%d</count>\n", 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>%s</recid>\n", rec->recid);
+ wrbuf_puts(c->wrbuf, "<recid>");
+ wrbuf_xmlputs(c->wrbuf, rec->recid);
+ wrbuf_puts(c->wrbuf, "</recid>\n");
wrbuf_puts(c->wrbuf, "</hit>\n");
}
wrbuf_puts(c->wrbuf, "</hit>\n");
}
@@
-824,9
+834,7
@@
static void cmd_stat(struct http_channel *c)
wrbuf_printf(c->wrbuf, "<clients>%d</clients>\n", stat.num_clients);
wrbuf_printf(c->wrbuf, "<unconnected>%d</unconnected>\n", stat.num_no_connection);
wrbuf_printf(c->wrbuf, "<connecting>%d</connecting>\n", stat.num_connecting);
wrbuf_printf(c->wrbuf, "<clients>%d</clients>\n", stat.num_clients);
wrbuf_printf(c->wrbuf, "<unconnected>%d</unconnected>\n", stat.num_no_connection);
wrbuf_printf(c->wrbuf, "<connecting>%d</connecting>\n", stat.num_connecting);
- wrbuf_printf(c->wrbuf, "<initializing>%d</initializing>\n", stat.num_initializing);
- wrbuf_printf(c->wrbuf, "<searching>%d</searching>\n", stat.num_searching);
- wrbuf_printf(c->wrbuf, "<presenting>%d</presenting>\n", stat.num_presenting);
+ wrbuf_printf(c->wrbuf, "<working>%d</working>\n", stat.num_working);
wrbuf_printf(c->wrbuf, "<idle>%d</idle>\n", stat.num_idle);
wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
wrbuf_printf(c->wrbuf, "<idle>%d</idle>\n", stat.num_idle);
wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);