[freeside-commits] freeside/httemplate/search 477.html, 1.5, 1.6 477partV.html, 1.2, 1.3 477partVI.html, 1.2, 1.3

[Jeff Finucane,420,,]

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

Modified Files:
	477.html 477partV.html 477partVI.html 
Log Message:
fix urls

Index: 477.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- 477.html	22 May 2010 19:57:52 -0000	1.5
+++ 477.html	5 Jun 2010 05:56:07 -0000	1.6
@@ -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) %>>
 %         }
@@ -57,7 +57,7 @@
 %       if ( $type eq 'xml' ) {
 <<% 'Part_'. uc($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) %>>
@@ -83,7 +83,8 @@
 my $xlsname = '477report';
 my @technology_option = &FS::Report::FCC_477::parse_technology_option($cgi);
 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;
 };

Index: 477partVI.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partVI.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- 477partVI.html	22 May 2010 19:57:52 -0000	1.2
+++ 477partVI.html	5 Jun 2010 05:56:07 -0000	1.3
@@ -47,7 +47,7 @@
                     [ $link, $link_suffix ],
                     [ $link, $link_suffix ],
                   ],
-                  'url' => $opt{url} || $cgi->self_url,
+                  'url'          => $opt{url} || '',
                   'xml_row_element' => 'Datarow',
               )
 %>

Index: 477partV.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/477partV.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- 477partV.html	22 May 2010 19:57:52 -0000	1.2
+++ 477partV.html	5 Jun 2010 05:56:07 -0000	1.3
@@ -9,7 +9,7 @@
                   'xml_elements'      => [ 'zip codes' ],
                   'no_field_elements' => 1,
                   'fields'            => [ 'zip' ],
-                  'url'               => $opt{url} || $cgi->self_url,
+                  'url'               => $opt{url} || '',
 
               )
 %>