Changeset 289 for trunk/lib/Trac.cc

Timestamp:

May 8, 2007, 2:48:07 PM (15 years ago)

Author:

Peter Johansson

Message:

fixed trac link problem. fixes #178 and refs #180. Also changed format of config file.

File:

• trunk/lib/Trac.cc (modified) (3 diffs)

trunk/lib/Trac.cc

@@ -27 +27 @@
 #include "HtmlStream.h"
 #include "html_utility.h"
+#include "utility.h"
 
 namespace theplu{
@@ -59 +60 @@
       return false;
     ++first;
-    std::string ticket;
-    for (;first!=last && isdigit(*first); ++first) 
-      ticket.append(1,*first);
+    std::string ticket = match(first, last, Digit());
 
-    if (ticket.empty())
+    if (ticket.empty()) {
+      first = first_orig;
       return false;
+    }
 
-    Configuration* conf = Configuration::instance();
-    hs_.stream() << anchor(conf->trac_ticket()+ticket,"#"+ticket); 
+    const Configuration& conf = Configuration::instance();
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
     return true;
   }
@@ -79 +80 @@
 
     const std::string::const_iterator first_orig(first);
-    if (*first != '#')
+
+    const std::string log_str("log:"); 
+    if (!match_begin(first, last, log_str)) {
+      first = first_orig;
       return false;
+    }
+    first += log_str.size();
+    std::string node = match(first, last, not2Char('#', '@'));
     ++first;
-    std::string ticket;
-    for (;first!=last && isdigit(*first); ++first) 
-      ticket.append(1,*first);
-
-    if (ticket.empty())
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
       return false;
-
-    Configuration* conf = Configuration::instance();
-    hs_.stream() << anchor(conf->trac_ticket()+ticket,"#"+ticket); 
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    std::string href(Configuration::instance().trac_root()+"log"+node+
+                     "?rev="+rev+"&stop_rev="+stop_rev);
+    std::string str(first_orig, first);
+    hs_.stream() << anchor(href, str); 
     return true;
   }