Changeset 1052 for trunk/lib/Configuration.cc

Timestamp:

Apr 18, 2010, 4:39:57 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #450. using fnmatch in codon fil name pattern match.

File:

• trunk/lib/Configuration.cc (modified) (5 diffs)

trunk/lib/Configuration.cc

@@ -83 +83 @@
   Configuration::codon(std::string file_name) const 
   {
+    std::cout << "file_name: " << file_name << std::endl;
     if (const std::pair<std::string,std::string>* dict=dictionary(file_name))
       file_name = translate(file_name, *dict);
     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()) ) {
+      if (fnmatch(i->first.c_str(), file_name.c_str()))
         return &i->second;
-      }
     }
     return NULL;
@@ -106 +105 @@
   {
     for (size_t i=0; i<dictionary_.size(); ++i)
-      if (svndigest::equal(lhs.begin(), lhs.end(), 
-                           dictionary_[i].first.begin(),
-                           dictionary_[i].first.end()))
+      if (fnmatch(lhs.c_str(), dictionary_[i].first.c_str()))
         return &dictionary_[i];
     return NULL;
@@ -230 +227 @@
           for (String2Codons::const_iterator i(string2codons_.begin());
                i!=string2codons_.end(); ++i) {
-            if (svndigest::equal(lhs.begin(), lhs.end(), 
-                                 i->first.begin(), i->first.end()) ) {
+            if (fnmatch(lhs.c_str(), i->first.c_str())) {
               mess << "`" << i->first << "'";
               break;
@@ -370 +366 @@
                            const std::pair<std::string, std::string>& dic) const
   {
-    assert(svndigest::equal(str.begin(), str.end(),
-                            dic.first.begin(), dic.first.end()));
     std::string res;
     std::vector<std::string> vec;
-    regexp(str.begin(), str.end(), dic.first.begin(), dic.first.end(), vec);
+    if (!regexp(str.begin(), str.end(), dic.first.begin(),dic.first.end(),vec)){
+      std::stringstream mess;
+      mess << "svndigest: invalid config file: "
+           << "expression " << dic.first << " is invalid";
+      throw std::runtime_error(mess.str());       
+    }
     for (std::string::const_iterator i(dic.second.begin()); 
          i!=dic.second.end(); ++i) {
@@ -387 +386 @@
           if (n)
             mess << "because " << n << " is a too large.";
-          throw std::runtime_error("");       
+          throw std::runtime_error(mess.str());       
         }
         res += vec[n-1];