Changeset 290

Timestamp:

May 8, 2007, 3:34:58 PM (16 years ago)

Author:

Peter Johansson

Message:

added suppport for links of type ticket:180 refs #180

Location:

trunk/lib

Files:

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

trunk/lib/Trac.cc

@@ -53 +53 @@
                     const std::string::const_iterator& last)
   {
+    if (ticket1(first, last))
+      return true;
+    if (ticket2(first, last))
+      return true;
+    return false;
+  }
+
+
+  bool Trac::ticket1(std::string::const_iterator& first, 
+                     const std::string::const_iterator& last)
+  {
     if (first==last)
       return false;
@@ -66 +77 @@
       return false;
     }
+
+    const Configuration& conf = Configuration::instance();
+    hs_.stream() << anchor(conf.trac_root()+"ticket/"+ticket,"#"+ticket); 
+    return true;
+  }
+
+
+  bool Trac::ticket2(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 (match(first, last, "ticket:").empty()){
+      first = first_orig;
+      return false;
+    }
+      
+    std::string ticket = match(first, last, Digit());
 
     const Configuration& conf = Configuration::instance();

trunk/lib/Trac.h

@@ -65 +65 @@
                 const std::string::const_iterator& last);
 
+    bool ticket(std::string::const_iterator& first, 
+                const std::string::const_iterator& last);
+
     /// if range (first, last) starts with /#[:digit:]*/ a ticket link
     /// is written;
     /// @return if ticket is found iterator pointing to after found
     /// ticket; else first is returned.
-    bool ticket(std::string::const_iterator& first, 
-                const std::string::const_iterator& last);
+    bool ticket1(std::string::const_iterator& first, 
+                 const std::string::const_iterator& last);
+
+    bool ticket2(std::string::const_iterator& first, 
+                 const std::string::const_iterator& last);
+
 
 

trunk/lib/utility.cc

@@ -111 +111 @@
 
 
+  std::string match(std::string::const_iterator& first,
+                    const std::string::const_iterator& last,
+                    const char* c)
+  {
+    std::string str(c);
+    if (match_begin(first, last, str)) {
+      first += str.size();
+      return str;
+    }
+    return std::string();
+  }
+
+
   bool node_exist(const std::string& path)
   {

trunk/lib/utility.h

@@ -133 +133 @@
   inline std::string trim(std::string str) { return htrim(ltrim(str)); }
 
+
+  std::string match(std::string::const_iterator& first,
+                    const std::string::const_iterator& last,
+                    const char*);
 
   template <class T>