Rename 'new tariff' to 'next tariff' and remove conversion std::string to char* in...

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

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 567df9fa0d27164f047b0e887c6a19756b78f6f1..97c1af51b7335adeb235422dd3043e847bdeb2dc 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -12,12 +12,14 @@ $Author: faust $
 #include <ctime>
 #include <string>
 #include <set>
 #include <ctime>
 #include <string>
 #include <set>

+#include <map>

 #include <sstream>
 #include <iostream>
 
 #include "stg/logger.h"
 #include "stg/locker.h"
 #include "stg/scriptexecuter.h"
 #include <sstream>
 #include <iostream>
 
 #include "stg/logger.h"
 #include "stg/locker.h"
 #include "stg/scriptexecuter.h"

+#include "stg/common.h"

 
 #include "store.h"
 #include "admin.h"
 
 #include "store.h"
 #include "admin.h"


@@ -31,8 +33,10 @@ public:
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------

+typedef std::map<std::string, USER_PROPERTY_BASE *> REGISTRY;
+//-----------------------------------------------------------------------------

 template<typename varT>
 template<typename varT>

-class USER_PROPERTY : USER_PROPERTY_BASE {
+class USER_PROPERTY : public USER_PROPERTY_BASE {

 public:
     USER_PROPERTY(varT & val);
     virtual ~USER_PROPERTY();
 public:
     USER_PROPERTY(varT & val);
     virtual ~USER_PROPERTY();


@@ -73,7 +77,7 @@ public:
                          bool isStat,
                          STG_LOGGER & logger,
                          const std::string & sd,
                          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; }
     virtual ~USER_PROPERTY_LOGGED() {}
 
     USER_PROPERTY_LOGGED<varT> * GetPointer() throw() { return this; }


@@ -123,7 +127,7 @@ private:
     USER_STAT stat;
     USER_CONF conf;
 
     USER_STAT stat;
     USER_CONF conf;
 

-    std::map<std::string, USER_PROPERTY_BASE *> & properties;
+    REGISTRY properties;

 public:
     USER_PROPERTIES(const std::string & sd);
 
 public:
     USER_PROPERTIES(const std::string & sd);
 


@@ -137,6 +141,7 @@ public:
     void SetProperties(const USER_PROPERTIES & p) { stat = p.stat; conf = p.conf; }
 
     std::string GetPropertyValue(const std::string & name) const;
     void SetProperties(const USER_PROPERTIES & p) { stat = p.stat; conf = p.conf; }
 
     std::string GetPropertyValue(const std::string & name) const;

+    bool Exists(const std::string & name) const;

 
     USER_PROPERTY_LOGGED<double>            cash;
     USER_PROPERTY_LOGGED<DIR_TRAFF>         up;
 
     USER_PROPERTY_LOGGED<double>            cash;
     USER_PROPERTY_LOGGED<DIR_TRAFF>         up;


@@ -277,7 +282,7 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
                                                  bool isSt,
                                                  STG_LOGGER & logger,
                                                  const std::string & sd,
                                                  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),
 
     : USER_PROPERTY<varT>(val),
       stgLogger(logger),


@@ -286,7 +291,7 @@ USER_PROPERTY_LOGGED<varT>::USER_PROPERTY_LOGGED(varT & val,
       name(n),
       scriptsDir(sd)
 {
       name(n),
       scriptsDir(sd)
 {

-properties.insert(std::make_pair(name, this));
+properties.insert(std::make_pair(ToLower(name), this));

 }
 //-------------------------------------------------------------------------
 template <typename varT>
 }
 //-------------------------------------------------------------------------
 template <typename varT>


@@ -389,11 +394,17 @@ else
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {

-std::map<std::string, USER_PROPERTY_BASE*>::iterator it = properties.find(name);
+REGISTRY::const_iterator it = properties.find(ToLower(name));

 if (it == properties.end())
     return "";
 return it->second->ToString();
 }
 if (it == properties.end())
     return "";
 return it->second->ToString();
 }

+//-----------------------------------------------------------------------------
+inline
+bool USER_PROPERTIES::Exists(const std::string & name) const
+{
+return properties.find(ToLower(name)) != properties.end();
+}

 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------


@@ -408,7 +419,7 @@ template<typename varT>
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {

-std::stringstream stream;
+std::ostringstream stream;

 stream << value;
 return stream.str();
 }
 stream << value;
 return stream.str();
 }