X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=b92c0401ea74cee393b8d40eed18edbde5877870;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=6fc8f136e319e6bb3a80d9a301e0a7f9c1cfec04;hpb=240aff30845f7c20874ec9ee4115f3d7ea2a597e;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index 6fc8f13..b92c040 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,8 +1,20 @@
-/* $Id: xmlutil.cpp,v 1.11 2006-12-01 12:37:26 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2009 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"
 
@@ -17,15 +29,15 @@ static const std::string metaproxy_ns = "http://indexdata.com/metaproxy";
 
 std::string mp_xml::get_text(const struct _xmlAttr  *ptr)
 {
-    if (ptr->children->type == XML_TEXT_NODE)
-        return std::string((const char *) (ptr->children->content));
-    return std::string();
+    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;
@@ -198,8 +210,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
  */
+