Changeset 750

Timestamp:

Jan 12, 2009, 5:46:11 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #358

Location:

trunk/lib

Files:

• Directory.cc (modified) (2 diffs)
• File.cc (modified) (5 diffs)
• File.h (modified) (2 diffs)
• html_utility.cc (modified) (4 diffs)
• html_utility.h (modified) (2 diffs)
• utility.cc (modified) (2 diffs)

trunk/lib/Directory.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -140 +141 @@
   void Directory::print_core(const bool verbose) const
   {
+    mkdir("blame_output/" + local_path_);
     // print daughter nodes, i.e., this function is recursive
     for (NodeConstIterator i=daughters_.begin(); i!=daughters_.end(); ++i)

trunk/lib/File.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -54 +55 @@
     if (!output_dir_.empty())
       output_dir_+='/';
+  }
+
+
+  std::string File::blame_output_file_name(void) const
+  {
+    return "blame_output/" + local_path() + ".html";
   }
 
@@ -215 +222 @@
   void File::print_blame(std::ofstream& os) const
   {
-    os << "<br /><h3>Blame Information</h3>";
+    os << "<br /><h3>" << local_path() << "</h3>";
     os << "<table class=\"blame\">\n";
     os << "<thead>\n";
@@ -324 +331 @@
   void File::print_core(const bool verbose) const 
   {
+    std::ofstream os(blame_output_file_name().c_str());
+    assert(os.good());
+    print_html_start(os, "svndigest", level_+1);
+    print_blame(os);
+    print_footer(os);
+    os.close();
   }
 
@@ -354 +367 @@
     print_author_summary(os, stats_[stats_type], line_type, log);
     os << "\n";
-
-    print_blame(os);
+    os << "<h3>"
+       << anchor(blame_output_file_name(), 
+                 "Blame Information", level_+3) 
+       << "</h3>\n";
 
     print_footer(os);

trunk/lib/File.h

@@ -6 +6 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -73 +74 @@
 
   private:
+    std::string blame_output_file_name(void) const;
+
     /**
        @return log of this File.

trunk/lib/html_utility.cc

@@ -4 +4 @@
   Copyright (C) 2006 Peter Johansson
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -21 +22 @@
 */
 
+#include <config.h>
+
 #include "html_utility.h"
 
-#include "config.h"
 #include "Configuration.h"
 #include "Date.h"
 #include "HtmlStream.h"
 #include "subversion_info.h"
-#include <config.h> // this header file is created by configure
 
 #include <sstream>
@@ -77 +78 @@
                     const std::string& stats)
   {
+    print_html_start(os, title, level);
+    os << "<div id=\"menu\">"
+       << "<ul>\n<li></li>\n";
+    if (item=="main")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor("index.html", "Main", level, "Main page");
+    os << "</li>\n";
+
+    std::string stats_local(stats);
+    if (stats_local=="none")
+      stats_local = "classic";
+
+    if (item=="total")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>\n";
+    os << anchor(stats_local+"/"+user+"/total/"+path, "Total", level, 
+           "View statistics of all lines");
+    os << "</li>\n";
+
+    if (item=="code")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor(stats_local+"/"+user+"/code/"+path, "Code", level, 
+                 "View statistics of code lines");
+    os << "</li>\n";
+
+    if (item=="comments")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor(stats_local+"/"+user+"/comments/"+path, "Comment", level, 
+                 "View statistics of comment lines");
+    os << "</li>\n";
+
+
+    if (item=="empty")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor(stats_local+"/"+user+"/empty/"+path, "Other", level, 
+                 "View statistics of other lines");
+    os << "</li>\n";
+    os << "<li>";
+    // Peter, this is ugly! But how to add space?
+    for (size_t i=0; i<50; ++i)
+      os << "&nbsp;";
+    os << "</li>\n";
+
+    std::string item_local(item);
+    if (item_local=="none")
+      item_local = "total";
+    if (item_local=="main")
+      item_local = "total";
+
+    if (stats=="classic")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor("classic/"+user+"/"+item_local+"/"+path, "Classic", level, 
+                 "View classic statistics");
+    os << "</li>\n";
+
+    if (stats=="blame")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor("blame/"+user+"/"+item_local+"/"+path, "Blame", level, 
+                 "View blame statistics");
+    os << "</li>\n";
+
+    if (stats=="add")
+      os << "<li class=\"highlight\">";
+    else
+      os << "<li>";
+    os << anchor("add/"+user+"/"+item_local+"/"+path, "Add", level, 
+                 "View add statistics");
+    os << "</li>\n";
+
+
+    os << "</li>\n"
+       << "</ul></div>\n"
+       << "<div id=\"main\">\n";
+  }
+
+
+  void print_html_start(std::ostream& os, const std::string& title, 
+                        unsigned int level)
+  {
     os << "<!-- Generated by " << PACKAGE_STRING << "-->\n";
     os << "<!DOCTYPE html\n"
@@ -91 +184 @@
     os << "svndigest.css\" type=\"text/css\" />\n"
        << "</head>\n"
-       << "<body>\n"
-       << "<div id=\"menu\">"
-       << "<ul>\n<li></li>\n";
-    if (item=="main")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor("index.html", "Main", level, "Main page");
-    os << "</li>\n";
-
-    std::string stats_local(stats);
-    if (stats_local=="none")
-      stats_local = "classic";
-
-    if (item=="total")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>\n";
-    os << anchor(stats_local+"/"+user+"/total/"+path, "Total", level, 
-           "View statistics of all lines");
-    os << "</li>\n";
-
-    if (item=="code")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(stats_local+"/"+user+"/code/"+path, "Code", level, 
-                 "View statistics of code lines");
-    os << "</li>\n";
-
-    if (item=="comments")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(stats_local+"/"+user+"/comments/"+path, "Comment", level, 
-                 "View statistics of comment lines");
-    os << "</li>\n";
-
-
-    if (item=="empty")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor(stats_local+"/"+user+"/empty/"+path, "Other", level, 
-                 "View statistics of other lines");
-    os << "</li>\n";
-    os << "<li>";
-    // Peter, this is ugly! But how to add space?
-    for (size_t i=0; i<50; ++i)
-      os << "&nbsp;";
-    os << "</li>\n";
-
-    std::string item_local(item);
-    if (item_local=="none")
-      item_local = "total";
-    if (item_local=="main")
-      item_local = "total";
-
-    if (stats=="classic")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor("classic/"+user+"/"+item_local+"/"+path, "Classic", level, 
-                 "View classic statistics");
-    os << "</li>\n";
-
-    if (stats=="blame")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor("blame/"+user+"/"+item_local+"/"+path, "Blame", level, 
-                 "View blame statistics");
-    os << "</li>\n";
-
-    if (stats=="add")
-      os << "<li class=\"highlight\">";
-    else
-      os << "<li>";
-    os << anchor("add/"+user+"/"+item_local+"/"+path, "Add", level, 
-                 "View add statistics");
-    os << "</li>\n";
-
-
-    os << "</li>\n"
-       << "</ul></div>\n"
-       << "<div id=\"main\">\n";
-  }
-
+       << "<body>\n";
+  }
 
   std::string trac_revision(svn_revnum_t r, std::string color)

trunk/lib/html_utility.h

@@ -8 +8 @@
   Copyright (C) 2007 Jari Häkkinen, Peter Johansson
   Copyright (C) 2008 Jari Häkkinen
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -68 +69 @@
 
 
+  /**
+     \brief print html start
+
+     Just like print_header, this function outputs start of html page,
+     but in contrast to print_header there are no menus in the otput
+     of this function.
+   */
+  void print_html_start(std::ostream& os, const std::string& title, 
+                        unsigned int level);
+
+
   ///
   /// @return if trac-revision is set in config file anchor to trac is

trunk/lib/utility.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -191 +192 @@
     if (code){
       std::stringstream ss;
-      ss << "mkdir(" << dir << "): failed with error code: errno=" << errno;
+      ss << "mkdir(" << dir << "): failed\n" << strerror(errno);
       throw std::runtime_error(ss.str());
     }