[Popcon-commits] cvs commit to popularity-contest by ballombe

[ballombe at cvs.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest
In directory alioth:/tmp/cvs-serv22418

Modified Files:
	popcon.pl 
Log Message:
* popcon.pl:
  - revert changes introduced in 1.44.
  - Use :encoding(UTF-8) instead of :utf8 when reapding packages files
  - Add query box linking to <http://qa.debian.org/popcon.php>


Index: popcon.pl
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/popcon.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- popcon.pl	11 Apr 2008 22:58:57 -0000	1.26
+++ popcon.pl	5 May 2008 20:02:46 -0000	1.27
@@ -63,6 +63,10 @@
   For more information, read the <a href="${docurlbase}README">README</a> and the 
   <a href="${docurlbase}FAQ">FAQ</a>.
   </em> <p>
+<form method="GET" action="http://qa.debian.org/popcon.php">Popcon statistics
+for source package <input type="text" size="30" maxlength="80" name="package">
+<input type="submit" value="Go">
+</form> <p>
 EOH
 }
 
@@ -224,12 +228,7 @@
 {
   /([^[:space:]]+)/ or die("incorrect package name");
   $file = $1;#Untaint
-  if ($file =~ m%/dists/stable/%) {
-    # Stable release (Etch) do not use UTF-8 in its package files
-    open AVAIL, "-|:encoding(iso-8859-1)","zcat $file";
-  } else {
-    open AVAIL, "-|:utf8","zcat $file";
-  }
+  open AVAIL, "-|:encoding(UTF-8)","zcat $file";
   while(<AVAIL>)
   {
 /^Package: (.+)/  and do {$p=$1;$maint{$p}="bug";$source{$p}=$p;next;};