diff options
| author | ivan <ivan> | 2011-08-18 01:15:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-08-18 01:15:41 +0000 |
| commit | 150756fc304002a15fee61d622c230494f814ba6 (patch) | |
| tree | f43d1782f9a755f5e82cc2f66d0fac4b78bad6c8 /httemplate | |
| parent | 11b383e074fe5f30d78ac842181c413160b13056 (diff) | |
multiple state links in FCC report, RT#13922
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/search/477partVI_census.html | 14 | ||||
| -rwxr-xr-x | httemplate/search/cust_pkg.cgi | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html index 53b6db062..fc260bef8 100755 --- a/httemplate/search/477partVI_census.html +++ b/httemplate/search/477partVI_census.html @@ -31,10 +31,10 @@ 'fields' => [ sub { my $row = shift; $state_hash{substr($row->censustract, 0, 2)}++; - substr($row->censustract, 2, 3) || 'none' + substr($row->censustract, 2, 3) || 'None' }, sub { my $row = shift; - substr($row->censustract, 5) || 'none' + substr($row->censustract, 5) || 'None' }, 'upload', 'download', @@ -149,9 +149,13 @@ my $html_foot = sub { '<BR><B>WARNING: multiple states found</B><BR>'. '<TABLE BORDER=0>'. #nicer formatting someday join('', map { '<TR>'. - "<TD>$_</TD>". - qq(<TD><A HREF="${link}state=$_">). - $state_hash{$_}. '</A></TD>'. + '<TD>'. + ( &FS::Report::FCC_477::statenum2state($_) || 'None' ). + '</TD>'. + '<TD>'. + qq(<A HREF="${link}censustract2=$_">). + $state_hash{$_}. ' census tracts</A>'. + '</TD>'. '</TR>'; } keys %state_hash diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index d48ba1916..09b52d76b 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -154,7 +154,8 @@ for (qw( pkgpart classnum )) { $search_hash{$_} = [ $cgi->param($_) ]; } -for my $param ( qw(censustract) ) { +#scalars that need to be passed if empty +for my $param (qw(censustract censustract2 )) { $search_hash{$param} = $cgi->param($param) || '' if ( grep { /$param/ } $cgi->param ); } |