Changeset 1015 for trunk/bin

Timestamp:

Jan 9, 2010, 3:16:03 PM (13 years ago)

Author:

Peter Johansson

Message:

closes #438. adding an option --format

Location:

trunk/bin

Files:

• Parameter.cc (modified) (3 diffs)
• Parameter.h (modified) (2 diffs)
• svndigest.cc (modified) (3 diffs)

trunk/bin/Parameter.cc

@@ -63 +63 @@
                     std::string("ignore cache files and analyze ") +
                     std::string("everything from repository")),
+      format_(cmd_,"format", "override image format defined in config file"),
       report_(cmd_, "report", "create no HTML report", true),
       revisions_(cmd_, "revisions", 
@@ -219 +220 @@
 
 
+  const yat::utility::OptionArg<std::string>& 
+  Parameter::format(void) const
+  {
+    return format_;
+  }
+
+
   void Parameter::init(void)
   {
@@ -224 +232 @@
     cmd_.program_name() = PACKAGE_NAME;
     config_file_.print_arg("=FILE");
+    format_.print_arg("=FMT");
     root_.print_arg("=ROOT");
     target_.print_arg("=TARGET");

trunk/bin/Parameter.h

@@ -55 +55 @@
     bool generate_config(void) const ;
     bool ignore_cache(void) const;
+    const yat::utility::OptionArg<std::string>& format(void) const;
     bool report(void) const;
     bool revisions(void) const;
@@ -81 +82 @@
     yat::utility::OptionHelp help_;
     yat::utility::OptionSwitch ignore_cache_;
+    yat::utility::OptionArg<std::string> format_;
     yat::utility::OptionSwitch report_;
     yat::utility::OptionSwitch revisions_;

trunk/bin/svndigest.cc

@@ -37 +37 @@
 
 #include "yat/Exception.h"
+#include "yat/OptionArg.h"
 
 #include <cassert>
@@ -81 +82 @@
       config.load(is);
     }
-    catch (std::runtime_error e) {
+    catch (std::runtime_error& e) {
       std::cerr << "svndigest: invalid config file\n"
                 << e.what() << std::endl;
@@ -87 +88 @@
     }
     is.close();
+  }
+
+  // set values from commandline into config object
+  try {
+    if (option->format().present()) 
+      Configuration::instance().image_format(option->format().value());
+  }
+  catch (std::runtime_error& e) {
+    std::cerr << PACKAGE_NAME ": invalid argument `" 
+              << option->format().value() << "' for `--" 
+              << option->format().long_name() << "'\n"
+              << e.what() << "\n"
+              << "Try `" << PACKAGE_NAME << " --help' for more information.\n"; 
+    exit(EXIT_FAILURE);
   }