Changeset 556 for trunk/lib

Timestamp:

Jan 16, 2008, 2:35:00 PM (16 years ago)

Author:

Peter Johansson

Message:

Fixing statistics bugs and links on first page

Location:

trunk/lib

Files:

• Configuration.cc (modified) (2 diffs)
• Configuration.h (modified) (3 diffs)
• LineTypeParser.cc (modified) (1 diff)
• Stats.cc (modified) (3 diffs)
• first_page.cc (modified) (6 diffs)
• first_page.h (modified) (2 diffs)
• html_utility.cc (modified) (2 diffs)

trunk/lib/Configuration.cc

@@ -263 +263 @@
   Configuration& Configuration::instance(void)
   {
-    if (!instance_)
+    if (!instance_){
       instance_ = new Configuration;
+      instance_->load();
+    }
     return *instance_;
   }
@@ -412 +414 @@
       translate(word, *iter);
     }
-
   }
 

trunk/lib/Configuration.h

@@ -58 +58 @@
 
     /// 
-    /// @brief load deafult configuration
-    /// 
-    void load(void);
-
-    /// 
     /// throw if stream is not a valid config
     ///
@@ -91 +86 @@
     // assignment not implemented because assignment is always self-assignment
     Configuration& operator=(const Configuration&);
+    // destructor not implemented
+    ~Configuration(void);
 
     friend std::ostream& operator<<(std::ostream&, const Configuration&);
@@ -100 +97 @@
     bool equal_false(const std::string&) const;
     bool equal_true(const std::string&) const;
+    /// 
+    /// @brief load deafult configuration
+    /// 
+    void load(void);
+
     void set_default(void);
     /**

trunk/lib/LineTypeParser.cc

@@ -52 +52 @@
         // check if line is end of copyright statement, i.e. contains
         // no alphanumerical character (except in copyright_prefix).
+        post_copyright_ = true;
         for (size_t i=0; i<line.size()&&post_copyright_; ++i)
           if (isalnum(line[i]) && 

trunk/lib/Stats.cc

@@ -88 +88 @@
       std::vector<u_int>& other = other_stats()[*iter];
       accumulate(other);
+      std::vector<u_int>& copyright = copyright_stats()[*iter];
+      accumulate(copyright);
     }
   }
@@ -98 +100 @@
     add_author(user);
 
-    // Peter remove repeat
+    // FIXME: Peter, remove repeat
     std::vector<u_int>& code = code_stats()[user];
     if (code.size() < rev+1){
@@ -134 +136 @@
     else if (lt == LineTypeParser::other)
       other[rev]+=n;
+
+    std::vector<u_int>& copy = copyright_stats()[user];
+    if (copy.size() < rev+1){
+      copy.reserve(revision() + 1);
+      copy.insert(copy.end(), rev - copy.size(), 0);
+      if (lt == LineTypeParser::copyright)
+        copy.push_back(n);
+      else 
+        copy.push_back(0);
+    }
+    else if (lt == LineTypeParser::copyright)
+      copy[rev]+=n;
   }
 

trunk/lib/first_page.cc

@@ -51 +51 @@
 
   void print_main_page(const std::string& dir, const SVNlog& log,
-                       const Stats& stats, std::string url)
+                       const StatsCollection& stats, std::string url)
   {
     std::string filename="index.html";
@@ -69 +69 @@
       latest_commit.push_back(log.latest_commit(*i));
 
-    print_summary_plot(os, stats);
+    print_summary_plot(os, stats["classic"]);
     print_general_information(os, log, authors.size(), url);
     sort(latest_commit.begin(), latest_commit.end(), GreaterRevision());
-    print_authors(os, latest_commit, stats);
-    print_recent_logs(os, log);
+    print_authors(os, latest_commit, stats["classic"]);
+    print_recent_logs(os, log, stats);
     os << "<hr width=100% />";
     print_footer(os);
@@ -130 +130 @@
        <<"</tr>";
 
-    std::string timefmt("%b %d %H:%M:%S %Y");
+    std::string timefmt("%Y %b %d %H:%M:%S");
     using namespace std;
     for (vector<Commitment>::const_iterator i=lc.begin(); i!=lc.end(); ++i) {
@@ -158 +158 @@
 
 
-  void print_recent_logs(std::ostream& os, const SVNlog& log)
+  void print_recent_logs(std::ostream& os, const SVNlog& log,
+                         const StatsCollection& stats)
   {
     os << "<div class=\"main\">\n"
@@ -172 +173 @@
     assert(log.author().size()==log.message().size());
     assert(log.author().size()==log.revision().size());
-    os << "<tr><td>Author</td><td>Date</td><td>Rev</td><td>Message</td></tr>\n";
+    os << "<tr><td>Author</td><td>Date</td><td>Rev</td><td>Added</td>"
+       << "<td>Removed</td><td>Message</td></tr>\n";
     HtmlStream hs(os);
-    std::string timefmt("%b %d %H:%M:%S %Y");
+    std::string timefmt("%Y %b %d %H:%M:%S");
     const size_t maxlength = 80;
     const Configuration& conf = Configuration::instance();
@@ -187 +189 @@
       os << "</td>";
       os << "<td>";
+      int added = stats["add"](LineTypeParser::total, "all", *r) -
+        stats["add"](LineTypeParser::total, "all", *r - 1); 
+      os << added;
+      os << "</td>";
+      os << "<td>";
+      os << added - (stats["blame"](LineTypeParser::total, "all", *r) -
+                     stats["blame"](LineTypeParser::total, "all", *r - 1)); 
+      os << "</td>";
+      os << "<td>";
       std::string mess = *m;
       // replace newlines with space

trunk/lib/first_page.h

@@ -34 +34 @@
   class Commitment;
   class Stats;
+  class StatsCollection;
   class SVNlog;
 
@@ -49 +50 @@
   /// @brief print main page
   ///
-  void print_main_page(const std::string&, const SVNlog&, const Stats&,
-                       std::string url);
+  void print_main_page(const std::string&, const SVNlog&, 
+                       const StatsCollection&, std::string url);
     
-  void print_recent_logs(std::ostream&, const SVNlog& log);
+  void print_recent_logs(std::ostream&, const SVNlog& log,
+                         const StatsCollection&);
     
   void print_summary_plot(std::ostream&, const Stats& stats);

trunk/lib/html_utility.cc

@@ -78 +78 @@
                     const std::string& stats)
   {
+    os << "<!-- Generated by " << PACKAGE_STRING << "-->\n";
     os << "<!DOCTYPE html\n"
        << "PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
@@ -146 +147 @@
     if (item_local=="none")
       item_local = "total";
+    if (item_local=="main")
+      item_local = "total";
 
     if (stats=="classic")