Changeset 8831

Timestamp:

Aug 8, 2011, 10:19:09 PM (13 years ago)

Author:

landauf

Message:

fixed wrong config value callback in Shell
fixed bug in ConfigFileManager: if a vector contained only one element at index 0, size 0 instead of 1 was returned
removed output context "output"
the configurable vector of output contexts now contains "example" as default to make the config vector visible in the config file

Location:

code/branches/output/src/libraries

Files:

• core/ConfigFileManager.cc (modified) (1 diff)
• core/command/Shell.cc (modified) (1 diff)
• util/output/BaseWriter.cc (modified) (1 diff)
• util/output/LogWriter.cc (modified) (3 diffs)
• util/output/OutputDefinitions.h (modified) (1 diff)

code/branches/output/src/libraries/core/ConfigFileManager.cc

@@ -123 +123 @@
         for (std::list<ConfigFileEntry*>::const_iterator it = this->entries_.begin(); it != this->entries_.end(); ++it)
             if ((*it)->getName() == name)
-                if ((*it)->getIndex() > size)
-                    size = (*it)->getIndex();
-        if (size == 0)
-            return 0;
-        else
-            return (size + 1);
+                if ((*it)->getIndex() >= size)
+                    size = (*it)->getIndex() + 1;
+        return size;
     }
 

code/branches/output/src/libraries/core/command/Shell.cc

@@ -135 +135 @@
                                this->configurableContexts_)
             .description("Additional output contexts shown in the " + this->getName())
-            .callback(static_cast<BaseWriter*>(this), &BaseWriter::changedConfigurableLevels);
+            .callback(static_cast<BaseWriter*>(this), &BaseWriter::changedConfigurableContexts);
     }
 

code/branches/output/src/libraries/util/output/BaseWriter.cc

@@ -39 +39 @@
         this->configurableMaxLevel_ = level::none;
         this->configurableContextsMaxLevel_ = level::verbose;
+        this->configurableContexts_.push_back("example");
+        this->changedConfigurableLevels();
     }
 

code/branches/output/src/libraries/util/output/LogWriter.cc

@@ -69 +69 @@
 
         if (this->bDefaultPath_)
-            OutputManager::getInstance().pushMessage(level::user_info, context::output(), "Opening log file " + name);
+            OutputManager::getInstance().pushMessage(level::user_info, context::undefined(), "Opening log file " + name);
 
         this->file_.open(name.c_str(), std::fstream::out);
@@ -76 +76 @@
             this->printLine("Log file opened", level::none);
         else
-            OutputManager::getInstance().pushMessage(level::user_warning, context::output(), "Failed to open log file. File logging disabled.");
+            OutputManager::getInstance().pushMessage(level::user_warning, context::undefined(), "Failed to open log file. File logging disabled.");
     }
 
@@ -90 +90 @@
     void LogWriter::setLogPath(const std::string& path)
     {
-        OutputManager::getInstance().pushMessage(level::internal_info, context::output(), "Migrating log file from " + this->path_ + "\nto " + path);
+        OutputManager::getInstance().pushMessage(level::internal_info, context::undefined(), "Migrating log file from " + this->path_ + "\nto " + path);
 
         this->closeFile();

code/branches/output/src/libraries/util/output/OutputDefinitions.h

@@ -85 +85 @@
             REGISTER_OUTPUT_CONTEXT(super);
             REGISTER_OUTPUT_CONTEXT(language);
-            REGISTER_OUTPUT_CONTEXT(output);
             REGISTER_OUTPUT_CONTEXT(commands);
             REGISTER_OUTPUT_CONTEXT(executor);