@ISA = qw(Exporter);
@EXPORT = qw(&dbw_connect &dbw_filename &ocean_list &sourcebasedir
&to_json_shim &to_json_protecttags
- &set_ctype_utf8 &webdatadir &printable
+ &set_ctype_utf8 &webdatadir
&expected_error &dbw_lookup_string
+ &printable &tr_datarow
&prettyprint_age &meta_prettyprint_age);
%EXPORT_TAGS = ( );
sub printable ($) { # printable($m) where $m is the Mason request object
my ($m) = @_;
my $a= scalar $m->caller_args(-1);
- foreach my $t (qw(pdf ps html)) {
+ foreach my $t (qw(pdf ps html pdf2 ps2)) {
return $t if $a->{"printable_$t"};
}
return 0;
}
+sub tr_datarow ($$) {
+ my ($m, $lineno) = @_;
+ $lineno &= 1;
+ if (!printable($m)) {
+ $m->print("<tr class=\"datarow$lineno\">");
+ } else {
+ $m->print("<tr bgcolor=\"".
+ ($lineno ? "#ffffff" : "#e3e3e3" ).
+ "\">");
+ }
+}
+
package CommodsWeb::ExpectedError;
sub emsg ($) {
use CommodsWeb;
my $printable= printable($m);
-if ($printable eq 'pdf' || $printable eq 'ps') {
+if ($printable =~ m/^pdf|^ps/) {
my $output;
my $got= $m->call_self(\$output);
if ($got) {
+ my @htargs= qw(htmldoc --continuous --gray --size 210x279mm);
+ $printable =~ m/^[a-z]+/;
+ push @htargs, '-t',$&;
+ if ($printable =~ m/2$/) {
+ push @htargs, qw(--nup 2);
+ }
+ push @htargs, qw(-);
+
my $tmpfile= IO::File::new_tmpfile();
print $tmpfile $output or die $!;
$tmpfile->flush() or die $!;
eval {
$ENV{'HTMLDOC_NOCGI'}=1;
open STDIN, '<&', $tmpfile or die $!;
- exec qw(htmldoc -t),$printable,qw(
- --continuous --gray --size 210x279mm -);
+
+ exec @htargs;
die $!;
};
print STDERR "HTMLDOC FAILURE $@";
<input type=submit name=printable_pdf value="PDF">
<input type=submit name=printable_html value="HTML">
<input type=submit name=printable_ps value="PostScript">
+ <input type=submit name=printable_pdf2 value="PDF 2-up">
+ <input type=submit name=printable_ps2 value="PostScript 2-up">
</ul>
% }
<li><a href="#dataage">Data age summary</a>
<h2><a name="plan">Voyage trading plan</a></h2>
<table rules=groups>
+% my $tbody= sub {
+% if (!printable($m)) { return '<tbody>'; }
+%# return "<tr><td colspan=7><hr>";
+% my ($c)= qw(40 00)[$_[0]];
+% return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+% };
+%
% foreach my $i (0..$#islandids) {
-<tbody>
+<% $tbody->(1) %>
<tr><td colspan=4>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
% } elsif (!defined $total) {
% $total= 0;
-<tbody>
+<% $tbody->(0) %>
% }
% $total += $t->{Total};
% my $span= 0 + keys %{ $t->{Stalls} };
% my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
<<% $td %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
%
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
% $pstall->($stallix);
% }
%
$show_total_now->($totals);
}
</%perl><a name="summary"></a>
-<tbody><tr>
+<% $tbody->(1) %><tr>
<td colspan=2>Total distance: <% $total_dist %> leagues.
<td colspan=3 align=right>Overall net cash flow
<td align=right><strong><%