Changeset 258

Timestamp:

Apr 30, 2007, 2:08:25 PM (16 years ago)

Author:

Peter Johansson

Message:

moving some printing code to base class

Location:

trunk/lib

Files:

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

trunk/lib/Directory.cc

@@ -28 +28 @@
 #include "Node.h"
 #include "SVN.h"
+#include "SVNlog.h"
 #include "utility.h"
 
@@ -120 +121 @@
 
 
-  void Directory::print(const bool verbose) const
-  {
-    if (ignore())
-      return;
-    if (verbose)
-      std::cout << "Printing output for " << path_ << std::endl;
-    print("all", "total");
-    print("all", "code");
-    print("all", "comments");
-    print("all", "empty");
-
-    for (std::set<std::string>::const_iterator i = stats_.authors().begin();
-         i!=stats_.authors().end(); ++i) {
-      print(*i, "total");
-      print(*i, "code");
-      print(*i, "comments");
-      print(*i, "empty");
-    }
-
+  void Directory::print_core(const bool verbose) const
+  {
     // print daughter nodes, i.e., this function is recursive
     for (NodeConstIterator i=daughters_.begin(); i!=daughters_.end(); ++i)
@@ -145 +129 @@
 
 
-  void Directory::print(const std::string& user, 
-                        const std::string& line_type) const
+  void Directory::print_core(const std::string& user, 
+                             const std::string& line_type,
+                             const SVNlog& log) const
   {
     std::string outdir = user+"/"+line_type+"/"+local_path_;
@@ -223 +208 @@
     os << "</tr>\n";
     os << "</table>\n";
-    print_author_summary(os, line_type);
+    print_author_summary(os, line_type, log);
     os << "</p>\n";
     print_footer(os);

trunk/lib/Directory.h

@@ -79 +79 @@
     const Stats& parse(const bool verbose=false);
 
-    void print(const bool verbose=false) const;
-
     void print_copyright(std::map<std::string, std::string>&) const;
 
@@ -89 +87 @@
     Directory(const Directory&);
 
-    void print(const std::string& user, const std::string& line_type) const;
+    void print_core(bool verbose=false) const;
+
+    void print_core(const std::string& user, const std::string& line_type,
+                    const SVNlog&) const;
 
 

trunk/lib/File.cc

@@ -61 +61 @@
 
 
-  void File::print(const std::string& user, const std::string& line_type) const 
+  void File::print_core(const std::string& user, const std::string& line_type,
+                        const SVNlog& log) const 
   {
     std::string outpath = user+"/"+line_type+"/"+local_path();
@@ -79 +80 @@
     os << "' alt='[plot]' border=0>\n</p>";
 
-    print_author_summary(os, line_type);
+    print_author_summary(os, line_type, log);
     os << "</p>\n";
 
@@ -87 +88 @@
 
 
-  void File::print(const bool verbose) const 
-  {
-    // no output page for binary files
-    if (ignore())
-      return;
-    if (verbose)
-      std::cout << "Printing output for " << path_ << std::endl;
-    print("all", "total");
-    print("all", "code");
-    print("all", "comments");
-    print("all", "empty");
-
-    for (std::set<std::string>::const_iterator i = stats_.authors().begin();
-         i!=stats_.authors().end(); ++i) {
-      print(*i, "total");
-      print(*i, "code");
-      print(*i, "comments");
-      print(*i, "empty");
-    }
-
+  void File::print_core(const bool verbose) const 
+  {
   }
 

trunk/lib/File.h

@@ -87 +87 @@
     File(const File&);
 
+    void print_core(bool verbose=false) const;
+
     ///
     /// print page for specific user (or all) and specific line_style
     /// (or total).
     ///
-    void print(const std::string& user, const std::string& line_type) const; 
+    void print_core(const std::string& user, const std::string& line_type,
+                    const SVNlog&) const; 
 
   };

trunk/lib/Node.cc

@@ -25 +25 @@
 #include "Node.h"
 #include "html_utility.h"
+#include "SVNlog.h"
 #include "SVNproperty.h"
 #include "utility.h"
@@ -121 +122 @@
 
 
-  void Node::print_author_summary(std::ostream& os, std::string line_type) const
+  void Node::print(const bool verbose) const
+  {
+    if (ignore())
+      return;
+    if (verbose)
+      std::cout << "Printing output for " << path_ << std::endl;
+    SVNlog log(path_);
+    print_core("all", "total", log);
+    print_core("all", "code", log);
+    print_core("all", "comments", log);
+    print_core("all", "empty", log);
+
+    for (std::set<std::string>::const_iterator i = stats_.authors().begin();
+         i!=stats_.authors().end(); ++i) {
+      print_core(*i, "total", log);
+      print_core(*i, "code", log);
+      print_core(*i, "comments", log);
+      print_core(*i, "empty", log);
+    }
+    
+    print_core(verbose);
+  }
+
+
+  void Node::print_author_summary(std::ostream& os, std::string line_type,
+                                  const SVNlog& log) const
   { 
     os << "<table class=\"listings\">\n";

trunk/lib/Node.h

@@ -140 +140 @@
     /// Function printing HTML in current working directory
     ///
-    virtual void print(const bool verbose=false) const=0;
-
-    void print_author_summary(std::ostream&, std::string) const; 
+    void print(const bool verbose=false) const;
+
+    void print_author_summary(std::ostream&, std::string, const SVNlog&) const; 
 
     virtual void 
@@ -177 +177 @@
     ///
     Node(const Node&);
+
+    virtual void print_core(bool verbose=false) const=0;
+
+    ///
+    /// print page for specific user (or all) and specific line_style
+    /// (or total).
+    ///
+    virtual void print_core(const std::string& user, 
+                            const std::string& line_type,
+                            const SVNlog&) const=0; 
 
     bool binary_;