X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=288096f2d89ef9cedfade99af7bb4ad71f1edc3f;hb=2865078b538314b9317df5d7e27099cff03f9621;hp=5ea9e84d453ee3db32a7a3f2267405392af6c91e;hpb=d625b10d219f5ece1aa7632e6cff2fcc5fcbd632;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index 5ea9e84..288096f 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,10 +1,22 @@
-/* $Id: xmlutil.cpp,v 1.12 2007-01-12 10:16:21 adam 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 "xmlutil.hpp"
+#include <metaproxy/xmlutil.hpp>
 
 #include <string.h>
 
@@ -33,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;
@@ -44,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);
@@ -198,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
  */
+