my $extracolumns = "$rowcount AS upload, $columncount AS download, $tech_code as technology_code";
my $percent = "CASE WHEN count(*) > 0 THEN 100-100*cast(count(cust_main.company) as numeric)/cast(count(*) as numeric) ELSE cast(0 as numeric) END AS residential";
$sql_query->{select} = "count(*) AS quantity, $extracolumns, censustract, $percent";
- $sql_query->{extra_sql} =~ /^(.*)(ORDER BY pkgnum)(.*)$/s
- or die "couldn't parse extra_sql";
- $sql_query->{extra_sql} = "$1 GROUP BY censustract $3";
+ $sql_query->{order_by} =~ /^(.*)(ORDER BY pkgnum)(.*)$/s
+ or die "couldn't parse order_by";
+ $sql_query->{order_by} = "$1 GROUP BY censustract $3";
push @sql_query, $sql_query;
}
$columncount++;
my $count_query = 'SELECT count(*) FROM ( ('.
join( ') UNION ALL (',
- map { my $extra = $_->{extra_sql}; my $addl = $_->{addl_from};
- "SELECT censustract from cust_pkg $addl $extra";
- }
- @sql_query
- ). ') ) AS foo';
+ map { my $addl_from = $_->{addl_from};
+ my $extra_sql = $_->{extra_sql};
+ my $order_by = $_->{order_by};
+ "SELECT censustract from cust_pkg $addl_from $extra_sql $order_by";
+ }
+ @sql_query
+ ). ') ) AS foo';
my $link = 'cust_pkg.cgi?'. join(';',
map { my $key = $_;