Properly quote various error messages

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

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 0f3f43df8fd236975a57ef5310cccdbf4f14b25f..461a8ad49332da3d232121822012e0002ecb00dc 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -52,6 +52,7 @@ BEGIN {
                      &to_json_shim &to_json_protecttags
                      &set_ctype_utf8 &webdatadir
                      &expected_error &dbw_lookup_string
                      &to_json_shim &to_json_protecttags
                      &set_ctype_utf8 &webdatadir
                      &expected_error &dbw_lookup_string

+                     &printable &tr_datarow &escerrq

                      &prettyprint_age &meta_prettyprint_age);
     %EXPORT_TAGS = ( );
 
                      &prettyprint_age &meta_prettyprint_age);
     %EXPORT_TAGS = ( );
 


@@ -200,6 +201,32 @@ sub expected_error ($) {
     die $r;
 }
 
     die $r;
 }
 

+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 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" ).
+                 "\">");
+    }
+}
+
+sub escerrq ($) {
+    return '&#8220;'.CGI::escapeHTML($_[0]).'&#8221;';
+#    return '&#8216;'.CGI::escapeHTML($_[0]).'&#8217;';
+}
+

 package CommodsWeb::ExpectedError;
 
 sub emsg ($) {
 package CommodsWeb::ExpectedError;
 
 sub emsg ($) {