X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=288096f2d89ef9cedfade99af7bb4ad71f1edc3f;hb=0c6b0bda325d897e4c1e959747317fa8e76638f6;hp=6356f60bba4cacb64995a5a9485132fd2b72e506;hpb=9ac41f74e33f58fbbb507f0b3ae9ccdce306f525;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index 6356f60..288096f 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,11 +1,25 @@
-/* $Id: xmlutil.cpp,v 1.10 2006-11-29 13:00:54 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2011 Index Data
 
-   See the LICENSE file for details
- */
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <metaproxy/xmlutil.hpp>
 
 #include <string.h>
-#include "xmlutil.hpp"
+
 
 namespace mp = metaproxy_1;
 // Doxygen doesn't like mp::xml, so we use this instead
@@ -13,10 +27,17 @@ namespace mp_xml = metaproxy_1::xml;
 
 static const std::string metaproxy_ns = "http://indexdata.com/metaproxy";
 
+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;
@@ -24,9 +45,12 @@ std::string mp_xml::get_text(const xmlNode *ptr)
 
 bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
 {
+    if (ptr && ptr->type != XML_TEXT_NODE)
+        ptr = ptr->children;
     if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
     {
-        if (!strcmp((const char *) ptr->content, "true"))
+        if (!strcmp((const char *) ptr->content, "true")
+            || !strcmp((const char *) ptr->content, "1"))
             return true;
         else
             return false;
@@ -35,7 +59,9 @@ bool mp_xml::get_bool(const xmlNode *ptr, bool default_value)
 }
 
 int mp_xml::get_int(const xmlNode *ptr, int default_value)
-{
+{ 
+    if (ptr && ptr->type != XML_TEXT_NODE)
+        ptr = ptr->children;
     if (ptr && ptr->type == XML_TEXT_NODE && ptr->content)
     {
         return atoi((const char *) ptr->content);
@@ -43,6 +69,45 @@ int mp_xml::get_int(const xmlNode *ptr, int default_value)
     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, 
                           const std::string &ns,
                           const std::string &name)
@@ -150,8 +215,9 @@ void mp_xml::check_empty(const xmlNode *node)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+