Changeset 1069 for trunk

Timestamp:

Jun 6, 2010, 5:10:43 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #307. Structure main function in svndigest.cc. Create a function copy_option2config.

File:

• trunk/bin/svndigest.cc (modified) (6 diffs)

trunk/bin/svndigest.cc

@@ -31 +31 @@
 #include "main_utility.h"
 #include "rmdirhier.h"
+#include <sstream>
 #include "Stats.h"
 #include "StatsCollection.h"
@@ -50 +51 @@
 #include <unistd.h>
 
+using namespace theplu;
+using namespace svndigest;
+void copy_option2config(const svndigestParameter&, Configuration&);
+
 void create_file_struct(std::string stats_type, 
                         const theplu::svndigest::Stats& stats);
@@ -55 +60 @@
 int main( int argc, char* argv[])
 {
-  using namespace theplu;
-  using namespace svndigest;
 
   // Reading commandline options
@@ -72 +75 @@
   try {
     load_config(option.config_file());
+    copy_option2config(option, Configuration::instance());
   }
   catch (std::runtime_error& e) {
@@ -81 +85 @@
   Configuration& config = Configuration::instance();
   // 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);
-  }
-  try {
-    if (option.anchor_format().present()) 
-      config.image_anchor_format(option.anchor_format().value());
-  }
-  catch (std::runtime_error& e) {
-    std::cerr << PACKAGE_NAME ": invalid argument `" 
-              << option.anchor_format().value() << "' for `--" 
-              << option.anchor_format().long_name() << "'\n"
-              << e.what() << "\n"
-              << "Try `" << PACKAGE_NAME << " --help' for more information.\n"; 
-    exit(EXIT_FAILURE);
-  }
-  
   // write configuration
   if (option.generate_config()) {
@@ -244 +223 @@
   exit(EXIT_SUCCESS);       // normal exit
 }
+
+
+void copy_option2config(const svndigestParameter& option, Configuration& config)
+{
+  try {
+    if (option.format().present()) 
+      Configuration::instance().image_format(option.format().value());
+  }
+  catch (std::runtime_error& e) {
+    std::stringstream ss;
+    ss << "invalid argument `" 
+       << option.format().value() << "' for `--" 
+       << option.format().long_name() << "'\n"
+       << e.what() << "\n"
+       << "Try `svndigest --help' for more information.\n"; 
+    throw std::runtime_error(ss.str());
+  }
+  try {
+    if (option.anchor_format().present()) 
+      config.image_anchor_format(option.anchor_format().value());
+  }
+  catch (std::runtime_error& e) {
+    std::stringstream ss;
+    ss << "invalid argument `" 
+       << option.anchor_format().value() << "' for `--" 
+       << option.anchor_format().long_name() << "'\n"
+       << e.what() << "\n"
+       << "Try `svndigest --help' for more information.\n"; 
+    throw std::runtime_error(ss.str());
+  }
+}
+
 
   void create_file_struct(std::string stats_type,