-/* $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
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 <config.h>
+#endif
#include <stdio.h>
#include <sys/types.h>
-#include <sys/uio.h>
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <stdlib.h>
-#include <strings.h>
-#include <ctype.h>
+#include <string.h>
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
-#include <yaz/snprintf.h>
-#if HAVE_CONFIG_H
-#include <cconfig.h>
#endif
-
+#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
-#include "config.h"
#include "util.h"
#include "eventl.h"
#include "pazpar2.h"
http_session_destroy(s);
}
-struct http_session *http_session_create()
+struct http_session *http_session_create(struct conf_service *service)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
- r->psession = new_session(nmem);
+ r->psession = new_session(nmem, service);
r->session_id = 0;
r->timestamp = 0;
r->nmem = nmem;
http_send_response(c);
}
-unsigned int make_sessionid()
+unsigned int make_sessionid(void)
{
static int seq = 0;
unsigned int res;
res = seq;
else
{
+#ifdef WIN32
+ res = seq;
+#else
struct timeval t;
if (gettimeofday(&t, 0) < 0)
(long long would be more appropriate)*/
res = t.tv_sec;
res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1);
+#endif
}
return res;
}
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)
unsigned int sesid;
char buf[1024];
const char *clear = http_argbyname(c->request, "clear");
- struct http_session *s = http_session_create();
+ const char *service_name = http_argbyname(c->request, "service");
+ struct conf_service *service = locate_service(c->server,
+ service_name);
+ struct http_session *s = http_session_create(service);
struct http_response *rs = c->response;
+ if (!service)
+ {
+ error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "service");
+ return;
+ }
+
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
session_init_databases(s->psession);
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_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");
}
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);
struct http_response *rs = c->response;
struct http_request *rq = c->request;
struct http_session *s = locate_session(rq, rs);
- struct record_cluster *rec;
+ struct record_cluster *rec, *prev_r, *next_r;
struct record *r;
- struct conf_service *service = global_parameters.server->service;
+ struct conf_service *service = s->psession->service;
const char *idstr = http_argbyname(rq, "id");
const char *offsetstr = http_argbyname(rq, "offset");
const char *binarystr = http_argbyname(rq, "binary");
return;
}
wrbuf_rewind(c->wrbuf);
- if (!(rec = show_single(s->psession, idstr)))
+ if (!(rec = show_single(s->psession, idstr, &prev_r, &next_r)))
{
if (session_set_watch(s->psession, SESSION_WATCH_RECORD,
cmd_record_ready, c, c) != 0)
}
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, "<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");
+ if (prev_r)
+ {
+ wrbuf_puts(c->wrbuf, "<prevrecid>");
+ wrbuf_xmlputs(c->wrbuf, prev_r->recid);
+ wrbuf_puts(c->wrbuf, "</prevrecid>\n");
+ }
+ if (next_r)
+ {
+ wrbuf_puts(c->wrbuf, "<nextrecid>");
+ wrbuf_xmlputs(c->wrbuf, next_r->recid);
+ wrbuf_puts(c->wrbuf, "</nextrecid>\n");
+ }
+ wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n",
+ session_active_clients(s->psession));
write_metadata(c->wrbuf, service, rec->metadata, 1);
for (r = rec->records; r; r = r->next)
write_subrecord(r, c->wrbuf, service, 1);
numn = atoi(num);
if (!sort)
sort = "relevance";
- if (!(sp = reclist_parse_sortparms(c->nmem, sort)))
+ if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
{
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
return;
int ccount;
struct record *p;
struct record_cluster *rec = rl[i];
- struct conf_service *service = global_parameters.server->service;
+ struct conf_service *service = s->psession->service;
wrbuf_puts(c->wrbuf, "<hit>\n");
write_metadata(c->wrbuf, service, rec->metadata, 0);
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");
}
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, "<stat>");
wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
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, "<progress>%.2f</progress>\n", progress);
wrbuf_puts(c->wrbuf, "</stat>");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<info>\n");
wrbuf_puts(c->wrbuf, " <version>\n");
- wrbuf_puts(c->wrbuf, "<pazpar2>");
+ wrbuf_puts(c->wrbuf, "<pazpar2");
+#ifdef PAZPAR2_VERSION_SHA1
+ wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
+#endif
+ wrbuf_puts(c->wrbuf, ">");
wrbuf_xmlputs(c->wrbuf, VERSION);
wrbuf_puts(c->wrbuf, "</pazpar2>");
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / pazpar2-moved-to-github.git / blobdiff