*** empty log message ***

This commit is contained in:
Antoine Drouin
2006-02-08 19:40:18 +00:00
parent d727ea603e
commit cb0dcd832c
2 changed files with 55 additions and 75 deletions
+38 -58
View File
@@ -2,76 +2,56 @@
# displays the current configuration # displays the current configuration
use CGI ':standard';
my $paparazzi_lib;
BEGIN {
# $paparazzi_lib = (defined $ENV{PAPARAZZI_SRC}) ?
# $ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
$paparazzi_lib = "/home/poine/work/paparazzi_savannah/paparazzi3/sw/lib/perl";
}
use lib ($paparazzi_lib);
use strict; use strict;
use warnings; use warnings;
use Cwd;
use CGI ':standard', '*table';
my $paparazzi_src;
my $paparazzi_lib;
BEGIN {
$paparazzi_src = getcwd()."/../..";
$paparazzi_lib = $paparazzi_src."/sw/lib/perl";
}
use lib ($paparazzi_lib);
my $paparazzi_home = $paparazzi_src;
use Paparazzi::Environment; use Paparazzi::Environment;
Paparazzi::Environment::set_env("/home/poine/work/paparazzi_savannah/paparazzi3", Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home);
"/home/poine/work/paparazzi_savannah/paparazzi3");
use Paparazzi::Configuration; use Paparazzi::Configuration;
print CGI::header;
CGI::start_html("Paparazzi configuration"); print
header(),
start_html("Paparazzi configuration");
my $configuration = Paparazzi::Configuration::read_current(); my $configuration = Paparazzi::Configuration::read_current();
print
print "\n<H1> Paparazzi Configuration.</H1>\n"; h1 ("Paparazzi Configuration"),
print "<H2> Aircrafts.</H2>\n"; h2 ("Aircrafts");
print "<TABLE CELLSPACING=4>\n"; print
print_table_header(["Id", "Name", "Airframe", "Radio", "Flight plan"]); start_table({border => undef}),
Tr(th(["Id", "Name", "Airframe", "Radio", "Flight plan"]));
foreach my $ac (@{$configuration->{aircrafts}}) { foreach my $ac (@{$configuration->{aircrafts}}) {
print " <TR>\n"; print
print " <TD>"; Tr(td([$ac->{ac_id}, $ac->{name},
print "$ac->{ac_id}"; a({href=>"../conf/$ac->{airframe}"}, foo($ac->{airframe}) ),
print "</TD>\n"; a({href=>"../conf/$ac->{radio}"}, foo($ac->{radio}) ),
print " <TD>"; a({href=>"../conf/$ac->{flight_plan}"}, foo($ac->{flight_plan}) )]));
print "$ac->{name}";
print "</TD>\n";
print " <TD>";
print_link("../conf/".$ac->{airframe}, foo($ac->{airframe}));
print "</TD>\n";
print " <TD>";
print_link("../conf/".$ac->{radio}, foo($ac->{radio}));
print "</TD>\n";
print " <TD>";
print_link("../conf/".$ac->{flight_plan}, foo($ac->{flight_plan}));
print "</TD>\n";
print " </TR>\n";
} }
print "</TABLE>\n"; print end_table();
print "<H2> Ground.</H2>\n";
print "<li>name : ".$configuration->{ground}->{name}."</li>\n"; print
print "<li>ivy bus : ".$configuration->{ground}->{ivy_bus}."</li>\n"; h2 ("Ground"),
print "<HR>\n"; ul(li (["name : ".$configuration->{ground}->{name},
print "<a href=\"../index.html\">home</a><BR>\n"; "ivy bus : ".$configuration->{ground}->{ivy_bus}
print "<HR>\n"; ])),
print "<ADDRESS>Poine.</ADDRESS><BR>\n"; hr(),
a({href=>"../index.html"}, "home"),
end_html();
sub print_table_header {
my ($headers) = @_;
print " <TR>\n";
foreach (@{$headers}) {
print " <TH>$_</TH>\n";
}
print " </TR>\n";
}
sub foo { sub foo {
return ($_[0] =~ /([^\/]*)$/ ); return ($_[0] =~ /([^\/]*)$/ );
} }
sub print_link {
my ($link, $text) = @_;
print "<a href=\"$link\">$text</a>";
}
+17 -17
View File
@@ -2,30 +2,29 @@
# displays available logs # displays available logs
use CGI::Form;
my $paparazzi_lib;
BEGIN {
# $paparazzi_lib = (defined $ENV{PAPARAZZI_SRC}) ?
# $ENV{PAPARAZZI_SRC}."/sw/lib/perl" : "/usr/lib/paparazzi/";
$paparazzi_lib = "/home/poine/work/paparazzi_savannah/paparazzi3/sw/lib/perl";
}
use lib ($paparazzi_lib);
use strict; use strict;
use warnings; use warnings;
use Cwd;
use CGI ":standard";
my $paparazzi_src;
my $paparazzi_lib;
BEGIN {
$paparazzi_src = getcwd()."/../..";
$paparazzi_lib = $paparazzi_src."/sw/lib/perl";
}
use lib ($paparazzi_lib);
my $paparazzi_home = $paparazzi_src;
use Paparazzi::Environment; use Paparazzi::Environment;
Paparazzi::Environment::set_env("/home/poine/work/paparazzi_savannah/paparazzi3", Paparazzi::Environment::set_env($paparazzi_src, $paparazzi_home);
"/home/poine/work/paparazzi_savannah/paparazzi3");
use Paparazzi::Log; use Paparazzi::Log;
my $query = new CGI::Form(); my $query = new CGI();
print $query->header(); print $query->header();
print $query->start_html("Paparazzi Logs"); print $query->start_html("Paparazzi Logs");
#my $configuration = Paparazzi::Configuration::read_current();
my @logs = Paparazzi::Log::get_available(); my @logs = Paparazzi::Log::get_available();
my $log_info = undef; my $log_info = undef;
@@ -43,9 +42,10 @@ print $query->popup_menu('file', \@logs, $logs[0]);
print $query->submit('Action','Update'); print $query->submit('Action','Update');
print $query->endform(); print $query->endform();
if (defined $log_info) { if (defined $log_info) {
print $query->path_info()."<br>";
Paparazzi::Log::html_print_summary($log_info, $log_data); Paparazzi::Log::html_print_summary($log_info, $log_data);
my $url = Paparazzi::Log::gen_activity_plot($log_info, $log_data); # my $url = Paparazzi::Log::gen_activity_plot($log_info, $log_data);
print"<img src=\"$url\">\n"; # print"<img src=\"$url\">\n";
} }
print "<HR>\n"; print "<HR>\n";
print "<a href=\"../index.html\">home</a><BR>\n"; print "<a href=\"../index.html\">home</a><BR>\n";