Merge branch 'master' into naffanya-dev

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 398c457914894ea083d8f31e3cde6756985f569d..97c1af51b7335adeb235422dd3043e847bdeb2dc 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -33,6 +33,8 @@ public:
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------
+typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY;
+//-----------------------------------------------------------------------------
 template<typename varT>
 class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:
@@ -75,7 +77,7 @@ public:
                          bool isStat,
                          STG_LOGGER & logger,
                          const std::string & sd,
-                         std::map<std::string, USER_PROPERTY_BASE*> & properties);
+                         REGISTRY & properties);
     virtual ~USER_PROPERTY_LOGGED() {}
 
     USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; }
@@ -125,7 +127,7 @@ private:
     USER_STAT stat;
     USER_CONF conf;
 
-    std::map<std::string, USER_PROPERTY_BASE *> properties;
+    REGISTRY properties;
 public:
     USER_PROPERTIES(const std::string & sd);
 
@@ -280,7 +282,7 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
                                                  bool isSt,
                                                  STG_LOGGER & logger,
                                                  const std::string & sd,
-                                                 std::map<std::string, USER_PROPERTY_BASE*> & properties)
+                                                 REGISTRY & properties)
 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),
@@ -392,7 +394,7 @@ else
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {
-std::map<std::string, USER_PROPERTY_BASE*>::const_iterator it = properties.find(name);
+REGISTRY::const_iterator it = properties.find(ToLower(name));
 if (it == properties.end())
     return "";
 return it->second->ToString();
@@ -401,7 +403,7 @@ return it->second->ToString();
 inline
 bool USER_PROPERTIES::Exists(const std::string & name) const
 {
-return properties.find(name) != properties.end();
+return properties.find(ToLower(name)) != properties.end();
 }
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------