-/* $Id: config.c,v 1.12 2007-01-15 04:34:28 quinn Exp $ */
+/* $Id: config.c,v 1.14 2007-02-05 16:15:41 quinn Exp $ */
#include <string.h>
r->port = 0;
r->proxy_host = 0;
r->proxy_port = 0;
+ r->myurl = 0;
r->service = 0;
r->next = 0;
{
xmlChar *port = xmlGetProp(n, "port");
xmlChar *host = xmlGetProp(n, "host");
+ xmlChar *myurl = xmlGetProp(n, "myurl");
if (port)
r->proxy_port = atoi(port);
if (host)
r->proxy_host = nmem_strdup(nmem, host);
+ if (myurl)
+ r->myurl = nmem_strdup(nmem, myurl);
+ else
+ {
+ yaz_log(YLOG_FATAL, "Must specify @myurl for proxy");
+ return 0;
+ }
xmlFree(port);
xmlFree(host);
+ xmlFree(myurl);
}
else if (!strcmp(n->name, "service"))
{
yaz_log(YLOG_WARN, "Missing name in 'nativesyntax' element");
return 0;
}
+ if (encoding)
+ r->native_encoding = encoding;
if (!strcmp(name, "iso2709"))
{
r->native_syntax = Nativesyn_iso2709;
// Set a few defaults, too
r->native_format = Nativeform_marc21;
r->native_mapto = Nativemapto_marcxml;
- r->native_encoding = "marc-8";
+ if (!r->native_encoding)
+ r->native_encoding = "marc-8";
setup_marc(r);
}
else if (!strcmp(name, "xml"))
return 0;
}
}
- if (encoding)
- r->native_encoding = encoding;
if (mapto)
{
if (!strcmp(mapto, "marcxml"))