Changeset 286

Timestamp:

May 7, 2007, 6:07:23 PM (16 years ago)

Author:

Peter Johansson

Message:

moved trac link detection to separate file. refs #178

Location:

trunk/lib

Files:

• HtmlStream.cc (modified) (1 diff)
• HtmlStream.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• Trac.cc (added)
• Trac.h (added)
• first_page.cc (modified) (2 diffs)

trunk/lib/HtmlStream.cc

@@ -73 +73 @@
   }
 
+  
+  std::ostream& HtmlStream::stream(void)
+  {
+    return os_;
+  }
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/HtmlStream.h

@@ -54 +54 @@
     void print(std::stringstream&);
 
+    ///
+    /// \return reference to underlying ostream
+    ///
+    std::ostream& stream(void);
+
   private:
     ///

trunk/lib/Makefile.am

@@ -30 +30 @@
   HtmlStream.h html_utility.h Node.h Parser.h rmdirhier.h \
   Stats.h SVN.h SVNblame.h  \
-  SVNinfo.h SVNlog.h SVNproperty.h utility.h
+  SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
 
 libsvndigest_la_SOURCES = ColumnStream.cc Commitment.cc Configuration.cc \
@@ -36 +36 @@
   Gnuplot.cc GnuplotFE.cc HtmlStream.cc \
   html_utility.cc Node.cc Parser.cc rmdirhier.cc Stats.cc SVN.cc        \
-  SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc utility.cc
+  SVNblame.cc SVNinfo.cc SVNlog.cc SVNproperty.cc Trac.cc utility.cc
 
 clean-local: 

trunk/lib/first_page.cc

@@ -32 +32 @@
 #include "Stats.h"
 #include "SVNlog.h"
+#include "Trac.h"
 #include "utility.h"
 #include <config.h> // this header file is created by configure
@@ -182 +183 @@
       if (conf->trac_ticket().empty())
         hs << mess;
-      else { // make anchors to trac
-        char c;
-        std::stringstream ss(mess);
-        for (ss.get(c); ss.good(); ss.get(c)) {
-          if (c=='#') {
-            int ticket=0;
-            ss >> ticket;
-            if (!ss.fail()){
-              std::stringstream s;
-              s << ticket;
-              os << anchor(conf->trac_ticket()+s.str(),"#"+s.str()); 
-            }
-            else {
-              ss.clear(std::ios::goodbit);
-              hs << c;
-            }
-          }
-          else
-            hs << c;
-        }
+      else {// make anchors to trac
+        Trac trac(hs);
+        trac.print(mess);
       }