X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477.html;h=250e71811407138503fd330d15c2814a09d13f61;hb=8dba5cb96454bf8ec81333ebac381180731396f1;hp=bd7fb2d8b07736575ee5091c1ab7148b1b671fa4;hpb=4ef5b3b917b7802a136551ad567dc9d649700f53;p=freeside.git

diff --git a/httemplate/search/477.html b/httemplate/search/477.html
index bd7fb2d8b..250e71811 100755
--- a/httemplate/search/477.html
+++ b/httemplate/search/477.html
@@ -35,7 +35,7 @@
 %       next unless ( $part{'IIA'} || $part{'IIB'} );
 %     }
 %
-%     if ( $part eq 'VI' ) {
+%     if ( $part eq 'VI_census' ) {
 %       next unless $part{'IA'};
 %     }
 %
@@ -43,7 +43,7 @@
 %     if ( $part eq 'IA' ) {
 %       for ( my $tech = 0; $tech < scalar(@technology_option); $tech++ ) {
 %         next unless $technology_option[$tech];
-%         my $url = &{$url_mangler}($cgi->self_url, $part);
+%         my $url = &{$url_mangler}($part);
 %         if ( $type eq 'xml' ) {
 <<% 'Part_IA_'. chr(65 + $tech) %>>
 %         }
@@ -55,12 +55,12 @@
 %       }
 %     } else {
 %       if ( $type eq 'xml' ) {
-<<% 'Part_'. uc($part) %>>
+<<% 'Part_'. $part %>>
 %       }
-%       my $url = &{$url_mangler}($cgi->self_url, $part);
+%       my $url = &{$url_mangler}($part);
 <% include( "477part${part}.html", 'url' => $url ) %>
 %       if ( $type eq 'xml' ) {
-</<% 'Part_'. uc($part) %>>
+</<% 'Part_'. $part %>>
 %       }
 %     }
 %   }
@@ -81,12 +81,34 @@ die "access denied"
 my %part = map { $_ => 1 } grep { /^\w+$/ } $cgi->param('part');
 my $type = $cgi->param('_type') || 'html';
 my $xlsname = '477report';
-my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
+my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi,1);
+
+# save upload and download mappings
+my @download = $cgi->param('part1_column_option');
+my @upload = $cgi->param('part1_row_option');
+for(my $i=0; $i < scalar(@download); $i++) {
+    &FS::Report::FCC_477::save_fcc477map("part1_column_option_$i",$download[$i]);
+}
+for(my $i=0; $i < scalar(@upload); $i++) {
+    &FS::Report::FCC_477::save_fcc477map("part1_row_option_$i",$upload[$i]);
+}
+
+my @part2a_row_option = $cgi->param('part2a_row_option');
+for(my $i=0; $i < scalar(@part2a_row_option); $i++) {
+    &FS::Report::FCC_477::save_fcc477map("part2a_row_option_$i",$part2a_row_option[$i]);
+}
+
+my @part2b_row_option = $cgi->param('part2b_row_option');
+for(my $i=0; $i < scalar(@part2b_row_option); $i++) {
+    &FS::Report::FCC_477::save_fcc477map("part2b_row_option_$i",$part2b_row_option[$i]);
+}
+
 my $url_mangler = sub {
-  my ($url, $part) = (shift, shift);
+  my $part = shift;
+  my $url = $cgi->url('-path_info' => 1, '-full' => 1);
   $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>