Partial addition of 1.1 KeyInfo extensions.

[shibboleth/cpp-xmltooling.git] / xmltooling / util / TemplateEngine.h

diff --git a/xmltooling/util/TemplateEngine.h b/xmltooling/util/TemplateEngine.h
index eba0689..157c912 100644 (file)
--- a/xmltooling/util/TemplateEngine.h
+++ b/xmltooling/util/TemplateEngine.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2009 Internet2
+ *  Copyright 2001-2010 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #ifndef __xmltooling_template_h__
 #define __xmltooling_template_h__
 
-#include <xmltooling/io/GenericRequest.h>
+#include <xmltooling/base.h>
 
 #include <map>
 #include <string>
@@ -37,6 +37,8 @@
 
 namespace xmltooling {
 
+    class XMLTOOL_API GenericRequest;
+
     /**
      * Simple template replacement engine. Supports the following:
      * <ul>
@@ -53,13 +55,12 @@ namespace xmltooling {
      */
     class XMLTOOL_API TemplateEngine
     {
-        MAKE_NONCOPYABLE(TemplateEngine);
+    MAKE_NONCOPYABLE(TemplateEngine);
     public:
-        TemplateEngine() {
-            setTagPrefix("mlp");
-        }
+        /** Default constructor. */
+        TemplateEngine();
 
-        virtual ~TemplateEngine() {}
+        virtual ~TemplateEngine();
 
         /**
          * Sets the tag name to use when locating template replacement tags.
@@ -73,10 +74,9 @@ namespace xmltooling {
          * Allows callers to supply a more dynamic lookup mechanism to supplement a basic map.
          */
         class XMLTOOL_API TemplateParameters {
-            // MAKE_NONCOPYABLE(TemplateParameters);
         public:
-            TemplateParameters() : m_request(NULL) {}
-            virtual ~TemplateParameters() {}
+            TemplateParameters();
+            virtual ~TemplateParameters();
 
             /** Map of known parameters to supply to template. */
             std::map<std::string,std::string> m_map;
@@ -91,23 +91,17 @@ namespace xmltooling {
              * Returns the value of a parameter to plug into the template.
              *
              * @param name  name of parameter
-             * @return value of parameter, or NULL
+             * @return value of parameter, or nullptr
              */
-            virtual const char* getParameter(const char* name) const {
-                std::map<std::string,std::string>::const_iterator i=m_map.find(name);
-                return (i!=m_map.end() ? i->second.c_str() : (m_request ? m_request->getParameter(name) : NULL));
-            }
+            virtual const char* getParameter(const char* name) const;
 
             /**
              * Returns a named collection of sub-parameters to pass into a loop.
              *
              * @param name  name of sub-collection
-             * @return pointer to a multimap of sub-parameters, or NULL
+             * @return pointer to a multimap of sub-parameters, or nullptr
              */
-            virtual const std::multimap<std::string,std::string>* getLoopCollection(const char* name) const {
-                std::map< std::string,std::multimap<std::string,std::string> >::const_iterator i=m_collectionMap.find(name);
-                return (i!=m_collectionMap.end() ? &(i->second) : NULL);
-            }
+            virtual const std::multimap<std::string,std::string>* getLoopCollection(const char* name) const;
         };
 
         /**
@@ -123,7 +117,7 @@ namespace xmltooling {
             std::istream& is,
             std::ostream& os,
             const TemplateParameters& parameters,
-            const XMLToolingException* e=NULL
+            const XMLToolingException* e=nullptr
             ) const;
 
         /**
@@ -141,7 +135,7 @@ namespace xmltooling {
             const char*& lastpos,
             std::ostream& os,
             const TemplateParameters& parameters,
-            const std::pair<std::string,std::string>& loopentry,
+            const std::pair<const std::string,std::string>& loopentry,
             const XMLToolingException* e
             ) const;