X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=5c95d837df9c6411f0a2a22e2222935e4ca6611f;hb=9dec54edaf1536d72030e95123c77040fc951185;hp=600ba5c6a29c5cee4e122deba83df3b190267bee;hpb=245ef75a37af52afa0fea2c52b1f2454f72f7394;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index 600ba5c..5c95d83 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,12 +1,16 @@
-/* $Id: xmlutil.cpp,v 1.3 2006-01-11 13:13:49 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: xmlutil.cpp,v 1.6 2006-06-09 14:12:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
 
 #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)
@@ -16,7 +20,7 @@ std::string yp2::xml::get_text(const xmlNode *ptr)
 }
 
 
-bool yp2::xml::is_element(const xmlNode *ptr, 
+bool mp_xml::is_element(const xmlNode *ptr, 
                           const std::string &ns,
                           const std::string &name)
 {
@@ -27,22 +31,22 @@ bool yp2::xml::is_element(const xmlNode *ptr,
     return false;
 }
 
-bool yp2::xml::is_element_yp2(const xmlNode *ptr, 
+bool mp_xml::is_element_yp2(const xmlNode *ptr, 
                               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)
 {
-    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;
 }
 
-std::string yp2::xml::get_route(const xmlNode *node)
+std::string mp_xml::get_route(const xmlNode *node)
 {
     std::string route_value;
     if (node)
@@ -68,7 +72,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;
@@ -77,7 +81,7 @@ const xmlNode* yp2::xml::jump_to_children(const xmlNode* 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;
@@ -86,7 +90,7 @@ const xmlNode* yp2::xml::jump_to_next(const xmlNode* 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)
@@ -94,6 +98,17 @@ const xmlNode* yp2::xml::jump_to(const xmlNode* node,
     return 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)
+                throw mp::XMLError("No child elements allowed inside element "
+                                    + std::string((const char *) node->name));
+    }
+}
 
 /*
  * Local variables: