fixup 477 XML output
authorjeff <jeff>
Tue, 24 Aug 2010 17:36:47 +0000 (17:36 +0000)
committerjeff <jeff>
Tue, 24 Aug 2010 17:36:47 +0000 (17:36 +0000)
httemplate/search/477.html
httemplate/search/477partIA_detail.html
httemplate/search/477partVI.html [deleted file]
httemplate/search/477partVI_census.html [new file with mode: 0755]
httemplate/search/report_477.html

index 63eab7a..d586406 100755 (executable)
@@ -35,7 +35,7 @@
 %       next unless ( $part{'IIA'} || $part{'IIB'} );
 %     }
 %
-%     if ( $part eq 'VI' ) {
+%     if ( $part eq 'VI_census' ) {
 %       next unless $part{'IA'};
 %     }
 %
 %       }
 %     } else {
 %       if ( $type eq 'xml' ) {
-<<% 'Part_'. uc($part) %>>
+<<% 'Part_'. $part %>>
 %       }
 %       my $url = &{$url_mangler}($part);
 <% include( "477part${part}.html", 'url' => $url ) %>
 %       if ( $type eq 'xml' ) {
-</<% 'Part_'. uc($part) %>>
+</<% 'Part_'. $part %>>
 %       }
 %     }
 %   }
@@ -88,6 +88,6 @@ my $url_mangler = sub {
   $url =~ s/477\./477part$part./;
   $url;
 };
-my @parts = qw( IA IIA IIB IV V VI );
+my @parts = qw( IA IIA IIB IV V VI_census );
 
 </%init>
index 546d56c..d5184e3 100755 (executable)
@@ -60,6 +60,13 @@ my $technology = $FS::Report::FCC_477::technology[$tech_code] || 'unknown';
 my $html_init = "<H2>Part IA $technology breakdown by speeds</H2>";
 my $xml_prefix = 'PartIA_'. chr(65 + $tech_code);
 
+if ($cgi->param('_type') eq 'xml') {
+  #rotate data pi/2
+  my @temp = @column_option;
+  @column_option = @row_option;
+  @row_option = @temp;
+}
+
 my $query = 'SELECT '. join(' UNION ALL SELECT ',@row_option);
 my $count_query = 'SELECT '. scalar(@row_option);
 
@@ -102,24 +109,33 @@ my @fields = (
  );
 shift @fields if $cgi->param('_type') eq 'xml';
 
+my $rowchar = 102; # 'f' -- rows are columns! (pi/2)
+my $opentag = 0;
 my $xml_element = sub {
   my ($rowref, $column) = (shift, shift);
-  my $row = $rowref->[0];
+  my $row = chr($rowchar);
+
+  if ($column == 8) {
+    $opentag++;
+    if ($opentag > 1) { # a new row
+      $rowchar++;
+      $opentag = 0;
+    }
+  }
 
-  $row++;
-  $xml_prefix. $column. $row;
+  $xml_prefix. $row. $column;
 
 };
 
 my @xml_elements = (
-  sub { &{$xml_element}(shift, 'f') },
-  sub { &{$xml_element}(shift, 'g') },
-  sub { &{$xml_element}(shift, 'h') },
-  sub { &{$xml_element}(shift, 'i') },
-  sub { &{$xml_element}(shift, 'j') },
-  sub { &{$xml_element}(shift, 'k') },
-  sub { &{$xml_element}(shift, 'l') },
-  sub { &{$xml_element}(shift, 'm') },
+  sub { &{$xml_element}(shift, '1') },
+  sub { &{$xml_element}(shift, '2') },
+  sub { &{$xml_element}(shift, '3') },
+  sub { &{$xml_element}(shift, '4') },
+  sub { &{$xml_element}(shift, '5') },
+  sub { &{$xml_element}(shift, '6') },
+  sub { &{$xml_element}(shift, '7') },
+  sub { &{$xml_element}(shift, '8') },
 );
 
 </%init>
