projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1713d9e
)
Change RouterFleXML so that filters element gets optional
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 18 Jan 2006 10:30:58 +0000
(10:30 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 18 Jan 2006 10:30:58 +0000
(10:30 +0000)
src/router_flexml.cpp
patch
|
blob
|
history
diff --git
a/src/router_flexml.cpp
b/src/router_flexml.cpp
index
16aec11
..
027d2ae
100644
(file)
--- a/
src/router_flexml.cpp
+++ b/
src/router_flexml.cpp
@@
-1,4
+1,4
@@
-/* $Id: router_flexml.cpp,v 1.14 2006-01-11 13:13:49 adam Exp $
+/* $Id: router_flexml.cpp,v 1.15 2006-01-18 10:30:58 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
Copyright (c) 2005, Index Data.
%LICENSE%
@@
-233,13
+233,15
@@
void yp2::RouterFleXML::Rep::parse_xml_config_dom(xmlDocPtr doc)
}
node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
}
node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
}
- // process <filters> node which is expected second element node
- yp2::xml::check_element_yp2(node, "filters");
-
- parse_xml_filters(doc, yp2::xml::jump_to_children(node, XML_ELEMENT_NODE));
+ // process <filters> node if given
+ if (yp2::xml::is_element_yp2(node, "filters"))
+ {
+ parse_xml_filters(doc, yp2::xml::jump_to_children(node,
+ XML_ELEMENT_NODE));
+ node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
+ }
// process <routes> node which is expected third element node
// process <routes> node which is expected third element node
- node = yp2::xml::jump_to_next(node, XML_ELEMENT_NODE);
yp2::xml::check_element_yp2(node, "routes");
parse_xml_routes(doc, yp2::xml::jump_to_children(node, XML_ELEMENT_NODE));
yp2::xml::check_element_yp2(node, "routes");
parse_xml_routes(doc, yp2::xml::jump_to_children(node, XML_ELEMENT_NODE));