Changeset 1152 for trunk/lib/Configuration.h

Timestamp:

Aug 7, 2010, 4:31:18 PM (13 years ago)

Author:

Peter Johansson

Message:

allow config file to override svn property (fixes #326). Adding two new files (split.h and split.cc) from yat.

File:

• trunk/lib/Configuration.h (modified) (4 diffs)

trunk/lib/Configuration.h

@@ -121 +121 @@
        \return NULL if there is no prop for \a filename in config
      */
-    const std::map<std::string, std::string>* 
+    const std::map<std::string, std::string>& 
     svn_properties(const std::string& filename) const;
 
@@ -152 +152 @@
     bool equal_false(std::string) const;
     bool equal_true(std::string) const;
+
+    /**
+       find first element in range, [first, last) for which
+       element->first matches filename.
+
+       Iterator->first must return string, i.e., [first, last) is
+       often a range of pair<string, T>
+
+       If no match is found, last is returned.
+     */
+    template<typename Iterator>
+    Iterator find_fn(Iterator first, Iterator last,
+                     const std::string& filename) const;
+
     /// 
     /// @brief load deafult configuration
@@ -190 +204 @@
     std::string trac_root_;
 
-    std::vector<std::map<std::string, std::string> > svn_props_;
+    typedef std::map<std::string, std::string> str_map;
+    typedef std::pair<std::string, str_map> props;
+    std::vector<props> svn_props_;
+    const str_map empty_str_map_;
   };
 
@@ -226 +243 @@
   };
 
+  // template implementation
+
+  template<typename Iterator>
+  Iterator Configuration::find_fn(Iterator first, Iterator last,
+                                  const std::string& filename) const
+  {
+    for( ; first!=last; ++first) {
+      if (fnmatch(first->first.c_str(), filename.c_str()))
+        return first;
+    }
+    return last;
+  }
+
+
 }} // end of namespace svndigest and namespace theplu