[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.69.2.4, 1.69.2.5 477partVI_census.html, 1.2.2.5, 1.2.2.6

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cust_pkg.cgi 477partVI_census.html 
Log Message:
fix 477 reporting w/multiple classnums, RT#13922

Index: 477partVI_census.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partVI_census.html,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -w -d -r1.2.2.5 -r1.2.2.6
--- 477partVI_census.html	18 Aug 2011 01:23:04 -0000	1.2.2.5
+++ 477partVI_census.html	18 Aug 2011 21:27:49 -0000	1.2.2.6
@@ -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 @@
 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');

Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.69.2.4
retrieving revision 1.69.2.5
diff -u -w -d -r1.69.2.4 -r1.69.2.5
--- cust_pkg.cgi	18 Aug 2011 01:15:45 -0000	1.69.2.4
+++ cust_pkg.cgi	18 Aug 2011 21:27:49 -0000	1.69.2.5
@@ -173,14 +173,15 @@
 }
 
 #arrays
-for (qw( pkgpart classnum )) {
-  $search_hash{$_} = [ $cgi->param($_) ];
+for my $param (qw( pkgpart classnum )) {
+  $search_hash{$param} = [ $cgi->param($param) ];
+    if grep { $_ eq $param } $cgi->param;
 }
 
 #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 );
+    if grep { $_ eq $param } $cgi->param;
 }
 
 my @report_option = $cgi->param('report_option')