Bug#341244: wml/developer.wml: all=1 page outdated wrt ddpo_maintainers info

[Florian Ernst <florian@uni-hd.de>]

Package: qa.debian.org
Severity: minor
Tags: patch

Dear QA people,

the huge (600kB) page displaying all maintainers (developer.php?all=1)
claims to list packages in main, non-us, Other and a Total, yet the
semantics of the ddpo_maintainers which is parsed for this info seems
to have changed.
The attached patch against wml/developer.wml corrects and simplifies
the generating of this listing a little bit. NB: $info_array[7] and
higher aren't filled for any entry in ddpo_maintainers, so I
completely left them out as $info_array[9] messed up $count.

HTH,
Flo

--- developer.wml.orig	2005-11-29 15:19:50.000000000 +0100
+++ developer.wml	2005-11-29 15:26:39.000000000 +0100
@@ -905,8 +905,8 @@
     
     $display_table_th = html_th("Name and email");
     $display_table_th .= html_th("main");
-    $display_table_th .= html_th("non-us");
-    $display_table_th .= html_th("Other" . html_br(), html_small("all contrib &" . html_br() . "non-free packages"));
+    $display_table_th .= html_th("contrib");
+    $display_table_th .= html_th("non-free");
     $display_table_th .= html_th("Total");
     $trs = array();
     foreach($maint as $line)
@@ -919,8 +919,8 @@
         
             $tds = html_td(html_b(html_a(str_replace(" ", html_blank(), "$info_array[3]") . html_blank() . "<$info_array[1]>", "developer.php?login=" . rawurlencode($info_array[1]))), 15);
             $main = 0;
-            $nonUS = 0;
-            $other = 0;
+            $contrib = 0;
+            $nonfree = 0;
             if($info_array[4] != "") 
             {
                 $main += count(explode(" ", $info_array[4]));
@@ -928,31 +928,16 @@
             }
             if($info_array[5] != "") 
             {
-                $other += count(explode(" ", $info_array[5]));
+                $contrib += count(explode(" ", $info_array[5]));
                 $count += count(explode(" ", $info_array[5]));
             }
             if($info_array[6] != "") 
             {
-                $nonUS += count(explode(" ", $info_array[6]));
+                $nonfree += count(explode(" ", $info_array[6]));
                 $count += count(explode(" ", $info_array[6]));
             }
-            if($info_array[7] != "")
-            {
-                $other += count(explode(" ", $info_array[7]));
-                $count += count(explode(" ", $info_array[7]));
-            }
-            if($info_array[8] != "") 
-            {
-                $other += count(explode(" ", $info_array[8]));
-                $count += count(explode(" ", $info_array[8]));
-            }
-            if($info_array[9] != "") 
-            {
-                $other += count(explode(" ", $info_array[9]));
-                $count += count(explode(" ", $info_array[9]));
-            }
 
-            $tds .= html_td($main) . html_td($nonUS) . html_td($other) . html_td(html_b($count));
+            $tds .= html_td($main) . html_td($contrib) . html_td($nonfree) . html_td(html_b($count));
             $trs[] = html_tr($tds, "center");
         }
     }

Attachment: signature.asc
Description: Digital signature