projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Require 2.0.12
[yazpp-moved-to-github.git]
/
src
/
yaz-proxy-config.cpp
diff --git
a/src/yaz-proxy-config.cpp
b/src/yaz-proxy-config.cpp
index
ef7b279
..
88449f3
100644
(file)
--- a/
src/yaz-proxy-config.cpp
+++ b/
src/yaz-proxy-config.cpp
@@
-2,7
+2,7
@@
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-proxy-config.cpp,v 1.24 2004-01-15 23:44:58 adam Exp $
+ * $Id: yaz-proxy-config.cpp,v 1.27 2004-01-30 00:38:28 adam Exp $
*/
#include <ctype.h>
*/
#include <ctype.h>
@@
-458,7
+458,8
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
}
if (match)
{
}
if (match)
{
- syntax_has_matched = 1;
+ if (!match_error)
+ syntax_has_matched = 1;
match = check_schema(ptr->children, comp, match_identifier);
}
if (match)
match = check_schema(ptr->children, comp, match_identifier);
}
if (match)
@@
-479,7
+480,7
@@
int Yaz_ProxyConfig::check_syntax(ODR odr, const char *name,
}
if (match_error)
{
}
if (match_error)
{
- if (syntax_has_matched) // if syntax did match, schema/ESN was bad
+ if (syntax_has_matched) // if syntax OK, bad schema/ESN
return 25;
if (syntax)
{
return 25;
if (syntax)
{
@@
-702,7
+703,7
@@
char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
break;
if (!ptr1)
continue;
break;
if (!ptr1)
continue;
- for (ptr1 = ptr1->children; ptr; ptr1 = ptr1->next)
+ for (ptr1 = ptr1->children; ptr1; ptr1 = ptr1->next)
if (ptr1->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr1->name, "database"))
break;
if (ptr1->type == XML_ELEMENT_NODE &&
!strcmp((const char *) ptr1->name, "database"))
break;
@@
-734,7
+735,6
@@
char *Yaz_ProxyConfig::get_explain(ODR odr, const char *name, const char *db,
}
}
#endif
}
}
#endif
- yaz_log(LOG_WARN, "No explain node");
return 0;
}
return 0;
}