X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=b71f07438104af505eb9b1bdd54cea12989a52a5;hb=517e528f09d1f80ccc4948f9d38eeb79f8501975;hp=d1088e7a848da3bdee2ab2e1b9301b0ff22c31fa;hpb=79100c2ae2dac4bdde4f4d46b69e147562b4ec6c;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index d1088e7..b71f074 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,24 +1,97 @@
-/* $Id: xmlutil.cpp,v 1.5 2006-03-16 10:40:59 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: xmlutil.cpp,v 1.13 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "xmlutil.hpp"
 
+#include <string.h>
+
+
 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 mp_xml::get_text(const struct _xmlAttr  *ptr)
+{
+    return get_text(ptr->children);
+}
+
+std::string mp_xml::get_text(const xmlNode *ptr)
 {
     std::string c;
-    for (ptr = ptr->children; ptr; ptr = ptr->next)
+    if (ptr && ptr->type != XML_TEXT_NODE)
+        ptr = ptr->children;
+    for (; ptr; ptr = ptr->next)
         if (ptr->type == XML_TEXT_NODE)
             c += std::string((const char *) (ptr->content));
     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;
+}
+
+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::check_attribute(const _xmlAttr *ptr, 
+                             const std::string &ns,
+                             const std::string &name)
+{
+
+    if (!mp::xml::is_attribute(ptr, ns, name))
+    {   
+        std::string got_attr = "'";
+        if (ptr && ptr->name)
+            got_attr += std::string((const char *)ptr->name);
+        if (ns.size() && ptr && ptr->ns && ptr->ns->href){
+            got_attr += " ";
+            got_attr += std::string((const char *)ptr->ns->href);
+         }
+        got_attr += "'";
+        
+        throw mp::XMLError("Expected XML attribute '" + name 
+                           + " " + ns + "'"
+                           + ", not " + got_attr);
+    }
+    return true;
+}
+
+bool mp_xml::is_attribute(const _xmlAttr *ptr, 
+                          const std::string &ns,
+                          const std::string &name)
+{
+    if (0 != xmlStrcmp(BAD_CAST name.c_str(), ptr->name))
+        return false;
+
+    if (ns.size() 
+        && (!ptr->ns || !ptr->ns->href 
+            || 0 != xmlStrcmp(BAD_CAST ns.c_str(), ptr->ns->href)))
+        return false;
+
+    return true;
+}
+
 
-bool mp::xml::is_element(const xmlNode *ptr, 
+bool mp_xml::is_element(const xmlNode *ptr, 
                           const std::string &ns,
                           const std::string &name)
 {
@@ -29,22 +102,36 @@ 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;
 }
 
-std::string mp::xml::get_route(const xmlNode *node)
+std::string mp_xml::get_route(const xmlNode *node)
 {
     std::string route_value;
     if (node)
@@ -70,7 +157,7 @@ std::string mp::xml::get_route(const xmlNode *node)
 }
 
 
-const xmlNode* mp::xml::jump_to_children(const xmlNode* node,
+const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
                                           int xml_node_type)
 {
     node = node->children;
@@ -79,7 +166,7 @@ const xmlNode* mp::xml::jump_to_children(const xmlNode* node,
     return node;
 }
 
-const xmlNode* mp::xml::jump_to_next(const xmlNode* node,
+const xmlNode* mp_xml::jump_to_next(const xmlNode* node,
                                       int xml_node_type)
 {
     node = node->next;
@@ -88,7 +175,7 @@ const xmlNode* mp::xml::jump_to_next(const xmlNode* node,
     return node;
 }
 
-const xmlNode* mp::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)
@@ -96,7 +183,7 @@ const xmlNode* mp::xml::jump_to(const xmlNode* node,
     return node;
 }
 
-void mp::xml::check_empty(const xmlNode *node)
+void mp_xml::check_empty(const xmlNode *node)
 {
     if (node)
     {