X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partV.html;h=1d21649f56e9f0eee723e52bea3fa333e8e77cb3;hb=d8299144d2175f1695adafe29e9549bd9b158e2f;hp=c6ceac4db6fde8bd66c5111007b4e3603ab5e022;hpb=4ef5b3b917b7802a136551ad567dc9d649700f53;p=freeside.git

diff --git a/httemplate/search/477partV.html b/httemplate/search/477partV.html
index c6ceac4db..1d21649f5 100755
--- a/httemplate/search/477partV.html
+++ b/httemplate/search/477partV.html
@@ -9,7 +9,7 @@
                   'xml_elements'      => [ 'zip codes' ],
                   'no_field_elements' => 1,
                   'fields'            => [ 'zip' ],
-                  'url'               => $opt{url} || $cgi->self_url,
+                  'url'               => $opt{url} || '',
 
               )
 %>
@@ -26,27 +26,30 @@ my %search_hash = ();
 my @sql_query = ();
 my @count_query = ();
   
-for ( qw(agentnum magic classnum) ) {
+for ( qw(agentnum magic) ) {
   $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
 }
+$search_hash{'classnum'} = [ $cgi->param('classnum') ];
+$search_hash{report_option} = $cgi->param('partv_report_option')
+  if $cgi->param('partv_report_option');
 
 my $sql_query = FS::cust_pkg->search( { %search_hash, 'fcc_line' > 1 });
-$sql_query->{select} = 'DISTINCT zip';
+$sql_query->{select} = 'DISTINCT substr(zip,1,5) as zip';
 $sql_query->{extra_sql} =~ s/ORDER BY [.\w]+//;
 push @sql_query, $sql_query;
 push @count_query, delete($sql_query->{'count_query'});
-$count_query[0] =~ s/count\(\*\)/count(DISTINCT zip)/;
+$count_query[0] =~ s/COUNT\(\*\)/count(DISTINCT substr(zip,1,5))/;
 $count_query[0] =~ s/ORDER BY [.\w]+//;
 
-$search_hash{classnum} = $cgi->param('part2a_classnum')
-  if $cgi->param('part2a_classnum');
+$search_hash{report_option} = $cgi->param('partv_report_option')
+  if $cgi->param('partv_report_option');
 
 $sql_query = FS::cust_pkg->search( { %search_hash } );
-$sql_query->{select} = 'DISTINCT zip';
+$sql_query->{select} = 'DISTINCT substr(zip,1,5) as zip';
 $sql_query->{extra_sql} =~ s/ORDER BY [.\w]+//;
 push @sql_query, $sql_query;
 push @count_query, delete($sql_query->{'count_query'});
-$count_query[1] =~ s/count\(\*\)/count(DISTINCT zip)/;
+$count_query[1] =~ s/COUNT\(\*\)/count(DISTINCT substr(zip,1,5))/;
 $count_query[1] =~ s/ORDER BY [.\w]+//;
 my $count_query = join(' UNION ', @count_query);