Changeset 256 for trunk/lib/html_utility.cc

Timestamp:

Apr 30, 2007, 1:17:36 PM (16 years ago)

Author:

Peter Johansson

Message:

reimplementing some part of print_main_page using Commitment class

File:

• trunk/lib/html_utility.cc (modified) (4 diffs)

trunk/lib/html_utility.cc

@@ -24 +24 @@
 #include "html_utility.h"
 
+#include "Commitment.h"
 #include "Date.h"
 #include "HtmlStream.h"
@@ -239 +240 @@
 
     using namespace std;
-    map<string, Date> latest_commit_date;
-    assert(log.author().size()==log.date().size());
-    typedef vector<string>::const_iterator iter;
-    iter d=log.date().begin();
-    for (iter a=log.author().begin();
-         a!=log.author().end(); ++a, ++d) {
-      latest_commit_date[*a]=Date(*d);
-    }
+    set<string> authors;
+    authors.insert(log.author().begin(), log.author().end());
     // erase invalid authors
-    latest_commit_date.erase("");
-    latest_commit_date.erase("no author");
-
-    // vector of authors & date sorted with respect to date
-    typedef vector<pair<string, Date> > vector;
-    vector author_date;
-    author_date.reserve(latest_commit_date.size());
-    back_insert_iterator<vector> i(author_date);
-    copy(latest_commit_date.begin(), latest_commit_date.end(), i);
-    sort(author_date.begin(), author_date.end(), 
-         pair_value_compare<string,Date>());
-
-    print_general_information(os, log, author_date.size());
-    print_authors(os, author_date, log, stats);
+    authors.erase("");
+    authors.erase("no author");
+
+    vector<Commitment> latest_commit;
+    latest_commit.reserve(authors.size());
+    for (set<string>::const_iterator i(authors.begin()); i!=authors.end(); ++i)
+      latest_commit.push_back(log.latest_commit(*i));
+
+    print_general_information(os, log, authors.size());
+    sort(latest_commit.begin(), latest_commit.end(), GreaterRevision());
+    print_authors(os, latest_commit, stats);
     print_recent_logs(os, log);
     os << "<hr width=100% />";
@@ -375 +367 @@
 
   void print_authors(std::ostream& os, 
-                     const std::vector<std::pair<std::string,Date> >& auth_date, 
-                     const SVNlog& log, const Stats& stats)
+                     const std::vector<Commitment>& lc,
+                     const Stats& stats)
   {
     os << "<div class=\"main\">"
@@ -392 +384 @@
     std::string timefmt("%b %d %H:%M:%S %Y");
     using namespace std;
-    for (vector<pair<string,Date> >::const_reverse_iterator i=auth_date.rbegin();
-         i!=auth_date.rend(); ++i) {
+    for (vector<Commitment>::const_iterator i=lc.begin(); i!=lc.end(); ++i) {
       os << "<tr><td>" 
-         << anchor(string(i->first+"/total/index.html"),i->first)
-         << "</td><td>" << stats.lines(i->first) << " (" 
-         << 100*stats.lines(i->first)/stats.lines() << "%)</td>"
-         << "<td>" << stats.code(i->first) << " (" 
-         << 100*stats.code(i->first)/stats.code() << "%)</td>"
-         << "<td>" << stats.comments(i->first) << " (" 
-         << 100*stats.comments(i->first)/stats.comments() << "%)</td>"
-         << "<td>" << i->second(timefmt) << "</td>"
+         << anchor(string(i->author()+"/total/index.html"),i->author())
+         << "</td><td>" << stats.lines(i->author()) << " (" 
+         << 100*stats.lines(i->author())/stats.lines() << "%)</td>"
+         << "<td>" << stats.code(i->author()) << " (" 
+         << 100*stats.code(i->author())/stats.code() << "%)</td>"
+         << "<td>" << stats.comments(i->author()) << " (" 
+         << 100*stats.comments(i->author())/stats.comments() << "%)</td>"
+         << "<td>" << i->date()(timefmt) << "</td>"
          <<"</tr>";
     }