[openrtm-commit:00680] r2321 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-08 03:52:38 +0900 (Wed, 08 Feb 2012)
New Revision: 2321

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
Log:
[compat,impl,bugfix] typo in logger.date_format option.


Modified: trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp	2012-02-07 18:51:13 UTC (rev 2320)
+++ trunk/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp	2012-02-07 18:52:38 UTC (rev 2321)
@@ -50,14 +50,12 @@
     coil::Properties& prop(Manager::instance().getConfig());
     if (prop.findNode("logger.date_format") != NULL)
       {
-        setDateFormat(prop["logger.date_foramt"].c_str());
+        setDateFormat(prop["logger.date_format"].c_str());
       }
     if (prop.findNode("logger.clock_type") != NULL)
       {
         setClockType(prop["logger.clock_type"]);
       }
-    m_msEnable = coil::replaceString(m_dateFormat, "%Q", "#m#");
-    m_usEnable = coil::replaceString(m_dateFormat, "%q", "#u#");
   }
 
   Logger::Logger(LogStreamBuf* streambuf)
@@ -68,8 +66,7 @@
       m_clock(&coil::ClockManager::instance().getClock("system")),
       m_msEnable(0), m_usEnable(0)
   {
-    m_msEnable = coil::replaceString(m_dateFormat, "%Q", "#m#");
-    m_usEnable = coil::replaceString(m_dateFormat, "%q", "#u#");
+    setDateFormat(m_dateFormat.c_str());
   }
 
   Logger::~Logger(void)