--- loncom/cgi/plot.gif 2002/03/01 14:03:50 1.9 +++ loncom/cgi/plot.gif 2020/02/19 18:53:17 1.17 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# $Id: plot.gif,v 1.9 2002/03/01 14:03:50 matthew Exp $ +# $Id: plot.gif,v 1.17 2020/02/19 18:53:17 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,26 +37,47 @@ foreach (split/&/,$ENV{'QUERY_STRING'}) my $filename = $data{'file'}; # unescape filename $filename =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; - die if ($filename =~ /\// || $filename !~ /_plot.data$/); $filename = $tmpdir . $filename; die "$data{'file'} does not exist\n" if (! -e $filename); my $output = $data{'output'}; -if ($output eq 'gif') { - open PLOT, "gnuplot $filename |"; - print <<"END"; -Content-type: image/gif +if ($output eq '') { + $output = (split('\.',$0))[-1]; +} + +if ($output eq 'gif' || $output eq 'png') { + if (open(my $plot, "export LANG='en_US.UTF-8'; gnuplot $filename |")) { + + print <<"END"; +Content-type: image/$output END - while ($_=) { - print; + while (my $line = <$plot>) { + print($line); + } + close($plot); + } else { + die "failed to open pipe to run gnuplot\n"; } + } elsif ($output eq 'eps') { - system ("gnuplot $filename"); + print <<"END"; +Content-type: text/html + +eps plot creation + +

Creating eps plot

+ +END + if (! system ("export LANG='en_US.UTF-8'; gnuplot $filename")) { + print "

An error occurred.

\n". + "I am not going to tell you about it as I have not bothered ". + "to figure out how to get you the error text.\n"; + } else { + print "

EPS file generated successfully.

\n"; + } + print "\n"; } else { die "output $output is not a recognized value or has no value\n"; } - - -