Changeset 293

Timestamp:

May 8, 2007, 6:02:12 PM (16 years ago)

Author:

Peter Johansson

Message:

refs #180 support r288:293 [288:293] log:@288:293.

Location:

trunk/lib

Files:

• Trac.cc (modified) (2 diffs)
• Trac.h (modified) (1 diff)

trunk/lib/Trac.cc

@@ -224 +224 @@
                  const std::string::const_iterator& last)
   {
+    if (log1(first, last))
+      return true;
+    if (log2(first, last))
+      return true;
+    if (log3(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::log1(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (*first != 'r')
+      return false;
+    ++first;
+
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() ) {
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"log/?rev="+
+                     rev+"&stop_rev="+stop_rev);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::log2(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
+    if (first==last)
+      return false;
+
+    const std::string::const_iterator first_orig(first);
+    if (*first != '[')
+      return false;
+    ++first;
+
+    std::string stop_rev = match(first, last, Digit());
+    if (stop_rev.empty() || first == last || *first != ':') {
+      first = first_orig;
+      return false;
+    }
+    ++first;
+    std::string rev = match(first, last, Digit());
+    if (rev.empty() || first == last || *first != ']') {
+      first = first_orig;
+      return false;
+    }
+    std::string href(Configuration::instance().trac_root()+"log/?rev="+
+                     rev+"&stop_rev="+stop_rev);
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
+    return true;
+  }
+
+
+  bool Trac::log3(std::string::const_iterator& first, 
+                  const std::string::const_iterator& last)
+  {
     if (first==last)
       return false;
@@ -248 +319 @@
       return false;
     }
-    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); 
+    std::string href;
+    if (!node.empty() && node[0]=='/')
+      href = std::string(Configuration::instance().trac_root()+"log"+node+
+                         "?rev="+rev+"&stop_rev="+stop_rev);
+    else
+      href = std::string(Configuration::instance().trac_root()+"log/"+node+
+                         "?rev="+rev+"&stop_rev="+stop_rev);
+      
+    hs_.stream() << anchor(href, std::string(first_orig, first)); 
     return true;
   }

trunk/lib/Trac.h

@@ -68 +68 @@
              const std::string::const_iterator& last);
 
+    bool log1(std::string::const_iterator& first, 
+              const std::string::const_iterator& last);
+
+    bool log2(std::string::const_iterator& first, 
+              const std::string::const_iterator& last);
+
+    bool log3(std::string::const_iterator& first, 
+              const std::string::const_iterator& last);
+
     bool milestone(std::string::const_iterator& first, 
                    const std::string::const_iterator& last);