summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b4878c1)
so browsers can stop repeating requests when all activity has ended.
<show>
<status>OK</status>
<show>
<status>OK</status>
+ <activeclients>3</activeclients>
<merged>6</merged>
<total>7</total>
<start>0</start>
<merged>6</merged>
<total>7</total>
<start>0</start>
+ <activeclients>3</activeclients>
<list name="author">
<term>
<name>Donald Knuth</name>
<list name="author">
<term>
<name>Donald Knuth</name>
# ParaZ. Copyright (C) 2000-2004, Index Data ApS
# All rights reserved.
# ParaZ. Copyright (C) 2000-2004, Index Data ApS
# All rights reserved.
-# $Id: Makefile,v 1.5 2007-01-03 14:31:55 quinn Exp $
+# $Id: Makefile,v 1.6 2007-01-04 02:35:42 quinn Exp $
YAZLIBS=`$(YAZCONF) --libs`
YAZCFLAGS=`$(YAZCONF) --cflags`
YAZLIBS=`$(YAZCONF) --libs`
YAZCFLAGS=`$(YAZCONF) --cflags`
- * $Id: http_command.c,v 1.3 2007-01-03 06:23:44 quinn Exp $
+ * $Id: http_command.c,v 1.4 2007-01-04 02:35:42 quinn Exp $
int len;
int i;
char *name = http_argbyname(rq, "name");
int len;
int i;
char *name = http_argbyname(rq, "name");
+ int status = session_active_clients(s->psession);
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<termlist>");
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<termlist>");
+ wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>", status);
while (*name)
{
char tname[256];
while (*name)
{
char tname[256];
-static void show_records(struct http_channel *c)
+static void show_records(struct http_channel *c, int active)
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
+ // We haven't counted clients yet if we're called on a block release
+ if (active < 0)
+ active = session_active_clients(s->psession);
+
if (start)
startn = atoi(start);
if (num)
if (start)
startn = atoi(start);
if (num)
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<show>\n<status>OK</status>\n");
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, "<show>\n<status>OK</status>\n");
+ wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", active);
wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
wrbuf_printf(c->wrbuf, "<total>%d</total>\n", total_hits);
wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
wrbuf_printf(c->wrbuf, "<total>%d</total>\n", total_hits);
wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
{
struct http_channel *c = (struct http_channel *) data;
{
struct http_channel *c = (struct http_channel *) data;
}
static void cmd_show(struct http_channel *c)
}
static void cmd_show(struct http_channel *c)
struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
char *block = http_argbyname(rq, "block");
struct http_response *rs = c->response;
struct http_session *s = locate_session(rq, rs);
char *block = http_argbyname(rq, "block");
+ int status = session_active_clients(s->psession);
if (!s)
return;
if (block)
{
if (!s)
return;
if (block)
{
- if (!s->psession->reclist || !s->psession->reclist->num_records)
+ if (status && (!s->psession->reclist || !s->psession->reclist->num_records))
{
session_set_watch(s->psession, SESSION_WATCH_RECORDS, show_records_ready, c);
yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
{
session_set_watch(s->psession, SESSION_WATCH_RECORDS, show_records_ready, c);
yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
+ show_records(c, status);
}
static void cmd_ping(struct http_channel *c)
}
static void cmd_ping(struct http_channel *c)
-/* $Id: pazpar2.c,v 1.8 2007-01-03 16:59:32 quinn Exp $ */;
+/* $Id: pazpar2.c,v 1.9 2007-01-04 02:35:42 quinn Exp $ */;
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
+int session_active_clients(struct session *s)
+{
+ struct client *c;
+ int res = 0;
+
+ for (c = s->clients; c; c = c->next)
+ if (c->connection && (c->state == Client_Connecting ||
+ c->state == Client_Initializing ||
+ c->state == Client_Searching ||
+ c->state == Client_Presenting))
+ res++;
+
+ return res;
+}
+
char *search(struct session *se, char *query)
{
int live_channels = 0;
char *search(struct session *se, char *query)
{
int live_channels = 0;
int load_targets(struct session *s, const char *fn);
void statistics(struct session *s, struct statistics *stat);
char *search(struct session *s, char *query);
int load_targets(struct session *s, const char *fn);
void statistics(struct session *s, struct statistics *stat);
char *search(struct session *s, char *query);
-struct record **show(struct session *s, int start, int *num, int *total, int *sumhits, NMEM nmem_show);
+struct record **show(struct session *s, int start, int *num, int *total,
+ int *sumhits, NMEM nmem_show);
struct termlist_score **termlist(struct session *s, const char *name, int *num);
void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
struct termlist_score **termlist(struct session *s, const char *name, int *num);
void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
+int session_active_clients(struct session *s);