Changeset 751 for trunk/lib

Timestamp:

Jan 14, 2009, 1:36:20 PM (15 years ago)

Author:

Peter Johansson

Message:

closes #308

Location:

trunk/lib

Files:

• Date.cc (modified) (4 diffs)
• Node.cc (modified) (6 diffs)
• first_page.cc (modified) (7 diffs)
• html_utility.cc (modified) (1 diff)

trunk/lib/Date.cc

@@ -4 +4 @@
   Copyright (C) 2007 Peter Johansson
   Copyright (C) 2008 Jari Häkkinen
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -24 +25 @@
 
 #include <algorithm>
+#include <cassert>
+#include <ctime>
 #include <sstream>
 #include <string>
@@ -29 +32 @@
 namespace theplu {
 namespace svndigest {
-
-  static const char* wdays_[7] = {
-    "Sunday","Monday", "Tuesday", "Wednesday", "Thursday", "Friday", 
-    "Saturday" 
-  };
-
-    
-  static const char* month_[12] = {
-    "January", "February", "March", "April", "May", "June", "July", "August", 
-    "September", "October", "November", "December"
-  }; 
-
 
   Date::Date(void)
@@ -152 +143 @@
     std::stringstream ss;
     struct tm* timeinfo = std::gmtime(&time_);
-    for (std::string::iterator i=format.begin(); i!=format.end(); ++i) {
-      if (*i == '%' && ++i !=format.end()) {
-        if (*i == 'a')
-          ss << std::string(wdays_[timeinfo->tm_wday]).substr(0,3);
-        else if (*i == 'A')
-          ss << wdays_[timeinfo->tm_wday];
-        else if (*i == 'b')
-          ss << std::string(month_[timeinfo->tm_mon]).substr(0,3);
-        else if (*i == 'B')
-          ss << month_[timeinfo->tm_mon];
-        else if (*i == 'd')
-          ss << timeinfo->tm_mday;
-        else if (*i == 'e') {
-          if (timeinfo->tm_mday<10)
-            ss << "0";
-          ss << timeinfo->tm_mday;
-        }
-        else if (*i == 'H') {
-          if (timeinfo->tm_hour<10)
-            ss << "0";
-          ss << timeinfo->tm_hour;
-        }
-        else if (*i == 'I') {
-          int tmp = (timeinfo->tm_hour + 11) % 12 + 1;
-          if (tmp<10)
-            ss << "0";
-          ss << tmp;
-        }
-        else if (*i == 'j')
-          ss << timeinfo->tm_yday+1;
-        else if (*i == 'm') {
-          if (timeinfo->tm_mon<9)
-            ss << "0";
-          ss << timeinfo->tm_mon+1;
-        }
-        else if (*i == 'M') {
-          if (timeinfo->tm_min<10)
-            ss << "0";
-          ss << timeinfo->tm_min;
-        }
-        else if (*i == 'P')
-          if (timeinfo->tm_hour<12)
-            ss << "AM";
-          else
-            ss << "PM";
-        else if (*i == 'S') {
-          if (timeinfo->tm_sec<10)
-            ss << "0";
-          ss << timeinfo->tm_sec;
-        }
-        else if (*i == 'w')
-          if (timeinfo->tm_wday==0)
-            ss << "7";
-          else
-            ss << timeinfo->tm_wday;
-        else if (*i == 'y') {
-          int y(timeinfo->tm_year % 100);
-          if (y<10)
-            ss << "0";
-          ss << y;
-        }
-        else if (*i == 'Y')
-          ss << timeinfo->tm_year+1900;
-        else if (*i == 'Z')
-          ss << timeinfo->tm_zone;
-        else {
-          ss << '%';
-          --i;
-        }
-      }
-      else
-        ss << *i;
-    }
-
-    return ss.str();
+    char buffer[80]; 
+    size_t res = std::strftime(buffer, 80, format.c_str(), timeinfo);
+    assert(res>0);
+    return buffer;
   }
 

trunk/lib/Node.cc

@@ -4 +4 @@
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
   Copyright (C) 2008 Jari Häkkinen
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -24 +25 @@
 
 #include "Date.h"
+#include "HtmlStream.h"
 #include "html_utility.h"
 #include "SVNlog.h"
@@ -229 +231 @@
                                   const SVNlog& log) const
   { 
+    HtmlStream hs(os);
     os << "<h3>Author Summary</h3>";
     os << "<table class=\"listings\">\n";
@@ -252 +255 @@
 
     // print authors
-    const std::string timefmt("%e/%m/%y %H:%M:%S");
+    const std::string timefmt("%Y-%m-%d  %H:%M");
     for (std::set<std::string>::const_iterator i=stats.authors().begin();
          i!=stats.authors().end(); ++i){
@@ -269 +272 @@
         const Commitment& lc(log.latest_commit(*i));
         os << "</td>" << "<td>" << trac_revision(lc.revision()) 
-           << "</td>" << "<td>" << Date(lc.date())(timefmt);
+           << "</td>" << "<td>";
+        hs << Date(lc.date())(timefmt);
       }
       else {
@@ -297 +301 @@
     const Commitment& lc(log.latest_commit());
     os << "<td>" << trac_revision(lc.revision()) << "</td>\n";
-    os << "<td>" << Date(lc.date())(timefmt)<< "</td>\n";
+    os << "<td>";
+    hs << Date(lc.date())(timefmt);
+    os << "</td>\n";
     os << "</tr>\n";
     os << "</tbody>\n";

trunk/lib/first_page.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
@@ -85 +86 @@
     Date begin(log.commits()[0].date());
     Date end(log.commits().back().date());
-    std::string timefmt("%a, %e %b %Y  %H:%M:%S");
+    std::string timefmt("%a %b %e %H:%M:%S %Y");
 
     os << "<div class=\"main\">" 
@@ -118 +119 @@
                      const Stats& stats)
   {
+    HtmlStream hs(os);
     os << "<div class=\"main\">"
        << "<table class=\"main\"><thead><tr><th colspan=\"2\">" 
@@ -130 +132 @@
        <<"</tr>";
 
-    std::string timefmt("%Y %b %d %H:%M:%S");
+    std::string timefmt("%Y-%m-%d  %H:%M");
     using namespace std;
     for (vector<Commitment>::const_iterator i=lc.begin(); i!=lc.end(); ++i) {
@@ -145 +147 @@
          << "%)</td><td>" << stats.comments(i->author()) << " (" 
          << 100*stats.comments(i->author())/(stats.comments()?stats.comments():1)
-         << "%)</td><td>" << Date(i->date())(timefmt) << "</td>" <<"</tr>";
+         << "%)</td><td>";
+      hs << Date(i->date())(timefmt);
+      os << "</td>" <<"</tr>";
     }
     os << "<tr><td>Total</td>";
@@ -168 +172 @@
        << "<td>Removed</td><td>Message</td></tr>\n";
     HtmlStream hs(os);
-    std::string timefmt("%Y %b %d %H:%M:%S");
+    std::string timefmt("%Y-%m-%d  %H:%M");
     const size_t maxlength = 80;
     const Configuration& conf = Configuration::instance();
@@ -179 +183 @@
          << "</td>";
       Date date(i->date());
-      os << "<td>" << date(timefmt) << "</td>";
+      os << "<td>";
+      hs << date(timefmt); 
+      os << "</td>";
       os << "<td>"; 
       os << trac_revision(i->revision());

trunk/lib/html_utility.cc

@@ -64 +64 @@
   {
     Date date;
-    os << "<p class=\"footer\">\nGenerated on "
-       << date("%a %b %d %H:%M:%S %Y") << " (UTC) by "
-       << anchor("http://dev.thep.lu.se/svndigest/", 
+    HtmlStream hs(os);
+    os << "<p class=\"footer\">\nGenerated on ";
+    hs << date("%a %b %e %H:%M:%S %Y") << " (UTC) by ";
+    os << anchor("http://dev.thep.lu.se/svndigest/", 
                  PACKAGE_STRING, 0, "");
     if (DEV_BUILD)