* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.46 2007-01-03 08:42:15 adam Exp $
+ * $Id: statserv.c,v 1.52 2007-11-12 08:57:45 adam Exp $
*/
/**
1, /* dynamic mode */
0, /* threaded mode */
0, /* one shot (single session) */
- 0, /* __UNUSED_loglevel */
"", /* no PDUs */
"", /* diagnostic output to stderr */
"tcp:@:9999", /* default listener port */
len += xmlStrlen(p->content);
}
/* now allocate for the string */
- str = nmem_malloc(n, len);
+ str = (unsigned char *) nmem_malloc(n, len);
*str = '\0'; /* so we can use strcat */
for (p = ptr; p; p = p->next)
{
static struct gfs_server * gfs_server_new(void)
{
- struct gfs_server *n = nmem_malloc(gfs_nmem, sizeof(*n));
+ struct gfs_server *n = (struct gfs_server *)
+ nmem_malloc(gfs_nmem, sizeof(*n));
memcpy(&n->cb, &control_block, sizeof(control_block));
n->next = 0;
n->host = 0;
n->listen_ref = 0;
n->cql_transform = 0;
+ n->ccl_transform = 0;
n->server_node_ptr = 0;
n->directory = 0;
n->docpath = 0;
static struct gfs_listen * gfs_listen_new(const char *id,
const char *address)
{
- struct gfs_listen *n = nmem_malloc(gfs_nmem, sizeof(*n));
+ struct gfs_listen *n = (struct gfs_listen *)
+ nmem_malloc(gfs_nmem, sizeof(*n));
if (id)
n->id = nmem_strdup(gfs_nmem, id);
else
nmem_dup_xml_content(gfs_nmem, ptr->children)
);
}
+ else if (!strcmp((const char *) ptr->name, "ccl2rpn"))
+ {
+ char *name;
+ FILE *f;
+
+ name = nmem_dup_xml_content(gfs_nmem, ptr->children);
+ if ((f = fopen(name, "r")) == 0) {
+ yaz_log(YLOG_FATAL, "can't open CCL file '%s'", name);
+ exit(1);
+ }
+ gfs->ccl_transform = ccl_qual_mk();
+ ccl_qual_file (gfs->ccl_transform, f);
+ fclose(f);
+ }
else if (!strcmp((const char *) ptr->name, "directory"))
{
gfs->directory =
else if (!strcmp((const char *) ptr->name, "stylesheet"))
{
char *s = nmem_dup_xml_content(gfs_nmem, ptr->children);
- gfs->stylesheet =
+ gfs->stylesheet = (char *)
nmem_malloc(gfs_nmem, strlen(s) + 2);
sprintf(gfs->stylesheet, "/%s", s);
}
void __cdecl event_loop_thread (IOCHAN iochan)
{
- event_loop (&iochan);
+ iochan_event_loop (&iochan);
}
/* WIN32 listener */
association *newas;
IOCHAN new_chan;
COMSTACK new_line = (COMSTACK) vp;
- IOCHAN parent_chan = new_line->user;
+ IOCHAN parent_chan = (IOCHAN) new_line->user;
unsigned cs_get_mask, cs_accept_mask, mask =
((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
control_block.one_shot = 1;
if (control_block.threads)
{
- event_loop(&new_chan);
+ iochan_event_loop(&new_chan);
}
else
{
if (cs_bind(l, ap, CS_SERVER) < 0)
{
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+ if (cs_errno(l) == CSYSERR)
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to bind to %s", where);
+ else
+ yaz_log(YLOG_FATAL, "Failed to bind to %s: %s", where,
+ cs_strerror(l));
cs_close (l);
return -1;
}
return &control_block;
#elif YAZ_POSIX_THREADS
if (init_control_tls)
- return pthread_getspecific(current_control_tls);
+ return (statserv_options_block *)
+ pthread_getspecific(current_control_tls);
else
return &control_block;
#else
if (pListener == NULL)
return 1;
yaz_log(YLOG_DEBUG, "Entering event loop.");
- return event_loop(&pListener);
+ return iochan_event_loop(&pListener);
}
static void option_copy(char *dst, const char *src)