increase maximum distance

[ypp-sc-tools.db-live.git] / yarrg / CommodsWeb.pm

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 37bbfe7dcbcc2d878eb5a2d7016458b616358e35..9a608365d88ffb31f7f6059731770e7ea7aa2f30 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -50,8 +50,9 @@ BEGIN {
     @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 &tr_datarow_s &escerrq
                      &prettyprint_age &meta_prettyprint_age);
     %EXPORT_TAGS = ( );
 
@@ -203,12 +204,36 @@ sub expected_error ($) {
 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_s ($$) {
+    my ($m, $lineno) = @_;
+    $lineno &= 1;
+    if (!printable($m)) {
+       return "<tr class=\"datarow$lineno\">";
+    } else {
+       return "<tr bgcolor=\"".
+              ($lineno ? "#ffffff" : "#e3e3e3" ).
+              "\">";
+    }
+}
+
+sub tr_datarow ($$) {
+    my ($m, $lineno) = @_;
+    $m->print(tr_datarow_s($m, $lineno));
+}
+
+sub escerrq ($) {
+    return '"'.CGI::escapeHTML($_[0]).'"';
+    # Prettier qotes as below are not in HTML 3.2:
+#    return '&#8220;'.CGI::escapeHTML($_[0]).'&#8221;';
+#    return '&#8216;'.CGI::escapeHTML($_[0]).'&#8217;';
+}
+
 package CommodsWeb::ExpectedError;
 
 sub emsg ($) {