projects
/
metaproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on session_shared - scan support, better error handling, Z39.50
[metaproxy-moved-to-github.git]
/
src
/
xmlutil.cpp
diff --git
a/src/xmlutil.cpp
b/src/xmlutil.cpp
index
d4026b9
..
0a333ea
100644
(file)
--- a/
src/xmlutil.cpp
+++ b/
src/xmlutil.cpp
@@
-1,12
+1,17
@@
-/* $Id: xmlutil.cpp,v 1.4 2006-01-11 14:58:28 adam Exp $
- Copyright (c) 2005, Index Data.
+/* $Id: xmlutil.cpp,v 1.8 2006-06-19 13:08:00 adam Exp $
+ Copyright (c) 2005-2006, Index Data.
-%LICENSE%
+ See the LICENSE file for details
*/
*/
+#include <string.h>
#include "xmlutil.hpp"
#include "xmlutil.hpp"
-std::string yp2::xml::get_text(const xmlNode *ptr)
+namespace mp = metaproxy_1;
+// Doxygen doesn't like mp::xml, so we use this instead
+namespace mp_xml = metaproxy_1::xml;
+
+std::string mp_xml::get_text(const xmlNode *ptr)
{
std::string c;
for (ptr = ptr->children; ptr; ptr = ptr->next)
{
std::string c;
for (ptr = ptr->children; ptr; ptr = ptr->next)
@@
-15,8
+20,19
@@
std::string yp2::xml::get_text(const xmlNode *ptr)
return c;
}
return c;
}
+bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
+{
+ if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
+ {
+ if (!strcmp((const char *) ptr->content, "true"))
+ return true;
+ else
+ return false;
+ }
+ return default_value;
+}
-bool yp2::xml::is_element(const xmlNode *ptr,
+bool mp_xml::is_element(const xmlNode *ptr,
const std::string &ns,
const std::string &name)
{
const std::string &ns,
const std::string &name)
{
@@
-27,22
+43,22
@@
bool yp2::xml::is_element(const xmlNode *ptr,
return false;
}
return false;
}
-bool yp2::xml::is_element_yp2(const xmlNode *ptr,
+bool mp_xml::is_element_yp2(const xmlNode *ptr,
const std::string &name)
{
const std::string &name)
{
- return yp2::xml::is_element(ptr, "http://indexdata.dk/yp2/config/1", name);
+ return mp::xml::is_element(ptr, "http://indexdata.dk/yp2/config/1", name);
}
}
-bool yp2::xml::check_element_yp2(const xmlNode *ptr,
+bool mp_xml::check_element_yp2(const xmlNode *ptr,
const std::string &name)
{
const std::string &name)
{
- if (!yp2::xml::is_element_yp2(ptr, name))
- throw yp2::XMLError("Expected element name " + name);
+ if (!mp::xml::is_element_yp2(ptr, name))
+ throw mp::XMLError("Expected element name " + name);
return true;
}
return true;
}
-std::string yp2::xml::get_route(const xmlNode *node)
+std::string mp_xml::get_route(const xmlNode *node)
{
std::string route_value;
if (node)
{
std::string route_value;
if (node)
@@
-68,7
+84,7
@@
std::string yp2::xml::get_route(const xmlNode *node)
}
}
-const xmlNode* yp2::xml::jump_to_children(const xmlNode* node,
+const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
int xml_node_type)
{
node = node->children;
int xml_node_type)
{
node = node->children;
@@
-77,7
+93,7
@@
const xmlNode* yp2::xml::jump_to_children(const xmlNode* node,
return node;
}
return node;
}
-const xmlNode* yp2::xml::jump_to_next(const xmlNode* node,
+const xmlNode* mp_xml::jump_to_next(const xmlNode* node,
int xml_node_type)
{
node = node->next;
int xml_node_type)
{
node = node->next;
@@
-86,7
+102,7
@@
const xmlNode* yp2::xml::jump_to_next(const xmlNode* node,
return node;
}
return node;
}
-const xmlNode* yp2::xml::jump_to(const xmlNode* node,
+const xmlNode* mp_xml::jump_to(const xmlNode* node,
int xml_node_type)
{
for (; node && node->type != xml_node_type; node = node->next)
int xml_node_type)
{
for (; node && node->type != xml_node_type; node = node->next)
@@
-94,14
+110,14
@@
const xmlNode* yp2::xml::jump_to(const xmlNode* node,
return node;
}
return node;
}
-void yp2::xml::check_empty(const xmlNode *node)
+void mp_xml::check_empty(const xmlNode *node)
{
if (node)
{
const xmlNode *n;
for (n = node->children; n; n = n->next)
if (n->type == XML_ELEMENT_NODE)
{
if (node)
{
const xmlNode *n;
for (n = node->children; n; n = n->next)
if (n->type == XML_ELEMENT_NODE)
- throw yp2::XMLError("No child elements allowed inside element "
+ throw mp::XMLError("No child elements allowed inside element "
+ std::string((const char *) node->name));
}
}
+ std::string((const char *) node->name));
}
}