diff --git a/sw/lib/perl/Paparazzi/AircraftsManager.pm b/sw/lib/perl/Paparazzi/AircraftsManager.pm index fcb66f5b79..f4d439985d 100644 --- a/sw/lib/perl/Paparazzi/AircraftsManager.pm +++ b/sw/lib/perl/Paparazzi/AircraftsManager.pm @@ -32,7 +32,6 @@ use Paparazzi::Aircraft; use Paparazzi::Flightplan; use Paparazzi::Airframe; -use LWP::Simple; sub populate { @@ -101,9 +100,6 @@ sub on_config { my $fp_url = $fields->{flight_plan}; if (defined $fp_url) { # print "in AircraftsManager : on_config creating new flight plan\n"; - my $doc = LWP::Simple::get $fp_url; - print "##### $doc\n"; - my $fp = Paparazzi::Flightplan->new(-url => $fp_url); # use Data::Dumper; # print "##### waypoints\n".Dumper($fp->get('-waypoints')); diff --git a/sw/lib/perl/Paparazzi/Flightplan.pm b/sw/lib/perl/Paparazzi/Flightplan.pm index 41eec5a649..e69e6ec3e4 100644 --- a/sw/lib/perl/Paparazzi/Flightplan.pm +++ b/sw/lib/perl/Paparazzi/Flightplan.pm @@ -27,6 +27,7 @@ use Subject; @ISA = ("Subject"); use strict; +use LWP::Simple; use XML::DOM; use Math::Trig; require File::Basename; @@ -80,15 +81,10 @@ sub completeinit { $self->SUPER::completeinit(); my $parser = XML::DOM::Parser->new(); my $flight_plan_url = $self->get('-url'); - $flight_plan_url =~ /file:\/\/(.*)/; - my $flight_plan = $1; - my $paparazzi_src = Paparazzi::Environment::paparazzi_src(); - my $gfp_bin = ((defined $paparazzi_src) ? $paparazzi_src."/sw/tools" : "/usr/share/paparazzi/bin") ."/gen_flight_plan.out"; - my $flight_plan_xml = `$gfp_bin -dump $flight_plan`; - + my $flight_plan_xml = LWP::Simple::get $fp_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";