diff --git a/httemplate/search/477partVI.html b/httemplate/search/477partVI.html
deleted file mode 100755 (executable)
index db572bc..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-<% include( 'elements/search.html',
-                  'html_init'     => $html_init,
-                  'name'          => 'regions',
-                  'query'         => [ @sql_query ],
-                  'count_query'   =>  $count_query,
-                  'order_by'      => 'ORDER BY censustract',
-                  'avoid_quote'   => 1,
-                  'no_csv_header' => 1,
-                  'nohtmlheader'  => 1,
-                  'header'        => [
-                                       'County code',
-                                       'Census tract code',
-                                       'Upload rate',
-                                       'Download rate',
-                                       'Technology code',
-                                       'Technology code other',
-                                       'Quantity',
-                                       'Percentage residential',
-                                     ],
-                  'xml_elements'  => [
-                                       'county_fips',
-                                       'census_tract',
-                                       'upload_rate_code',
-                                       'download_rate_code',
-                                       'technology_code',
-                                       'technology_code_other',
-                                       'value',
-                                       'percentage',
-                                     ],
-                  'fields'        => [
-                    sub { my $row = shift; substr($row->censustract, 2, 3) },
-                    sub { my $row = shift; substr($row->censustract, 5) },
-                    'upload',
-                    'download',
-                    'technology_code',
-                    sub { '' },  # doesn't really work
-                    'quantity',
-                    sub { my $row = shift; sprintf "%.2f", $row->residential },
-                  ],
-                  'links'        => [
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                    [ $link, $link_suffix ],
-                  ],
-                  'url'          => $opt{url} || '',
-                  'xml_row_element' => 'Datarow',
-              )
-%>
-<%init>
-
-my $curuser = $FS::CurrentUser::CurrentUser;
-
-die "access denied"
-  unless $curuser->access_right('List packages');
-
-my %opt = @_;
-
-my $html_init = '<H2>Part VI</H2>';
-
-my %search_hash = ();
-my @sql_query = ();
-  
-for ( qw(agentnum magic classnum) ) {
-  $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
-}
-
-my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
-  if $cgi->param('part1_column_option');
-
-my @row_option = grep { /^\d+$/ } $cgi->param('part1_row_option')
-  if $cgi->param('part1_row_option');
-
-my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
-
-my $rowcount = 1;
-foreach my $row ( @row_option ) {
-  my $columncount = 2;
-  foreach my $column ( @column_option ) {
-    my $tech_code = 0;
-    foreach my $technology ( @technology_option ) {
-      $tech_code++;
-      next unless $technology;
-      my @report_option = ();
-      push @report_option, $row if $row;
-      push @report_option, $column if $column;
-      push @report_option, $technology;
-      my $report_option = join(',', @report_option) if @report_option;
-      my $sql_query = FS::cust_pkg->search(
-        { %search_hash,
-          ($report_option ? ( 'report_option' => $report_option ) : () ),
-        }
-      );
-      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";
-      push @sql_query, $sql_query;
-    }
-    $columncount++;
-  }
-  $rowcount++;
-}
-
-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';
-
-my $link = 'cust_pkg.cgi?'.
-           join(';', map{ "$_=". $search_hash{$_} } keys %search_hash). ';';
-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];
-                        $result;
-                      };
-</%init>
diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html
new file mode 100755 (executable)
index 0000000..db572bc
--- /dev/null
@@ -0,0 +1,130 @@
+<% include( 'elements/search.html',
+                  'html_init'     => $html_init,
+                  'name'          => 'regions',
+                  'query'         => [ @sql_query ],
+                  'count_query'   =>  $count_query,
+                  'order_by'      => 'ORDER BY censustract',
+                  'avoid_quote'   => 1,
+                  'no_csv_header' => 1,
+                  'nohtmlheader'  => 1,
+                  'header'        => [
+                                       'County code',
+                                       'Census tract code',
+                                       'Upload rate',
+                                       'Download rate',
+                                       'Technology code',
+                                       'Technology code other',
+                                       'Quantity',
+                                       'Percentage residential',
+                                     ],
+                  'xml_elements'  => [
+                                       'county_fips',
+                                       'census_tract',
+                                       'upload_rate_code',
+                                       'download_rate_code',
+                                       'technology_code',
+                                       'technology_code_other',
+                                       'value',
+                                       'percentage',
+                                     ],
+                  'fields'        => [
+                    sub { my $row = shift; substr($row->censustract, 2, 3) },
+                    sub { my $row = shift; substr($row->censustract, 5) },
+                    'upload',
+                    'download',
+                    'technology_code',
+                    sub { '' },  # doesn't really work
+                    'quantity',
+                    sub { my $row = shift; sprintf "%.2f", $row->residential },
+                  ],
+                  'links'        => [
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                    [ $link, $link_suffix ],
+                  ],
+                  'url'          => $opt{url} || '',
+                  'xml_row_element' => 'Datarow',
+              )
+%>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('List packages');
+
+my %opt = @_;
+
+my $html_init = '<H2>Part VI</H2>';
+
+my %search_hash = ();
+my @sql_query = ();
+  
+for ( qw(agentnum magic classnum) ) {
+  $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+}
+
+my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option')
+  if $cgi->param('part1_column_option');
+
+my @row_option = grep { /^\d+$/ } $cgi->param('part1_row_option')
+  if $cgi->param('part1_row_option');
+
+my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
+
+my $rowcount = 1;
+foreach my $row ( @row_option ) {
+  my $columncount = 2;
+  foreach my $column ( @column_option ) {
+    my $tech_code = 0;
+    foreach my $technology ( @technology_option ) {
+      $tech_code++;
+      next unless $technology;
+      my @report_option = ();
+      push @report_option, $row if $row;
+      push @report_option, $column if $column;
+      push @report_option, $technology;
+      my $report_option = join(',', @report_option) if @report_option;
+      my $sql_query = FS::cust_pkg->search(
+        { %search_hash,
+          ($report_option ? ( 'report_option' => $report_option ) : () ),
+        }
+      );
+      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";
+      push @sql_query, $sql_query;
+    }
+    $columncount++;
+  }
+  $rowcount++;
+}
+
+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';
+
+my $link = 'cust_pkg.cgi?'.
+           join(';', map{ "$_=". $search_hash{$_} } keys %search_hash). ';';
+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];
+                        $result;
+                      };
+</%init>
index 206d490..c6d63db 100755 (executable)
     <% include( '/elements/tr-checkbox.html',
                    'label' => 'Enable part VI?',
                    'field' => 'part',
-                   'value' => 'VI',
+                   'value' => 'VI_census',
                )
     %>