projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New attribute "backendcharset" for syntax section which specifies
[yazproxy-moved-to-github.git]
/
src
/
yaz-proxy-config.cpp
diff --git
a/src/yaz-proxy-config.cpp
b/src/yaz-proxy-config.cpp
index
772b678
..
2102e9a
100644
(file)
--- a/
src/yaz-proxy-config.cpp
+++ b/
src/yaz-proxy-config.cpp
@@
-1,4
+1,4
@@
-/* $Id: yaz-proxy-config.cpp,v 1.5 2004-08-10 09:02:16 adam Exp $
+/* $Id: yaz-proxy-config.cpp,v 1.6 2004-08-29 13:01:43 adam Exp $
Copyright (c) 1998-2004, Index Data.
This file is part of the yaz-proxy.
Copyright (c) 1998-2004, Index Data.
This file is part of the yaz-proxy.
@@
-447,7
+447,8
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
Odr_oid *syntax, Z_RecordComposition *comp,
char **addinfo,
char **stylesheet, char **schema,
Odr_oid *syntax, Z_RecordComposition *comp,
char **addinfo,
char **stylesheet, char **schema,
- char **backend_type)
+ char **backend_type,
+ char **backend_charset)
{
if (stylesheet)
{
{
if (stylesheet)
{
@@
-464,6
+465,11
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
xfree (*backend_type);
*backend_type = 0;
}
xfree (*backend_type);
*backend_type = 0;
}
+ if (backend_charset)
+ {
+ xfree (*backend_charset);
+ *backend_charset = 0;
+ }
#if HAVE_XSLT
int syntax_has_matched = 0;
xmlNodePtr ptr;
#if HAVE_XSLT
int syntax_has_matched = 0;
xmlNodePtr ptr;
@@
-483,6
+489,7
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
const char *match_stylesheet = 0;
const char *match_identifier = 0;
const char *match_backend_type = 0;
const char *match_stylesheet = 0;
const char *match_identifier = 0;
const char *match_backend_type = 0;
+ const char *match_backend_charset = 0;
struct _xmlAttr *attr;
for (attr = ptr->properties; attr; attr = attr->next)
{
struct _xmlAttr *attr;
for (attr = ptr->properties; attr; attr = attr->next)
{
@@
-505,6
+512,10
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
attr->children && attr->children->type == XML_TEXT_NODE)
match_backend_type = (const char *)
attr->children->content;
attr->children && attr->children->type == XML_TEXT_NODE)
match_backend_type = (const char *)
attr->children->content;
+ if (!strcmp((const char *) attr->name, "backendcharset") &&
+ attr->children && attr->children->type == XML_TEXT_NODE)
+ match_backend_charset = (const char *)
+ attr->children->content;
}
if (match_type)
{
}
if (match_type)
{
@@
-547,6
+558,11
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
xfree(*backend_type);
*backend_type = xstrdup(match_backend_type);
}
xfree(*backend_type);
*backend_type = xstrdup(match_backend_type);
}
+ if (backend_charset && match_backend_charset)
+ {
+ xfree(*backend_charset);
+ *backend_charset = xstrdup(match_backend_charset);
+ }
if (match_marcxml)
{
return -1;
if (match_marcxml)
{
return -1;