/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
* NT threaded server code by
* Chas Woodfield, Fretwell Downing Informatics.
*
- * $Id: statserv.c,v 1.32 2005-08-22 20:34:21 adam Exp $
+ * $Id: statserv.c,v 1.39 2006-07-06 10:17:54 adam Exp $
*/
/**
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifdef WIN32
#include <pwd.h>
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
1, /* dynamic mode */
0, /* threaded mode */
0, /* one shot (single session) */
- YLOG_DEFAULT_LEVEL, /* log level */
+ 0, /* __UNUSED_loglevel */
"", /* no PDUs */
"", /* diagnostic output to stderr */
"tcp:@:9999", /* default listener port */
static int add_listener(char *where, int listen_id);
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static xmlDocPtr xml_config_doc = 0;
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static xmlNodePtr xml_config_get_root()
{
xmlNodePtr ptr = 0;
}
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static char *nmem_dup_xml_content(NMEM n, xmlNodePtr ptr)
{
unsigned char *cp;
n->cql_transform = 0;
n->server_node_ptr = 0;
n->directory = 0;
+ n->docpath = 0;
+ n->stylesheet = 0;
+#if YAZ_HAVE_XML2
+ n->retrieval = yaz_retrieval_create();
+#endif
return n;
}
*cp = '\0';
host = vhost;
}
+ assoc->server = 0;
if (control_block.xml_config[0])
{
struct gfs_server *gfs;
xfree(assoc->init);
assoc->init = 0;
}
- assoc->cql_transform = gfs->cql_transform;
- assoc->server_node_ptr = gfs->server_node_ptr;
+ assoc->server = gfs;
assoc->last_control = &gfs->cb;
statserv_setcontrol(&gfs->cb);
gfs_server_chdir(gfs);
}
statserv_setcontrol(0);
assoc->last_control = 0;
- assoc->cql_transform = 0;
- assoc->server_node_ptr = 0;
yaz_log(YLOG_DEBUG, "server select: no match");
return 0;
}
{
statserv_setcontrol(&control_block);
assoc->last_control = &control_block;
- assoc->cql_transform = 0;
- assoc->server_node_ptr = 0;
yaz_log(YLOG_DEBUG, "server select: config=%s", control_block.configname);
return 1;
}
{
struct gfs_server **gfsp = &gfs_server_list;
struct gfs_listen **gfslp = &gfs_listen_list;
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
xmlNodePtr ptr = xml_config_get_root();
if (!ptr)
(*gfsp)->directory =
nmem_dup_xml_content(gfs_nmem, ptr->children);
}
+ else if (!strcmp((const char *) ptr->name, "docpath"))
+ {
+ (*gfsp)->docpath =
+ nmem_dup_xml_content(gfs_nmem, ptr->children);
+ }
+ else if (!strcmp((const char *) ptr->name, "stylesheet"))
+ {
+ char *s = nmem_dup_xml_content(gfs_nmem, ptr->children);
+ (*gfsp)->stylesheet =
+ nmem_malloc(gfs_nmem, strlen(s) + 2);
+ sprintf((*gfsp)->stylesheet, "/%s", s);
+ }
+ else if (!strcmp((const char *) ptr->name, "explain"))
+ {
+ ; /* being processed separately */
+ }
+ else if (!strcmp((const char *) ptr->name, "retrievalinfo"))
+ {
+ if (yaz_retrieval_configure((*gfsp)->retrieval, ptr))
+ {
+ yaz_log(YLOG_FATAL, "%s in config %s",
+ yaz_retrieval_get_error((*gfsp)->retrieval),
+ control_block.xml_config);
+ exit(1);
+ }
+ }
+ else
+ {
+ yaz_log(YLOG_FATAL, "Unknown element '%s' in config %s",
+ ptr->name, control_block.xml_config);
+ exit(1);
+ }
}
gfsp = &(*gfsp)->next;
}
#endif
gfs_nmem = nmem_create();
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (control_block.xml_config[0] == '\0')
return;
static void xml_config_close()
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (xml_config_doc)
{
xmlFreeDoc(xml_config_doc);
iochan_destroy(pp);
}
sprintf(nbuf, "%s(%d)", me, no_sessions);
- yaz_log_init(control_block.loglevel, nbuf, 0);
+ yaz_log_init_prefix(nbuf);
/* ensure that bend_stop is not called when each child exits -
only for the main process .. */
control_block.bend_stop = 0;
int ret = 0, r;
char *arg;
- /* set default log level */
- control_block.loglevel = yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL);
- yaz_log_init_level(control_block.loglevel);
+ if (getenv("YAZ_LOG") == 0) {
+ /*
+ * Set default log level. We want to avoid doing this if the
+ * user has already explicitly specified a preferred default
+ * log-level, hence the inelegant peek at the YAZ_LOG
+ * environment variable that will subsequently be interpreted
+ * by the YAZ logging module itself.
+ */
+ yaz_log_init_level(yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL));
+ }
get_logbits(1);
- while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:",
+ while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:A:p:DC:f:m:",
argv, argc, &arg)) != -2)
{
switch (ret)
break;
case 'l':
option_copy(control_block.logfile, arg);
- yaz_log_init(control_block.loglevel, me, control_block.logfile);
+ yaz_log_init_file(control_block.logfile);
break;
- case 'v':
- control_block.loglevel =
- yaz_log_mask_str_x(arg,control_block.loglevel);
- yaz_log_init(control_block.loglevel, me, control_block.logfile);
+ case 'm':
+ if (!arg) {
+ fprintf(stderr, "%s: Specify time format for log file.\n", me);
+ return(1);
+ }
+ yaz_log_time_format(arg);
+ break;
+ case 'v': {
+ int default_level = yaz_log_mask_str(STAT_DEFAULT_LOG_LEVEL);
+ yaz_log_init_level(yaz_log_mask_str_x(arg, default_level));
get_logbits(1);
break;
+ }
case 'a':
option_copy(control_block.apdufile, arg);
break;
option_copy(control_block.pid_fname, arg);
break;
case 'f':
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
option_copy(control_block.xml_config, arg);
#else
fprintf(stderr, "%s: Option -f unsupported since YAZ is compiled without Libxml2 support\n", me);
fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
" -k <kilobytes> -d <daemon> -p <pidfile> -C certfile"
- " -ziDST1 -w <directory> <listener-addr>... ]\n", me);
+ " -ziDST1 -m <time-format> -w <directory> <listener-addr>... ]\n", me);
return 1;
}
}
projects / yaz-moved-to-github.git / blobdiff