[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.69.2.3, 1.69.2.4 477partVI_census.html, 1.2.2.3, 1.2.2.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv22041/httemplate/search

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_pkg.cgi 477partVI_census.html 
Log Message:
multiple state links in FCC report, RT#13922

Index: 477partVI_census.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partVI_census.html,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -w -d -r1.2.2.3 -r1.2.2.4
--- 477partVI_census.html	17 Aug 2011 21:39:24 -0000	1.2.2.3
+++ 477partVI_census.html	18 Aug 2011 01:15:45 -0000	1.2.2.4
@@ -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 @@
     '<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

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.69.2.3
retrieving revision 1.69.2.4
diff -u -w -d -r1.69.2.3 -r1.69.2.4
--- cust_pkg.cgi	18 Aug 2011 00:33:40 -0000	1.69.2.3
+++ cust_pkg.cgi	18 Aug 2011 01:15:45 -0000	1.69.2.4
@@ -177,7 +177,8 @@
   $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 );
 }