r9022 - in /scripts/qa: qareport.cgi templates/by_category

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Nov  8 11:04:30 2007
New Revision: 9022

URL: http://svn.debian.org/wsvn/?sc=1&rev=9022
Log:
Add quotemeta FILTER to template processor; Links to CPAN RT are shown as such

Modified:
    scripts/qa/qareport.cgi
    scripts/qa/templates/by_category

Modified: scripts/qa/qareport.cgi
URL: http://svn.debian.org/wsvn/scripts/qa/qareport.cgi?rev=9022&op=diff
==============================================================================
--- scripts/qa/qareport.cgi (original)
+++ scripts/qa/qareport.cgi Thu Nov  8 11:04:30 2007
@@ -126,6 +126,9 @@
         INCLUDE_PATH => $CFG{qareport_cgi}{templates_path},
         INTERPOLATE  => 1,
         POST_CHOMP   => 1,
+        FILTERS      => {
+            'quotemeta' => sub { quotemeta(shift) },
+        },
     }
 );
 

Modified: scripts/qa/templates/by_category
URL: http://svn.debian.org/wsvn/scripts/qa/templates/by_category?rev=9022&op=diff
==============================================================================
--- scripts/qa/templates/by_category (original)
+++ scripts/qa/templates/by_category Thu Nov  8 11:04:30 2007
@@ -17,8 +17,14 @@
             href="http://bugs.debian.org/$s">#$s</a>
         [% IF data.bts.$pkg.$s.forwarded %]
         [% SET F = data.bts.$pkg.$s.forwarded %]
+        [% qm = BLOCK %]^https?:[% FILTER quotemeta %]//rt.cpan.org/[% END %].+html\?id=(\d+)[% '$' %][% END %]
+        [% rt = F.match(qm) %]
         <div style="font-size: smaller">
+            [% IF rt.0 %]
+            <a href="$F">cpan#[% rt.0 %]</a>
+            [% ELSE %]
             <a href="[% IF F.match("^http") %][% GET F | html %][% ELSE %]mailto:[% GET F | html %][% END %]">forwarded</a>
+            [% END %]
         </div>
         [% END %]
         [% IF data.bts.$pkg.$s.keywords.length > 0 %]
@@ -27,7 +33,9 @@
         </div>
         [% END %]
     </td>
-    <td>[% data.bts.$pkg.$s.subject.replace("^\\Q$pkg\\E:\\s*","") | html %]</td>
+    <td>
+        [% qm = BLOCK %][% pkg | quotemeta %][% END %]
+        [% data.bts.$pkg.$s.subject.replace("^$qm:\\s*",'') | html %]</td>
 </tr>
 [% END #FOREACH %]
 </table>