Changeset 952

Timestamp:

05/18/10 22:28:26 (15 years ago)

Author:

smidl

Message:

Ugly hack for log_level

Location:

library/bdm/base

Files:

• user_info.cpp (modified) (1 diff)
• user_info.h (modified) (1 diff)

library/bdm/base/user_info.cpp

@@ -286 +286 @@
 }
 
-void UI::from_setting ( root &instance, const Setting &element ) {
-        const SettingResolver link ( element );
-        assert_type( link.result, Setting::TypeGroup );
-        call_from_setting( instance, link.result );
-}
+        void UI::from_setting ( root &instance, const Setting &element ) {
+                if (element.getType()==Setting::TypeString){
+                        const type_info *ti=&typeid(instance);
+                        size_t strc=string(ti->name()).find("log_level_template");
+                        if (strc!=string::npos){ // loglevel
+                                call_from_setting( instance, element );
+                        } else {
+                                const SettingResolver link ( element );
+                                assert_type( link.result, Setting::TypeGroup );
+                                call_from_setting( instance, link.result);
+                        }
+                }else{
+                        call_from_setting( instance, element );
+                }
+        }
 
 void UI::from_setting ( mat& matrix, const Setting &element ) {

library/bdm/base/user_info.h

@@ -319 +319 @@
         //! method is necessary here to avoid the default call of "const SettingResolver link ( element );", 
         //! which would lead to erroneous behaviour in this case
-        template<class T> static void from_setting ( log_level_base<T> &log_level, const Setting &element ) {
-                assert_type( element, Setting::TypeString );
-                call_from_setting( log_level, element );
-        }
+//      template<class T> static void from_setting ( log_level_base<T> &log_level, const Setting &element ) {
+//              assert_type( element, Setting::TypeString );
+//              call_from_setting( log_level, element );
+//      }
 
         //! This method converts a Setting into a dynamically allocated root descendant