From 5de516836e4faefea0b3d8798e88987cde9c477d Mon Sep 17 00:00:00 2001 From: short <> Date: Thu, 2 Oct 2003 20:46:39 +0000 Subject: [PATCH] narrow the table --- project/captive/Index.html.pl | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/project/captive/Index.html.pl b/project/captive/Index.html.pl index 7f41061..5005040 100755 --- a/project/captive/Index.html.pl +++ b/project/captive/Index.html.pl @@ -121,15 +121,25 @@ my %pkg_nosrc=(map(($_=>1),qw( captive-lufs captive-install ))); + +my $case; +my $a_href_arch=sub ($$%) +{ +my($file_base,$text,%args)=@_; + + $text=~s/[._]\D.*$// if $case!=1 && $text!~/^[.]/; + return a_href $file_base,$text,"size"=>($case==1),%args; +}; + my @dist=( { "name"=>"Red Hat 9
Shrike i386", "out"=>sub { my($pkg,$version_base,$version_ext)=@_; my $file="$pkg-$version_base-$version_ext.i386.rpm"; - my $r=a_href "dist/$file",$file; + my $r=&$a_href_arch("dist/$file",$file); (my $filedev=$file)=~s/^\Q$pkg\E-/${pkg}-devel-/; - $r.="
".a_href("dist/$filedev",$filedev) if $has_devel{$pkg}; + $r.="
".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg}; return $r; }, }, @@ -138,12 +148,12 @@ my @dist=( "out"=>sub { my($pkg,$version_base,$version_ext)=@_; my $file="$pkg-$version_base-$version_ext".(!$has_rh8{$pkg} ? "" : "rh8").".i386.rpm"; - my $r=a_href "dist/$file",$file; + my $r=&$a_href_arch("dist/$file",$file); (my $filedev=$file)=~s/^\Q$pkg\E-/${pkg}-devel-/; - $r.="
".a_href("dist/$filedev",$filedev) if $has_devel{$pkg}; + $r.="
".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg}; if ($pkg eq "captive-install") { for (qw(libxml2-2.5.4-1.i386.rpm libxml2-python-2.5.4-1.i386.rpm)) { - $r.="
".a_href('ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/'.$_,$_)." of Red Hat 9"; + $r.="
".&$a_href_arch('ftp://ftp.redhat.com/pub/redhat/linux/9/en/os/i386/RedHat/RPMS/'.$_,$_)." of Red Hat 9"; } } return $r; @@ -154,9 +164,9 @@ my @dist=( "out"=>sub { my($pkg,$version_base,$version_ext)=@_; my $file="$pkg-$version_base-$version_ext".(!$has_mdk91{$pkg} ? ".i386.rpm" : "mdk91.i586.rpm"); - my $r=a_href "dist/$file",$file; + my $r=&$a_href_arch("dist/$file",$file); (my $filedev=$file)=~s/^\Q$pkg\E-/${pkg}-devel-/; - $r.="
".a_href("dist/$filedev",$filedev) if $has_devel{$pkg}; + $r.="
".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg}; return $r; }, }, @@ -175,9 +185,9 @@ my @dist=( my($pkg,$version_base,$version_ext)=@_; $version_ext=~s/^\d+//; my $file="${pkg}_$version_base".($version_ext=~/^\d+$/ ? "" : $version_ext)."_i386.deb"; - my $r=a_href "dist/$file",$file; + my $r=&$a_href_arch("dist/$file",$file); (my $filedev=$file)=~s/^\Q$pkg\E_/${pkg}-dev_/; - $r.="
".a_href("dist/$filedev",$filedev) if $has_devel{$pkg}; + $r.="
".&$a_href_arch("dist/$filedev",$filedev) if $has_devel{$pkg}; return $r; }, }, @@ -189,8 +199,8 @@ my @dist=( $version_ext=~s/^\d+//; my $file="${pkg}_$version_base".($version_ext=~/^\d+$/ ? "" : $version_ext); return CGI::escapeHTML($file).":" - .' ' .a_href("dist/$file.dsc",".dsc","size"=>0) - .' '.a_href("dist/$file.tar.gz",".tar.gz"); + .' ' .&$a_href_arch("dist/$file.dsc",".dsc","size"=>0) + .' '.&$a_href_arch("dist/$file.tar.gz",".tar.gz"); }, }, { @@ -208,11 +218,12 @@ my @dist=( for my $dist (@dist) { print ""; print "".$dist->{"name"}.""; - for my $case (1,2,3) { + for my $casel (1,2,3) { + $case=$casel; print ""; print join("
",map({ my $pkg=$_; my($file,$text)=&{$dist->{"out"}}($pkg,@{$version{$pkg}}); - (!defined $text ? ($file) || () : (a_href("dist/$file",$text))); + (!defined $text ? ($file) || () : (&$a_href_arch("dist/$file",$text))); } @{$pkg{$case}})); print ""; } -- 1.8.3.1