Changeset 1023

Timestamp:

Jan 11, 2010, 12:15:47 AM (14 years ago)

Author:

Peter Johansson

Message:

added new cmd option 'anchor-format'. refs #279

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• bin/Parameter.cc (modified) (3 diffs)
• bin/Parameter.h (modified) (2 diffs)
• bin/svndigest.cc (modified) (3 diffs)
• lib/Configuration.cc (modified) (1 diff)
• lib/Configuration.h (modified) (1 diff)
• test/cmd_format_test.sh (modified) (1 diff)

trunk/NEWS

@@ -6 +6 @@
   - Gnuplot replaced with plplot (ticket:97)
   - new option --format (ticket:438)
+  - new option --anchor-format (ticket:279)
   - new section, `[image]`, in config file (ticket:279 and ticket:405)
   - new configure option --with-plplot

trunk/bin/Parameter.cc

@@ -51 +51 @@
     : cmd_( std::string("Mandatory arguments to long options ") + 
             std::string("are mandatory for short options too.")), 
+      anchor_format_(cmd_,"anchor-format", 
+                     "override anchor image format defined in config file"),
       config_file_(cmd_, "config-file", 
                    "configuration file [<ROOT>/.svndigest/config]"),
@@ -99 +101 @@
   Parameter::~Parameter(void)
   {
+  }
+
+
+  const yat::utility::OptionArg<std::string>& 
+  Parameter::anchor_format(void) const
+  {
+    return anchor_format_;
   }
 
@@ -231 +240 @@
     // don't use argv[0] because user may rename the binary
     cmd_.program_name() = PACKAGE_NAME;
+    anchor_format_.print_arg("=FMT");
     config_file_.print_arg("=FILE");
     format_.print_arg("=FMT");

trunk/bin/Parameter.h

@@ -49 +49 @@
     Parameter( int argc, char *argv[]);
     virtual ~Parameter(void);
+    const yat::utility::OptionArg<std::string>& anchor_format(void) const;
     std::string config_file(void) const;
     
@@ -76 +77 @@
 
     yat::utility::CommandLine cmd_;
+    yat::utility::OptionArg<std::string> anchor_format_;
     yat::utility::OptionArg<std::string> config_file_;
     yat::utility::OptionSwitch copyright_;

trunk/bin/svndigest.cc

@@ -49 +49 @@
 #include <unistd.h>
 
+void option2config(const theplu::yat::utility::OptionArg<std::string>&,
+                   void (*FUNC)(const std::string&) );
+
 void create_file_struct(std::string stats_type, 
                         const theplu::svndigest::Stats& stats);
@@ -91 +94 @@
   }
 
+  // just for convenience
+  Configuration& conf = Configuration::instance();
   // set values from commandline into config object
   try {
@@ -100 +105 @@
               << 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()) 
+      conf.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"; 

trunk/lib/Configuration.cc

@@ -307 +307 @@
         }
         else if (lhs == "image_format") {
-          if (rhs!="none" && rhs!="png" && rhs!="svg" && rhs!="pdf") {
-            throw Config_error(line, "unknown format: " + rhs);
-          }
-          image_anchor_format_ = rhs;
+          try {
+            image_anchor_format(rhs);
+          }
+          catch (std::runtime_error e) {
+            throw Config_error(line, 
+                               "unknown format: " + rhs + "\n" + e.what());
+          }
         }
       }
     }
     validate_dictionary();
+  }
+
+
+  void Configuration::image_anchor_format(const std::string& format)
+  {
+    if (format!="none" && format!="pdf" && format!="png" && format!="svg") {
+      std::ostringstream oss;
+      oss << "Valid arguments are:\n"
+          << "  - `none'\n"
+          << "  - `pdf'\n"
+          << "  - `png'\n"
+          << "  - `svg'";
+      throw std::runtime_error(oss.str());
+    }
+    image_anchor_format_ = format;
   }
 

trunk/lib/Configuration.h

@@ -76 +76 @@
      */
     const std::string& image_anchor_format(void) const;
+
+    /**
+       \brief set image_anchor_format
+     */
+    void image_anchor_format(const std::string&);
 
     /**

trunk/test/cmd_format_test.sh

@@ -32 +32 @@
 rm -f tmp_stderr
 
+$SVNDIGEST -g --format=svg --anchor-format=svg > tmp_stdout
+cat tmp_stdout
+grep 'format = svg' tmp_stdout || exit_fail
+grep 'anchor_format = svg' tmp_stdout || exit_fail
+rm -f tmp_stdout
+
 exit_success;