X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fxmlutil.cpp;h=c59f5063f93bde96c8a8a2afee87a33db0fe35a9;hb=37370de3f869fec7204c42f0a28086f2fba820d0;hp=ef86b2d0cbcc65a447eb1982147c9963141b197b;hpb=e5329397729e8959a821c6956f75012372fc0a77;p=metaproxy-moved-to-github.git

diff --git a/src/xmlutil.cpp b/src/xmlutil.cpp
index ef86b2d..c59f506 100644
--- a/src/xmlutil.cpp
+++ b/src/xmlutil.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2011 Index Data
+   Copyright (C) 2005-2012 Index Data
 
 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
@@ -149,7 +149,7 @@ bool mp_xml::check_element_mp(const xmlNode *ptr,
     return true;
 }
 
-std::string mp_xml::get_route(const xmlNode *node)
+std::string mp_xml::get_route(const xmlNode *node, std::string &auth)
 {
     std::string route_value;
     if (node)
@@ -165,6 +165,8 @@ std::string mp_xml::get_route(const xmlNode *node)
             
             if (name == "route")
                 route_value = value;
+            else if (name == "auth")
+                auth = value;
             else
                 throw XMLError("Only attribute route allowed"
                                " in " + std::string((const char *)node->name)
@@ -174,6 +176,11 @@ std::string mp_xml::get_route(const xmlNode *node)
     return route_value;
 }
 
+std::string mp_xml::get_route(const xmlNode *node)
+{
+    std::string auth;
+    return get_route(node, auth);
+}
 
 const xmlNode* mp_xml::jump_to_children(const xmlNode* node,
                                           int xml_node_type)
@@ -206,10 +213,16 @@ void mp_xml::check_empty(const xmlNode *node)
     if (node)
     {
         const xmlNode *n;
+        const struct _xmlAttr *attr;
+        std::string extra;
+        for (attr = node->properties; attr; attr = attr->next)
+            if (!strcmp((const char *) attr->name, "type"))
+                extra = " of type " + get_text(attr);
         for (n = node->children; n; n = n->next)
             if (n->type == XML_ELEMENT_NODE)
                 throw mp::XMLError("No child elements allowed inside element "
-                                    + std::string((const char *) node->name));
+                                   + std::string((const char *) node->name)
+                                   + extra);
     }
 }