Changeset 625 for trunk/bin/Parameter.cc

Timestamp:

Apr 24, 2008, 12:44:52 AM (15 years ago)

Author:

Peter Johansson

Message:

made function Parameter::help() const

File:

• trunk/bin/Parameter.cc (modified) (9 diffs)

trunk/bin/Parameter.cc

@@ -42 +42 @@
 
   Parameter::Parameter( int argc, char *argv[])
-  {
-    defaults();
+    : config_file_(""), copyright_(false), force_(false), 
+      generate_config_(false), ignore_cache_(false), report_(true),
+      revisions_(false), root_("."), targetdir_("."), verbose_(false)
+  {
     for (int i=1; i<argc; ++i) {
       bool ok=false;
@@ -54 +56 @@
       if (myargv=="--config-file"){
         if (value.size()) {
-          config_file_= value;
+          config_file_.value()= value;
           ok=true;
         }
         else if (++i<argc){
-          config_file_= std::string(argv[i]);
+          config_file_.value()= std::string(argv[i]);
           ok=true;
         }
       }
       else if (myargv=="--copyright"){
-          copyright_=true;
+          copyright_.value()=true;
           ok=true;
       }
       else if (myargv=="-f" || myargv=="--force"){
-          force_=true;
+          force_.value()=true;
           ok=true;
       }
       else if (myargv=="-g" || myargv=="--generate-config"){
-          generate_config_=true;
+          generate_config_.value()=true;
           ok=true;
       }
@@ -79 +81 @@
       }
       else if (myargv=="--ignore-cache"){
-          ignore_cache_=true;
+          ignore_cache_.value()=true;
           ok=true;
       }
       else if (myargv=="-r" || myargv=="--root"){
         if (value.size()) {
-          root_= value;
+          root_.value()= value;
           ok=true;
         }
         else if (++i<argc){
-          root_= std::string(argv[i]);
+          root_.value()= std::string(argv[i]);
           ok=true;
         }
       }
       else if (myargv=="--report") {
-          report_=true;
+          report_.value()=true;
           ok=true;
       }
       else if (myargv=="--no-report") {
-          report_=false;
+          report_.value()=false;
           ok=true;
       }
       else if (myargv=="--revisions") {
-          revisions_=true;
+          revisions_.value()=true;
           ok=true;
       }
       else if (myargv=="-t" || myargv=="--target"){
         if (value.size()) {
-          targetdir_= value;
+          targetdir_.value()= value;
           ok=true;
         }
         else if (++i<argc){
-          targetdir_= std::string(argv[i]);
+          targetdir_.value()= std::string(argv[i]);
           ok=true;
         }
       }
       else if (myargv=="-v" || myargv=="--verbose"){
-          verbose_=true;
+          verbose_.value()=true;
           ok=true;
       }
       else if (myargv=="--version"){
-        version_=true;
-        ok=true;
+        version();
+        exit(0);
       }
       else if (myargv=="-vf" || myargv=="-fv"){
-          verbose_=true;
-          force_=true;
+          verbose_.value()=true;
+          force_.value()=true;
           ok=true;
       }
@@ -133 +135 @@
     }
 
-    if (version_){
-      version(verbose_);
-      exit(0);
-    }     
     analyse();
   }
@@ -147 +145 @@
     string workdir(pwd()); // remember current working directory (cwd).
 
-    bool root_ok = node_exist(root_) && !access_rights(root_, "r");
+    bool root_ok = ( node_exist(root_.value()) && 
+                     !access_rights(root_.value(), "r") );
     
     if (root_ok) {
       // Check that root_ is a directory
       struct stat nodestat;
-      stat(root_.c_str(), &nodestat);
+      stat(root_.value().c_str(), &nodestat);
       if (!S_ISDIR(nodestat.st_mode))
-        throw runtime_error(string("svndigest: accessing `") + root_ +
+        throw runtime_error(string("svndigest: accessing `") + root_.value() +
                             "': Not a directory.");
     }
 
     // Checking that root_ exists and retrieve the absolute path to root_
-    if (!root_ok || chdir(root_.c_str()))
-      throw runtime_error(string("svndigest: Root directory (") + root_ +
+    if (!root_ok || chdir(root_.value().c_str()))
+      throw runtime_error(string("svndigest: Root directory (") + root_.value() +
                           ") access failed.");
-    root_ = pwd();
+    root_.value() = pwd();
 
       
@@ -172 +171 @@
     // Checking that targetdir_ exists and retrieve the absolute path
     // to targetdir_
-    if (chdir(targetdir_.c_str()))
-      throw runtime_error(string("svndigest: Target directory (") + targetdir_ +
-                          ") access failed.");
-    targetdir_ = pwd();
+    if (chdir(targetdir_.value().c_str()))
+      throw runtime_error(string("svndigest: Target directory (") + 
+                          targetdir_.value() + ") access failed.");
+    targetdir_.value() = pwd();
     // Checking write permissions for targetdir_
-    if (access_rights(targetdir_,"w"))
+    if (access_rights(targetdir_.value(),"w"))
       throw runtime_error(string("svndigest: No write permission on target ") +
-                                 "directory (" + targetdir_ +").");
+                                 "directory (" + targetdir_.value() +").");
 
     // return back to cwd
@@ -191 +190 @@
   {
     // not default
-    if (!config_file_.empty())
-      return config_file_;
+    if (!config_file_.value().empty())
+      return config_file_.value();
     
     // default behaviour
@@ -199 +198 @@
 
 
-  void Parameter::defaults(void)
-  {
-    config_file_ = "";
-    copyright_=false;
-    force_=false;
-    generate_config_=false;
-    ignore_cache_=false;
-    report_=true;
-    revisions_=false;
-    root_=".";
-    targetdir_=".";
-    verbose_=false;
-    version_=false;
-  }
-
-
-  void Parameter::help(void)
-  {
-    defaults();
-
+  void Parameter::help(void) const
+  {
     ColumnStream cs(std::cout, 1);
     cs.width(0)=79;
@@ -249 +230 @@
          << "instead of dates [dates]\n"
          << "-r, --root=ROOT\tsvn controlled directory to perform "
-         << "statistics calculation on [" << root_ << "]\n"
-         << "-t, --target=TARGET\toutput directory [" << targetdir_ << "]\n"
+         << "statistics calculation on [" << root_.default_value() << "]\n"
+         << "-t, --target=TARGET\toutput directory [" 
+         << targetdir_.default_value() << "]\n"
          << "-v, --verbose\texplain what is being done\n"
          << "    --version\tprint version information and exit\n";