* Copyright (c) 1998-2003, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy-config.cpp,v 1.5 2003-10-08 08:15:01 adam Exp $
+ * $Id: yaz-proxy-config.cpp,v 1.7 2003-10-09 12:11:10 adam Exp $
*/
#include <ctype.h>
#if HAVE_XML2
void Yaz_ProxyConfig::return_target_info(xmlNodePtr ptr,
const char **url,
- int *keepalive,
int *limit_bw,
int *limit_pdu,
int *limit_req,
int *target_idletime,
- int *client_idletime)
+ int *client_idletime,
+ int *keepalive_limit_bw,
+ int *keepalive_limit_pdu)
{
+ int no_url = 0;
ptr = ptr->children;
for (; ptr; ptr = ptr->next)
{
&& !strcmp((const char *) ptr->name, "url"))
{
const char *t = get_text(ptr);
- if (t)
- *url = t;
+ if (t && no_url < MAX_ZURL_PLEX)
+ {
+ url[no_url++] = t;
+ url[no_url] = 0;
+ }
}
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "keepalive"))
{
- const char *t = get_text(ptr);
- if (!t || *t == '1')
- *keepalive = 1;
- else
- *keepalive = 0;
+ int dummy;
+ *keepalive_limit_bw = 500000;
+ *keepalive_limit_pdu = 1000;
+ return_limit(ptr, keepalive_limit_bw, keepalive_limit_pdu,
+ &dummy);
}
if (ptr->type == XML_ELEMENT_NODE
&& !strcmp((const char *) ptr->name, "limit"))
for(ptr = ptr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
- !strcmp((const char *) ptr->name, "query"))
+ !strcmp((const char *) ptr->name, "attribute"))
{
const char *match_type = 0;
const char *match_value = 0;
xmlNodePtr Yaz_ProxyConfig::find_target_node(const char *name)
{
xmlNodePtr ptr;
+ if (!m_proxyPtr)
+ return 0;
for (ptr = m_proxyPtr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
void Yaz_ProxyConfig::get_target_info(const char *name,
const char **url,
- int *keepalive,
int *limit_bw,
int *limit_pdu,
int *limit_req,
int *target_idletime,
int *client_idletime,
- int *max_clients)
+ int *max_clients,
+ int *keepalive_limit_bw,
+ int *keepalive_limit_pdu)
{
#if HAVE_XML2
xmlNodePtr ptr;
if (!m_proxyPtr)
{
- *url = name;
+ url[0] = name;
+ url[1] = 0;
return;
}
+ url[0] = 0;
for (ptr = m_proxyPtr->children; ptr; ptr = ptr->next)
{
if (ptr->type == XML_ELEMENT_NODE &&
if (ptr)
{
if (name)
- *url = name;
- return_target_info(ptr, url, keepalive, limit_bw, limit_pdu, limit_req,
- target_idletime, client_idletime);
+ {
+ url[0] = name;
+ url[1] = 0;
+ }
+ return_target_info(ptr, url, limit_bw, limit_pdu, limit_req,
+ target_idletime, client_idletime,
+ keepalive_limit_bw, keepalive_limit_pdu);
}
#else
*url = name;