X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=1a38a82e6fd610c015243e20d0a345a6cea1efc7;hb=2628f9508a3b56be7071f2db91f9f4fd1f6f2d52;hp=1e9d4f681a048fb95577f1705b49b5231d12d05c;hpb=d8313ec350f1eb3a8fc8815a35c5f97aaddfc724;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 1e9d4f6..1a38a82 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,7 +1,5 @@ -/* $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + 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 @@ -14,31 +12,27 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +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 +#endif #include #include -#include +#if HAVE_UNISTD_H #include +#endif #include -#include -#include +#include +#if HAVE_SYS_TIME_H #include -#include -#if HAVE_CONFIG_H -#include #endif - +#include #include -#include "config.h" #include "util.h" #include "eventl.h" #include "pazpar2.h" @@ -68,7 +62,7 @@ static void session_timeout(IOCHAN i, int event) 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)); @@ -159,7 +153,7 @@ static void error(struct http_response *rs, http_send_response(c); } -unsigned int make_sessionid() +unsigned int make_sessionid(void) { static int seq = 0; unsigned int res; @@ -169,6 +163,9 @@ unsigned int make_sessionid() res = seq; else { +#ifdef WIN32 + res = seq; +#else struct timeval t; if (gettimeofday(&t, 0) < 0) @@ -180,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); +#endif } return res; } @@ -239,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"); - exit(0); + http_close_server(); } static void cmd_init(struct http_channel *c) @@ -424,6 +422,13 @@ static void cmd_bytarget(struct http_channel *c) wrbuf_xmlputs(c->wrbuf, ht[i].id); wrbuf_puts(c->wrbuf, "\n"); + if (ht[i].name && ht[i].name[0]) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].name); + wrbuf_puts(c->wrbuf, "\n"); + } + wrbuf_printf(c->wrbuf, "%d\n", ht[i].hits); wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic); wrbuf_printf(c->wrbuf, "%d\n", ht[i].records); @@ -487,8 +492,7 @@ static void write_subrecord(struct record *r, WRBUF 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, "\n"); } @@ -535,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) { - 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); @@ -591,30 +595,29 @@ static void cmd_record(struct http_channel *c) } else { - void *data2; http_channel_observer_t obs = http_add_observer(c, r->client, show_raw_reset); - int ret = - client_show_raw_begin(r->client, r->position, syntax, esn, - obs /* data */, - show_raw_record_error, - (binary ? - show_raw_record_ok_binary : - show_raw_record_ok), - &data2, - (binary ? 1 : 0)); + int ret = client_show_raw_begin(r->client, r->position, + syntax, esn, + obs /* data */, + show_raw_record_error, + (binary ? + show_raw_record_ok_binary : + show_raw_record_ok), + (binary ? 1 : 0)); if (ret == -1) { http_remove_observer(obs); error(rs, PAZPAR2_NO_SESSION, 0); - return; } } } else { wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%s\n", rec->recid); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, rec->recid); + wrbuf_puts(c->wrbuf, "\n"); write_metadata(c->wrbuf, service, rec->metadata, 1); for (r = rec->records; r; r = r->next) write_subrecord(r, c->wrbuf, service, 1); @@ -689,7 +692,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, "%d\n", ccount); - wrbuf_printf(c->wrbuf, "%s\n", rec->recid); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, rec->recid); + wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, "\n"); } @@ -812,12 +817,18 @@ static void cmd_stat(struct http_channel *c) struct statistics stat; int clients; + float progress = 0; + if (!s) return; clients = session_active_clients(s->psession); statistics(s->psession, &stat); + if (stat.num_clients > 0) { + progress = (stat.num_clients - clients) / (float)stat.num_clients; + } + wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, ""); wrbuf_printf(c->wrbuf, "%d\n", clients); @@ -826,12 +837,11 @@ static void cmd_stat(struct http_channel *c) wrbuf_printf(c->wrbuf, "%d\n", stat.num_clients); wrbuf_printf(c->wrbuf, "%d\n", stat.num_no_connection); wrbuf_printf(c->wrbuf, "%d\n", stat.num_connecting); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_initializing); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_searching); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_presenting); + wrbuf_printf(c->wrbuf, "%d\n", stat.num_working); wrbuf_printf(c->wrbuf, "%d\n", stat.num_idle); wrbuf_printf(c->wrbuf, "%d\n", stat.num_failed); wrbuf_printf(c->wrbuf, "%d\n", stat.num_error); + wrbuf_printf(c->wrbuf, "%.2f\n", progress); wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -913,7 +923,9 @@ void http_command(struct http_channel *c) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +