Changeset 256

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

Location:

trunk/lib

Files:

• Commitment.cc (modified) (2 diffs)
• Commitment.h (modified) (5 diffs)
• SVNlog.cc (modified) (2 diffs)
• SVNlog.h (modified) (2 diffs)
• html_utility.cc (modified) (4 diffs)
• html_utility.h (modified) (3 diffs)

trunk/lib/Commitment.cc

@@ -23 +23 @@
 
 #include "Commitment.h"
+#include "Date.h"
 
 #include <string>
@@ -30 +31 @@
 
 
-  Commitment::Commitment(std::string author, std::string date, 
+  Commitment::Commitment(void)
+  {
+  }
+
+
+  Commitment::Commitment(std::string author, const Date& date, 
                          std::string msg, size_t rev)
     : author_(author), date_(date), msg_(msg), rev_(rev)

trunk/lib/Commitment.h

@@ -25 +25 @@
 */
 
+#include "Date.h"
+
 #include <string>
 
@@ -40 +42 @@
 
     /**
+       \brief Default contructor.
+    */
+    Commitment(void);
+
+    /**
        \brief The contructor.
     */
-    Commitment(std::string author, std::string date, std::string msg, 
+    Commitment(std::string author, const Date& date, std::string msg, 
                size_t rev);
 
@@ -53 +60 @@
        \return Date
     */
-    inline std::string date(void) const { return date_; }
+    inline const Date& date(void) const { return date_; }
 
     /**
@@ -73 +80 @@
 
     std::string author_;
-    std::string date_;
+    Date date_;
     std::string msg_;
     size_t rev_;
@@ -79 +86 @@
   };
 
+  
+  struct GreaterRevision
+  {
+    inline bool operator()(const Commitment& lhs, const Commitment& rhs)
+    { return lhs.revision()>rhs.revision(); }
+  };
+
 }} // end of namespace svndigest and namespace theplu
 

trunk/lib/SVNlog.cc

@@ -23 +23 @@
 
 #include "SVNlog.h"
+
+#include "Commitment.h"
 #include "SVN.h"
 
@@ -48 +50 @@
   }
 
+  
+  Commitment SVNlog::latest_commit(std::string name) const
+  {
+    std::vector<std::string>::const_reverse_iterator iter = 
+      find(author().rbegin(), author().rend(), name);
+    size_t dist(std::distance(iter, author().rend()));
+    if (!dist) {
+      Commitment c;
+      return c;
+    }
+    return Commitment(author()[dist-1], Date(date()[dist-1]), 
+                      message()[dist-1], revision()[dist-1]);
+                                             
+  }
 
 }} // end of namespace svndigest and namespace theplu

trunk/lib/SVNlog.h

@@ -26 +26 @@
 
 #include "SVN.h"
+
+#include "Commitment.h"
 
 #include <string>
@@ -77 +79 @@
 
     /**
+       \return Latest commit \a author did. If no author is found an
+       empty Commitment (default constructor) is returned.
+    */
+    Commitment latest_commit(std::string author) const;
+
+    /**
        \return Revisions
     */

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>";
     }

trunk/lib/html_utility.h

@@ -35 +35 @@
 namespace svndigest{
 
+  class Commitment;
   class Date;
   class Stats;
@@ -57 +58 @@
 
   void print_authors(std::ostream& os, 
-                     const std::vector<std::pair<std::string, Date> >&, 
-                     const SVNlog&, const Stats& stats);
+                     const std::vector<Commitment>& latest_commit,
+                     const Stats& stats);
 
   ///
@@ -70 +71 @@
   void print_main_page(const std::string&, const SVNlog&, const Stats&);
     
-  void print_recent_logs(std::ostream&, const SVNlog&);
+  void print_recent_logs(std::ostream&, const SVNlog& log);
     
   ///