X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partVI_census.html;h=b6043539a1e7c746643c10f976576bcb6f844a6d;hb=b55fb5df35587a35be4c347073364c132970a533;hp=dbaaaab611db8372d33486c366cad5b849b2d5ca;hpb=ab71884fcb626cfab8c62fd6d9db485e36495e14;p=freeside.git

diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html
index dbaaaab61..b6043539a 100755
--- a/httemplate/search/477partVI_census.html
+++ b/httemplate/search/477partVI_census.html
@@ -1,6 +1,6 @@
 <% include( 'elements/search.html',
                   'html_init'     => $html_init,
-                  'html_foot'     => $html_foot,,
+                  'html_foot'     => $html_foot,
                   'name'          => 'regions',
                   'query'         => [ @sql_query ],
                   'count_query'   =>  $count_query,
@@ -32,10 +32,10 @@
                     sub { my $row = shift; 
                           my $state = substr($row->censustract, 0, 2);
                           $state_hash{$state}++;
-                          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',
@@ -81,7 +81,8 @@ my %state_pkgcount = ();
 for ( qw(agentnum magic) ) {
   $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
 }
-$search_hash{'classnum'} = [ $cgi->param('classnum') ];
+$search_hash{'classnum'} = [ $cgi->param('classnum') ]
+  if grep { $_ eq 'classnum' } $cgi->param;
 
 my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
   if $cgi->param('part1_column_option');
@@ -143,15 +144,21 @@ my $link = 'cust_pkg.cgi?'. join(';',
 
 my $link_suffix = sub { my $row = shift;
                         my $result = 'censustract='. $row->censustract. ';';
-                        $result .= 'report_option='. @row_option[$row->upload - 1]
-                          if @row_option[$row->upload - 1];
-                        $result .= 'report_option='. @column_option[$row->download - 1]
-                          if @column_option[$row->download - 1];
+                        my @ro = grep $_,
+                          @row_option[$row->upload - 1],
+                          @column_option[$row->download - 2],
+                          @technology_option[$row->technology_code - 1],
+                        ;
+                        $result .= 'report_option='. join(',',@ro) if @ro;
                         $result;
                       };
 
 my $html_foot = sub {
   if (scalar(keys %state_hash) > 1) {
+
+    my $roa = join(',', grep $_, @technology_option);
+    $roa = ";report_option_any=$roa" if $roa;
+    
     '<BR><B>WARNING: multiple states found</B><BR>'.
     '<TABLE BORDER=0>'. #nicer formatting someday
     join('', map { '<TR>'.
@@ -159,7 +166,7 @@ my $html_foot = sub {
                        ( &FS::Report::FCC_477::statenum2state($_) || 'None' ).
                      '</TD>'.
                      '<TD>'.
-                       qq(<A HREF="${link}censustract2=$_">).
+                       qq(<A HREF="${link}censustract2=$_$roa">).
                        $state_pkgcount{$_}. ' packages</A> in '.
                        $state_hash{$_}. ' census tracts'.
                      '</TD>'.