Changeset 10296 for trunk/FACT++/src

Timestamp:

04/07/11 10:10:33 (14 years ago)

Author:

tbretz

Message:

Changed some output from cout to cerr to avoid it going to man pages cerated with help2man; added --version option, added possibility to add some text in front of the --help option

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (8 diffs)
• Configuration.h (modified) (4 diffs)

trunk/FACT++/src/Configuration.cc

@@ -267 +267 @@
 #include <iostream>
 
+#include <boost/bind.hpp>
 #include <boost/regex.hpp>
 //#include <boost/filesystem.hpp>
@@ -442 +443 @@
         ("help-database",       "Print available options retreived from the database.")
         ("help-config",         "Print available configuration file options.")
+        ("version,V",           "Print version information.")
         ("print-all",           "Print all options as parsed from all the different sources.")
         ("print",               "Print options as parsed from the commandline.")
@@ -678 +680 @@
 //!
 //
-void Configuration::SetNameMapper(const boost::function1<std::string, std::string> &func)
+void Configuration::SetNameMapper(const boost::function<std::string(std::string)> &func)
 {
     fNameMapper = func;
@@ -686 +688 @@
 {
     fNameMapper = bind1st(mem_fun(&Configuration::DefaultMapper), this);
+}
+
+void Configuration::SetPrintUsage(const boost::function<void(void)> &func)
+{
+    fPrintUsage = func;
+}
+
+void Configuration::SetPrintUsage()
+{
+    fPrintUsage = boost::bind(&Configuration::PrintUsage, this);
 }
 
@@ -803 +815 @@
 
     if (getfiles.count("help"))
-        cout << endl << fOptionsCommandline[kVisible] << endl;
+    {
+        fPrintUsage();
+        cout << fOptionsCommandline[kVisible] << endl;
+    }
     if (getfiles.count("help-config"))
-        cout << endl << fOptionsConfigfile[kVisible] << endl;
+        cout << fOptionsConfigfile[kVisible] << endl;
     if (getfiles.count("help-env"))
-        cout << endl << fOptionsEnvironment[kVisible] << endl;
+        cout << fOptionsEnvironment[kVisible] << endl;
     if (getfiles.count("help-database"))
-        cout << endl << fOptionsDatabase[kVisible] << endl;
+        cout << fOptionsDatabase[kVisible] << endl;
 
     // ------------------------ (4) --------------------------
@@ -826 +841 @@
     {
         fDefaultFile = getfiles["default"].as<string>();
-        cout << "Reading configuration from '" << fDefaultFile << "'." << endl;
+        cerr << "Reading configuration from '" << fDefaultFile << "'." << endl;
     }
 
@@ -862 +877 @@
     {
         fPriorityFile = getfiles["config"].as<string>();
-        cout << "Retrieved option from '" << fPriorityFile << "'." << endl;
+        cerr << "Retrieved option from '" << fPriorityFile << "'." << endl;
     }
 
@@ -895 +910 @@
     {
         fDatabase = getdatabase["database"].as<string>();
-        cout << "Retrieving configuration from '" << fDatabase << "'." << endl;
+        cerr << "Retrieving configuration from '" << fDatabase << "'." << endl;
     }
 

trunk/FACT++/src/Configuration.h

@@ -45 +45 @@
 
     /// Pointer to the mapper function for environment variables
-    boost::function1<std::string, std::string> fNameMapper;
+    boost::function<std::string(std::string)> fNameMapper;
+    boost::function<void()>                   fPrintUsage;
 
     /// Helper function which return the max of the two arguments in the first argument
@@ -58 +59 @@
     /// Print a list of all unkown options within the given vector
     void PrintUnknown(std::vector<std::string> &vec, int steps=1);
+
+    virtual void PrintUsage() const { }
 
 public:
@@ -81 +84 @@
     void SetArgumentPositions(const po::positional_options_description &desc);
 
-    void SetNameMapper(const boost::function1<std::string, std::string> &func);
+    void SetNameMapper(const boost::function<std::string(std::string)> &func);
     void SetNameMapper();
+
+    void SetPrintUsage(const boost::function<void(void)> &func);
+    void SetPrintUsage();
 
     void AddEnv(const std::string &conf, const std::string &env)
@@ -95 +101 @@
     // Process command line arguments
     const po::variables_map &Parse(int argc, char **argv);
+
+    bool HasVersion() const
+    {
+        return Has("version");
+    }
 
     bool HasHelp() const