[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#373218: qa.debian.org: Patch



Package: qa.debian.org
Tags: patch
Followup-For: Bug #373218

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I just wrote a patch for this problem.
The best solution I found it to drop the current naming convention of the lintian reports and use the 
maintainer login (the same way most of the other pages do).
So the attachment is the patch against:
http://svn.wolffelaar.nl/lintian/trunk/reporting/html_reports
svn://svn.debian.org/qa/trunk/pts/www/xsl/pts.xsl
svn://svn.debian.org/qa/trunk/wml/developer.wml

I'm not very familiar with XSL but I think it should work just fine.

- -- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing'), (100, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.21-1-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGg/ZTYy49rUbZzloRAnaPAKCFxz3Zc/LnetpLUi+1U6uflJg9hwCfTDz0
uxwKw8MA4NakSxoKpjEPPSw=
=d3fF
-----END PGP SIGNATURE-----
diff -urN orig/developer.wml new/developer.wml
--- orig/developer.wml	2007-05-16 07:33:26.000000000 -0500
+++ new/developer.wml	2007-06-28 12:19:50.000000000 -0500
@@ -192,15 +192,11 @@
         html_a("submitted", "http://bugs.debian.org/cgi-bin/pkgreport.cgi?submitter=$ulogin";) . " - " .
         html_a("WNPP", "wnpp.php?login=$ulogin") . " - " .
         html_a("statistics", "http://io.debian.net/~tar/bugstats/?$ulogin";) . html_br();
-
-    $lintian = preg_replace('/%../', "_", urlencode($name));
-    $lintian = preg_replace('/\+/', "_", $lintian);
-    $lintian = preg_replace('/-/', "_", $lintian);
     $initial = strtoupper(substr($login, 0, 1));
     $maintainer_data .= "Reports: " .
         html_a("Buildd", "http://buildd.debian.org/pkg.cgi?maint=$ulogin";) . " - " .
         html_a("Igloo", "http://people.debian.org/~igloo/status.php?email=$ulogin";) . " - " .
-        html_a("Lintian", "http://lintian.debian.org/reports/m$lintian.html";) . " - " .
+        html_a("Lintian", "http://lintian.debian.org/reports/m$ulogin.html";) . " - " .
         html_a("Checklib", "http://rerun.lefant.net/checklib/maintainers.$initial.html#$ulogin";) . " - " .
         html_a("Debtags", "http://debtags.alioth.debian.org/todo.html?maint=$ulogin";);
     static $nm_db;
diff -urN orig/html_reports new/html_reports
--- orig/html_reports	2007-06-28 12:33:42.000000000 -0500
+++ new/html_reports	2007-06-28 12:14:58.000000000 -0500
@@ -480,11 +480,7 @@
 
     my $file = $maint;
     if ($file) {
-	$file =~ s/^(.+)\<.*$/$1/;
-	$file =~ tr/A-Za-z0-9_.,/_/c;
-	$file =~ s/^_+//g;
-	$file =~ s/_+$//g;
-
+	$file =~ s/^[^<]+\<([^>]+)$/$1/;
 	$file = "m$file.html";
     } else {
 	$file = "munsorted.html";
diff -urN orig/pts.xsl new/pts.xsl
--- orig/pts.xsl	2007-04-20 12:02:57.000000000 -0500
+++ new/pts.xsl	2007-06-28 12:32:49.000000000 -0500
@@ -722,10 +722,10 @@
       </xsl:element>
     </li>
   </xsl:if>
-  <!-- convert maintainer/name to follow lintian.debian.org convention [FG] -->
-                              <xsl:variable name="pattern" select="concat('àáèéëêòöøîìùñ-~/()&#34; ', &quot;'&quot;)"/>
-  <xsl:variable name="_name" select="translate(maintainer/name, $pattern, '_____________________')"/>
-    <li><a href="http://lintian.debian.org/reports/m{$_name}.html#{$package}";>Lintian report</a></li>
+  <xsl:call-template name="escape-name">
+    <xsl:variable name="_email" select="maintainer/email"/>
+  </xsl:call-template>
+  <li><a href="http://lintian.debian.org/reports/m{$_email}.html#{$package}";>Lintian report</a></li>
   <li>
     <xsl:element name="a">
       <xsl:attribute name="href">

Reply to: