-/* $Id: pazpar2.c,v 1.66 2007-04-08 22:38:45 quinn Exp $ */
+/* $Id: pazpar2.c,v 1.68 2007-04-10 00:53:24 quinn Exp $ */
#include <stdlib.h>
#include <stdio.h>
cl->connection = new;
new->link = link;
- new->iochan = iochan_create(cs_fileno(link), 0, handler, 0);
+ new->iochan = iochan_create(cs_fileno(link), handler, 0);
iochan_setdata(new->iochan, new);
new->iochan->next = channel_list;
channel_list = new->iochan;
se->clients = cl;
}
-// This should be extended with parameters to control selection criteria
// Associates a set of clients with a session;
int select_targets(struct session *se, struct database_criterion *crit)
{
criteria = parse_filter(se->nmem, filter);
strcpy(se->query, query);
se->requestid++;
- // Release any existing clients
select_targets(se, criteria);
for (cl = se->clients; cl; cl = cl->next)
{
wrbuf_destroy(s->wrbuf);
}
-struct session *new_session()
+struct session *new_session(NMEM nmem)
{
int i;
- struct session *session = xmalloc(sizeof(*session));
+ struct session *session = nmem_malloc(nmem, sizeof(*session));
yaz_log(YLOG_DEBUG, "New pazpar2 session");
session->clients = 0;
session->expected_maxrecs = 0;
session->query[0] = '\0';
+ session->session_nmem = nmem;
session->nmem = nmem_create();
session->wrbuf = wrbuf_alloc();
for (i = 0; i <= SESSION_WATCH_MAX; i++)