Changeset 1067

Timestamp:

Jun 6, 2010, 4:40:30 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #307. Lift out load of configuration file to common place

Location:

trunk

Files:

• bin/svncopyright.cc (modified) (2 diffs)
• bin/svndigest.cc (modified) (3 diffs)
• lib/Makefile.am (modified) (2 diffs)
• lib/main_utility.cc (added)
• lib/main_utility.h (added)

trunk/bin/svncopyright.cc

@@ -22 +22 @@
 #include "svncopyrightParameter.h"
 
+#include "main_utility.h"
+
 #include <cassert>
 #include <iostream>
@@ -42 +44 @@
     return EXIT_FAILURE;
   }
+
+  try {
+    load_config(option.config_file());
+  }
+  catch (std::runtime_error& e) {
+    std::cerr << "svncopyright: " << e.what() << "\n";
+    return EXIT_FAILURE;
+  }
+
   return EXIT_SUCCESS;        // normal exit
 }
-

trunk/bin/svndigest.cc

@@ -29 +29 @@
 #include "Graph.h"
 #include "html_utility.h"
+#include "main_utility.h"
 #include "rmdirhier.h"
 #include "Stats.h"
@@ -70 +71 @@
   }
 
-  // Reading configuration file
+  try {
+    load_config(option->config_file());
+  }
+  catch (std::runtime_error& e) {
+    std::cerr << "svndigest: " << e.what() << "\n";
+    return EXIT_FAILURE;
+  }
+
+  // just for convenience
   Configuration& config = Configuration::instance();
-  if (node_exist(option->config_file())) {
-    std::ifstream is(option->config_file().c_str());
-    if (!is.good()){
-      is.close();
-      std::cerr << "\nsvndigest: Cannot open config file " 
-                << option->config_file() << std::endl; 
-      exit(EXIT_FAILURE);
-    }
-    try { 
-      config.load(is);
-    }
-    catch (std::runtime_error& e) {
-      std::cerr << "svndigest: invalid config file\n"
-                << e.what() << std::endl;
-      exit(EXIT_FAILURE);
-    }
-    is.close();
-  }
-
-  // just for convenience
-  Configuration& conf = Configuration::instance();
   // set values from commandline into config object
   try {
@@ -108 +96 @@
   try {
     if (option->anchor_format().present()) 
-      conf.image_anchor_format(option->anchor_format().value());
+      config.image_anchor_format(option->anchor_format().value());
   }
   catch (std::runtime_error& e) {

trunk/lib/Makefile.am

@@ -37 +37 @@
   Graph.h \
   HtmlBuf.h HtmlStream.h html_utility.h LineTypeParser.h \
-  Node.h \
+  main_utility.h Node.h \
   OptionVersion.h rmdirhier.h \
   Stats.h StatsCollection.h subversion_info.h SVN.h SVNblame.h  \
@@ -47 +47 @@
   css.cc Date.cc Directory.cc File.cc first_page.cc\
   Functor.cc Graph.cc HtmlBuf.cc HtmlStream.cc \
-  html_utility.cc LineTypeParser.cc Node.cc \
+  html_utility.cc LineTypeParser.cc main_utility.cc Node.cc \
   OptionVersion.cc \
   rmdirhier.cc Stats.cc StatsCollection.cc subversion_info.cc SVN.cc \