diff --git a/conf/control_panel.xml b/conf/control_panel.xml index d64e7ba95f..d5a3e7e0b9 100644 --- a/conf/control_panel.xml +++ b/conf/control_panel.xml @@ -98,6 +98,11 @@ + + + + + diff --git a/sw/lib/perl/Paparazzi/Airframe.pm b/sw/lib/perl/Paparazzi/Airframe.pm index caf0894bba..78180793e9 100644 --- a/sw/lib/perl/Paparazzi/Airframe.pm +++ b/sw/lib/perl/Paparazzi/Airframe.pm @@ -5,6 +5,7 @@ use Subject; use strict; use XML::DOM; +require LWP::Simple; sub populate { my ($self, $args) = @_; @@ -19,16 +20,15 @@ sub completeinit { my $self = shift; $self->SUPER::completeinit(); my $airframe_url = $self->get('-url'); - $airframe_url =~ /file:\/\/(.*)/; - my $filename = $1; - $self->parse_airframe($filename); + my $airframe_xml = LWP::Simple::get($airframe_url); + $self->parse_airframe($airframe_xml); } sub parse_airframe { - my ($self, $filename) = @_; + my ($self, $airframe_xml) = @_; my $parser = XML::DOM::Parser->new(); - my $doc = $parser->parsefile($filename); + my $doc = $parser->parse($airframe_xml); my $airframe = $doc->getElementsByTagName('airframe')->[0]; $self->configure( -name => $airframe->getAttribute('name')); } diff --git a/sw/lib/perl/Paparazzi/Flightplan.pm b/sw/lib/perl/Paparazzi/Flightplan.pm index e69e6ec3e4..5ecb320695 100644 --- a/sw/lib/perl/Paparazzi/Flightplan.pm +++ b/sw/lib/perl/Paparazzi/Flightplan.pm @@ -27,7 +27,7 @@ use Subject; @ISA = ("Subject"); use strict; -use LWP::Simple; +require LWP::Simple; use XML::DOM; use Math::Trig; require File::Basename; @@ -81,10 +81,14 @@ sub completeinit { $self->SUPER::completeinit(); my $parser = XML::DOM::Parser->new(); my $flight_plan_url = $self->get('-url'); - my $flight_plan_xml = LWP::Simple::get $fp_url; + +# print "###### flight_plan_url $flight_plan_url\n"; + +# my $flight_plan_xml =""; + my $flight_plan_xml = LWP::Simple::get($flight_plan_url); $self->configure( -compiled_xml => $flight_plan_xml); - print "#######flight_plan_xml\n".$flight_plan_xml; +# print "#######flight_plan_xml\n".$flight_plan_xml; my $doc = $parser->parse($flight_plan_xml); # print "in Flightplan : parsing $file $doc \n";