changed config file root element from <yp2 ... > to

[metaproxy-moved-to-github.git] / src / xmlutil.cpp

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index 0a333ea..6356f60 100644 (file)
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,4 +1,4 @@
-/* $Id: xmlutil.cpp,v 1.8 2006-06-19 13:08:00 adam Exp $
+/* $Id: xmlutil.cpp,v 1.10 2006-11-29 13:00:54 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -11,6 +11,8 @@ namespace mp = metaproxy_1;
 // Doxygen doesn't like mp::xml, so we use this instead
 namespace mp_xml = metaproxy_1::xml;
 
+static const std::string metaproxy_ns = "http://indexdata.com/metaproxy";
+
 std::string mp_xml::get_text(const xmlNode *ptr)
 {
     std::string c;
@@ -32,6 +34,15 @@ bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
     return default_value;
 }
 
+int mp_xml::get_int(const xmlNode *ptr, int default_value)
+{
+    if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
+    {
+        return atoi((const char *) ptr->content);
+    }
+    return default_value;
+}
+
 bool mp_xml::is_element(const xmlNode *ptr, 
                           const std::string &ns,
                           const std::string &name)
@@ -43,18 +54,32 @@ bool mp_xml::is_element(const xmlNode *ptr,
     return false;
 }
 
-bool mp_xml::is_element_yp2(const xmlNode *ptr, 
-                              const std::string &name)
+bool mp_xml::is_element_mp(const xmlNode *ptr, 
+                           const std::string &name)
 {
-    return mp::xml::is_element(ptr, "http://indexdata.dk/yp2/config/1", name);
+    return mp::xml::is_element(ptr, metaproxy_ns, name);
 }
 
 
-bool mp_xml::check_element_yp2(const xmlNode *ptr, 
-                                 const std::string &name)
+bool mp_xml::check_element_mp(const xmlNode *ptr, 
+                              const std::string &name)
 {
-    if (!mp::xml::is_element_yp2(ptr, name))
-        throw mp::XMLError("Expected element name " + name);
+    if (!mp::xml::is_element_mp(ptr, name))
+    {
+        std::string got_element = "<";
+        if (ptr && ptr->name)
+            got_element += std::string((const char *)ptr->name);
+        if (ptr && ptr->ns && ptr->ns->href){
+            got_element += " xmlns=\"";
+            got_element += std::string((const char *)ptr->ns->href);
+            got_element += "\"";
+        }
+        got_element += ">";
+
+        throw mp::XMLError("Expected XML element <" + name 
+                           + " xmlns=\"" + metaproxy_ns + "\">"
+                           + ", not " + got_element);
+    }
     return true;
 }