Changeset 538 for trunk/lib

Timestamp:

Dec 27, 2007, 8:25:08 AM (16 years ago)

Author:

Peter Johansson

Message:

added ignore-cache option

Location:

trunk/lib

Files:

• Directory.cc (modified) (2 diffs)
• Directory.h (modified) (1 diff)
• File.cc (modified) (2 diffs)
• File.h (modified) (1 diff)
• Node.h (modified) (1 diff)
• StatsCollection.cc (modified) (1 diff)
• StatsCollection.h (modified) (3 diffs)

trunk/lib/Directory.cc

@@ -129 +129 @@
   }
 
-  const StatsCollection& Directory::parse(const bool verbose)
+  const StatsCollection& Directory::parse(bool verbose, bool ignore)
   {
     stats_.reset();
@@ -135 +135 @@
     for (NodeIterator i=daughters_.begin(); i!=daughters_.end(); ++i)
       if (!(*i)->ignore())
-        stats_ += (*i)->parse(verbose);
+        stats_ += (*i)->parse(verbose, ignore);
     return stats_;
   }

trunk/lib/Directory.h

@@ -81 +81 @@
     std::string output_path(void) const;
 
-    const StatsCollection& parse(const bool verbose=false);
+    const StatsCollection& parse(bool verbose, bool ignore);
 
     void print_copyright(std::map<std::string, Alias>&, bool verbose) const;

trunk/lib/File.cc

@@ -189 +189 @@
 
 
-  const StatsCollection& File::parse(const bool verbose)
+  const StatsCollection& File::parse(bool verbose, bool ignore)
   {
     if (verbose)
@@ -201 +201 @@
         return stats_;
       }
-    }
+      is.close();
+    }
+    else
+      stats_.parse(path_);
     if (!node_exist(cache_dir))
       mkdir(cache_dir);
     std::ofstream os(cache_file.c_str());
     stats_.print(os);
+    os.close();
     return stats_;
   }

trunk/lib/File.h

@@ -64 +64 @@
     /// @return Stats object of the file
     ///
-    const StatsCollection& parse(const bool verbose=false);
+    const StatsCollection& parse(bool verbose, bool ignore);
 
     /**

trunk/lib/Node.h

@@ -152 +152 @@
     /// @brief parsing file using svn blame.
     ///
-    virtual const StatsCollection& parse(const bool verbose=false)=0;
+    virtual const StatsCollection& parse(bool verbose,
+                                         bool ignore_cache)=0;
 
     ///

trunk/lib/StatsCollection.cc

@@ -77 +77 @@
 
 
-  const StatsCollection& StatsCollection::parse(const std::string& path)
+  void StatsCollection::parse(const std::string& path)
   {
     for (map::iterator i(stats_.begin()); i!=stats_.end(); ++i) {
       i->second->parse(path);
     }
-    return *this;
   }
 

trunk/lib/StatsCollection.h

@@ -56 +56 @@
     bool load_cache(std::istream&);
 
-    const std::map<std::string, Stats*>& stats(void) const;
-
+    /**
+       Do the parsing for different statistics
+     */
+    void parse(const std::string& path);
 
     /**
@@ -68 +70 @@
      */
     void reset(void);
+
+    const std::map<std::string, Stats*>& stats(void) const;
 
     /**
@@ -86 +90 @@
 
   private:
-    /**
-       Do the parsing for different statistics
-     */
-    const StatsCollection& parse(const std::string& path);
-
     const std::string path_;
     typedef std::map<std::string, Stats*> map;