Changeset 510

Timestamp:

Dec 9, 2007, 12:12:43 AM (13 years ago)

Author:

Peter Johansson

Message:

adding reading of codons from config file

Location:

trunk/lib

Files:

• Configuration.cc (modified) (5 diffs)
• Configuration.h (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -62 +62 @@
 
 
+  const std::vector<std::pair<std::string, std::string> >* 
+  Configuration::codon(std::string file_name) const 
+  {
+    for (String2Codons::const_iterator i(string2codons_.begin());
+         i!=string2codons_.end(); ++i) {
+      if (svndigest::equal(file_name.begin(), file_name.end(), 
+                           i->first.begin(), i->first.end()) ) {
+        return &i->second;
+      }
+    }
+    return NULL;
+  }
+
+
   const std::map<std::string,Alias>& Configuration::copyright_alias(void) const
   {
@@ -93 +107 @@
     set_default();
 
-    //bool parsing_found=false;
+    bool parsing_found=false;
     std::string line;
     std::string section;
@@ -140 +154 @@
         }
       }
-      else if (section == "copyright")
+      else if (section == "copyright") {
         if (lhs=="missing-copyright-warning")
           if (equal_false(rhs))
@@ -152 +166 @@
             throw std::runtime_error(mess.str());
           }
+      }
+      else if (section == "parsing-codons") {
+        if (!parsing_found) {
+          parsing_found=true;
+          string2codons_.clear();
+          std::cout << "clear" << std::endl;
+        }
+        
+        if (codon(lhs)) {
+          std::stringstream mess;
+          mess << "svndigest: invalid config file\n"
+               << "line: `" << line << "' is invalid.\n"
+               << "clashes with previous given file-name-pattern: ";
+          // find previous file-name-pattern
+          for (String2Codons::const_iterator i(string2codons_.begin());
+               i!=string2codons_.end(); ++i) {
+            if (svndigest::equal(lhs.begin(), lhs.end(), 
+                                 i->first.begin(), i->first.end()) ) {
+              mess << "`" << i->first << "'";
+              break;
+            }
+          }
+          throw std::runtime_error(mess.str());
+        }
+        std::cout << "lhs:" << lhs << "   " << "rhs:" << rhs << std::endl;
+        std::stringstream ss(rhs);
+        std::string start;
+        while (getline(ss, start, ':')) {
+          trim(start);
+          std::string end;
+          getline(ss, end, ';');
+          trim(end);
+          if (!start.empty() && !end.empty())
+            add_codon(lhs, start, end);
+          else if (!start.empty() || !end.empty()) {
+            std::stringstream mess;
+            mess << "svndigest: invalid config file\n"
+                 << "line: `" << line << "' is invalid.\n";
+            throw std::runtime_error(mess.str());
+          }
+        }
+      } 
     }
   }
@@ -167 +223 @@
   {
     return missing_copyright_warning_;
-  }
-
-
-  const std::vector<std::pair<std::string, std::string> >* 
-  Configuration::parse_codon(std::string file_name) const 
-  {
-    for (String2Codons::const_iterator i(string2codons_.begin());
-         i!=string2codons_.end(); ++i) {
-      if (svndigest::equal(file_name.begin(), file_name.end(), 
-                           i->first.begin(), i->first.end()) ) {
-        return &i->second;
-      }
-    }
-    return NULL;
   }
 

trunk/lib/Configuration.h

@@ -45 +45 @@
     static Configuration& instance(void);
 
+    /**
+       \return vector of parse codons for the given \a file_name
+     */
+    const std::vector<std::pair<std::string, std::string> >* 
+    codon(std::string file_name) const;
+
     ///
     /// @brief Aliases for Copyright
@@ -66 +72 @@
     ///
     bool  missing_copyright_warning(void) const;
-
-    /**
-       \return vector of parse codons for the given \a file_name
-     */
-    const std::vector<std::pair<std::string, std::string> >* 
-    parse_codon(std::string file_name) const;
 
     ///