Changeset 234 for trunk/lib/File.cc

Timestamp:

Apr 9, 2007, 2:08:26 PM (16 years ago)

Author:

Peter Johansson

Message:

fixes #87 and #95 and #103 and #104 and #80 and #108, and refs #69

File:

• trunk/lib/File.cc (modified) (6 diffs)

trunk/lib/File.cc

@@ -26 +26 @@
 #include "html_utility.h"
 #include "Stats.h"
-#include "SVN.h"
+#include "SVNlog.h"
 
 #include <cassert>
@@ -66 +66 @@
     std::string html_name(outpath + ".html");
     std::ofstream os(html_name.c_str());
-    print_header(os, name(), level_+2, line_type, local_path()+".html");
+    print_header(os, name(), level_+2, user, line_type, local_path()+".html");
     path_anchor(os);
     os << "<p align=center>\n<img src='" 
@@ -72 +72 @@
        << "' alt='[plot]' border=0>\n</p>";
 
-    os << "<table class=\"listings\">\n";
-    os << "<thead>";
-    os << "<tr>\n";
-    os << "<th>Author</th>\n";
-    os << "<th>Lines</th>\n";
-    os << "<th>Code</th>\n";
-    os << "<th>Comments</th>\n";
-    os << "</tr>\n</thead>\n";
-    os << "<tbody>";
-
-    bool dark=false;
-    os << "<tr class=\"light\">\n";
-    os << "<td class=\"directory\" colspan=\"5\">";
-    anchor(os, "index.html", "../");
-    os << "</td>\n</tr>\n";
-    dark=!dark;
-    
-    // print authors
-    for (std::set<std::string>::const_iterator i=stats_.authors().begin();
-         i!=stats_.authors().end(); ++i){
-      if (dark)
-        os << "<tr class=\"dark\"><td>" << *i 
-           << "</td><td>" << stats_.lines(*i)
-           << "</td><td>" << stats_.code(*i)
-           << "</td><td>" << stats_.comments(*i)
-           << "</td></tr>\n";
-      else
-        os << "<tr class=\"light\"><td>" << *i 
-           << "</td><td>" << stats_.lines(*i)
-           << "</td><td>" << stats_.code(*i)
-           << "</td><td>" << stats_.comments(*i)
-           << "</td></tr>\n";
-      dark=!dark;
-    }
-    if (dark)
-      os << "<tr class=\"dark\">\n";
-    else
-      os << "<tr class=\"light\">\n";
-    os << "<td>Total</td>\n";
-    os << "<td>" << stats_.lines() << "</td>\n";
-    os << "<td>" << stats_.code() << "</td>\n";
-    os << "<td>" << stats_.comments() << "</td>\n";
-    os << "</tr>\n";
-    os << "</table>\n";
+    print_author_summary(os);
     os << "</p>\n";
 
@@ -154 +111 @@
 
 
-  void File::print_copyright
-  (const std::vector<std::string>& dates,
-   const std::vector<std::string>& authors,
-   std::map<std::string, std::string>& alias) const
-  {
+  void File::print_copyright (std::map<std::string,std::string>& alias) const{
     if (ignore())
       return;
-    assert(dates.size()==authors.size());
     using namespace std;
-    SVN* svn=SVN::instance();
-    vector<size_t> rev=svn->revisions(path());
+
+    SVNlog log(path());
 
     typedef map<int, set<string> > Container;
     Container copyright;
-    for (vector<size_t>::iterator i=rev.begin(); i!=rev.end(); ++i) {
-      assert(*i<dates.size());
-      time_t sec = str2time(dates[*i]);
+
+    
+    assert(log.author().size()==log.date().size());
+    vector<string>::const_iterator author=log.author().begin();
+    for (vector<string>::const_iterator date=log.date().begin();
+         date!=log.date().end(); ++date, ++author) {
+      time_t sec = str2time(*date);
       tm* timeinfo = gmtime(&sec);
 
       // find username in map of aliases
-      map<string, string>::iterator name = alias.lower_bound(authors[*i]);
+      map<string, string>::iterator name = alias.lower_bound(*author);
       // if alias exist insert alias
-      if (name != alias.end() && name->first==authors[*i])
+      if (name != alias.end() && name->first==*author)
         copyright[timeinfo->tm_year].insert(name->second);
       else {
         // else insert user name
-        copyright[timeinfo->tm_year].insert(authors[*i]);
-        std::cerr << "Warning: no alias found for `" << authors[*i] << "`\n";
+        copyright[timeinfo->tm_year].insert(*author);
+        std::cerr << "Warning: no alias found for `" << *author << "`\n";
         // insert alias to avoid multiple warnings.
-        alias.insert(name, std::make_pair(authors[*i], authors[*i]));
+        alias.insert(name, std::make_pair(*author, *author));
       }
     }
-    
+
+
     // Code copied from Gnuplot -r70
     char tmpname[]="/tmp/svndigestXXXXXX";
@@ -197 +154 @@
     // already open for writing.
     std::ofstream tmp(tmpname);
-      
-
-
 
     ifstream is(path().c_str());
+    assert(is.good());
     string line;
     bool found_copyright = false;
@@ -223 +178 @@
         // check whether copyright starts on this line
         string::iterator i = search(line.begin(), line.end(), "Copyright (C)");
-        
-        if (i==line.end())
+        if (i==line.end()) {
           tmp << line << "\n";
+        }     
         else {
           prefix = line.substr(0, distance(line.begin(), i));
           found_copyright = true;
-          if (!found_copyright) 
-            tmp << line << "\n";
-          else {
-            // Printing copyright statement
-            for (Container::const_iterator i=copyright.begin();
-                 i!=copyright.end();) {
-              tmp << prefix << "Copyright (C) "
-                   << 1900+i->first;
-              Container::const_iterator j = i;
-              while (++j!=copyright.end() && i->second == j->second){
-                tmp << ", " << 1900+j->first;
-              }
-              // printing authors
-              for (set<string>::iterator a=i->second.begin();
-                   a!=i->second.end(); ++a){
-                if (a!=i->second.begin())
-                  tmp << ",";
-                tmp << " " << *a;
-              }
-              tmp << "\n";
-              i = j;
+          // Printing copyright statement
+          for (Container::const_iterator i=copyright.begin();
+               i!=copyright.end();) {
+            tmp << prefix << "Copyright (C) "
+                << 1900+i->first;
+            Container::const_iterator j = i;
+            assert(i!=copyright.end());
+            while (++j!=copyright.end() && i->second == j->second){
+              tmp << ", " << 1900+(j->first);
             }
+            // printing authors
+            for (set<string>::iterator a=i->second.begin();
+                 a!=i->second.end(); ++a){
+              if (a!=i->second.begin())
+                tmp << ",";
+              tmp << " " << *a;
+            }
+            tmp << "\n";
+            i = j;
           }
         }