Changeset 1005

Timestamp:

Jan 3, 2010, 4:05:25 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #405. Move replicated code to a function

Location:

trunk/lib

Files:

• Directory.cc (modified) (2 diffs)
• File.cc (modified) (2 diffs)
• first_page.cc (modified) (2 diffs)
• html_utility.cc (modified) (2 diffs)
• html_utility.h (modified) (2 diffs)

trunk/lib/Directory.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -190 +191 @@
       ss << imagedir << "/index.svg";
     os << "<p class=\"plot\">\n"; 
-    os << "<object data='" << ss.str() << "' type='image/svg+xml' width='600'>\n"
-       << "<embed src='" << ss.str() << "' type='image/svg+xml' width='600' />\n"
-       << "</object>\n";
+    os << image("svg", ss.str());
     os << "</p>\n";
 

trunk/lib/File.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -384 +385 @@
       ss << imagefile;
     os << "<p class=\"plot\">\n"; 
-    os << "<object data='" << ss.str() << "' type='image/svg+xml' width='600'>\n"
-       << "<embed src='" << ss.str() << "' type='image/svg+xml' width='600' />\n"
-       << "</object>\n";
+    os << image("svg", ss.str());
     os << "</p>\n";
 

trunk/lib/first_page.cc

@@ -4 +4 @@
   Copyright (C) 2006 Peter Johansson
   Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -232 +233 @@
     stats.plot_summary(name);
     os << "<div class=\"main\">\n";
-    os << "<object data='" << name << "' type='image/svg+xml' width='600'>\n"
-       << "<embed src='" << name << "' type='image/svg+xml' width='600' />\n"
-       << "</object>\n";
+    os << image("svg", name);
     os << "</div>";
 

trunk/lib/html_utility.cc

@@ -4 +4 @@
   Copyright (C) 2006 Peter Johansson
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -61 +61 @@
 
   
+  std::string image(const std::string& format, const std::string& name)
+  {
+    std::ostringstream os;
+    if (format=="svg")
+      os << "<object data='" << name << "' type='image/svg+xml' width='600'>\n"
+         << "<embed src='" << name << "' type='image/svg+xml' width='600' />\n"
+         << "</object>\n";
+    else {
+      assert(false);
+      throw std::runtime_error("unknown image format: " + format);
+    }
+    return os.str();
+  }
+
+
   void print_footer(std::ostream& os)
   {

trunk/lib/html_utility.h

@@ -7 +7 @@
   Copyright (C) 2006 Peter Johansson
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -47 +47 @@
                      const std::string& title="",
                      const std::string& color="");
+
+  /**
+   */
+  std::string image(const std::string& format, const std::string& name);
 
   ///