X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-proxy-config.cpp;h=056354b1718d19efca8a36cb8d99019596e9da52;hp=84a901ad4531379098207c11e8d025b8a29bb904;hb=5554ddf9c4d9670aaaa8f8b9ce6def1dadff3c96;hpb=cf75ac8890f84648d5960d4b07fea7aab9a6eff1 diff --git a/src/yaz-proxy-config.cpp b/src/yaz-proxy-config.cpp index 84a901a..056354b 100644 --- a/src/yaz-proxy-config.cpp +++ b/src/yaz-proxy-config.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy-config.cpp,v 1.7 2003-10-09 12:11:10 adam Exp $ + * $Id: yaz-proxy-config.cpp,v 1.8 2003-10-10 17:58:29 adam Exp $ */ #include @@ -26,15 +26,6 @@ Yaz_ProxyConfig::~Yaz_ProxyConfig() #endif } -void Yaz_ProxyConfig::operator=(const Yaz_ProxyConfig &conf) -{ -#if HAVE_XML2 - m_docPtr = conf.m_docPtr; - m_proxyPtr = conf.m_proxyPtr; -#endif - m_copy = 1; -} - int Yaz_ProxyConfig::read_xml(const char *fname) { #if HAVE_XML2 @@ -348,6 +339,7 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, int match = 0; // if we match record syntax const char *match_type = 0; const char *match_error = 0; + const char *match_marcxml = 0; struct _xmlAttr *attr; for (attr = ptr->properties; attr; attr = attr->next) { @@ -357,6 +349,9 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, if (!strcmp((const char *) attr->name, "error") && attr->children && attr->children->type == XML_TEXT_NODE) match_error = (const char *) attr->children->content; + if (!strcmp((const char *) attr->name, "marcxml") && + attr->children && attr->children->type == XML_TEXT_NODE) + match_marcxml = (const char *) attr->children->content; } if (match_type) { @@ -377,6 +372,10 @@ int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name, } if (match) { + if (match_marcxml) + { + return -1; + } if (match_error) { if (syntax)