From 73151ca1d9544ba88e00040ea1ba054b6952ac07 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Thu, 6 Aug 2020 13:54:59 +0200 Subject: smtk2ssrf Perl script: Add some error reporting So far, if the conversion process failed, we simply returned an empty file. Now, we report that something's wrong. Signed-off-by: Robert C. Helling --- scripts/smtk2ssrf.pl | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/smtk2ssrf.pl b/scripts/smtk2ssrf.pl index 5367400ce..ae10b6ee0 100755 --- a/scripts/smtk2ssrf.pl +++ b/scripts/smtk2ssrf.pl @@ -2,21 +2,32 @@ use CGI; +$CGI::POST_MAX = 1024 * 1024 * 10; + # Change this to the correct path to binary. my $smtk2ssrf = "../build/smtk2ssrf"; +my $logfile = '/tmp/smtk2ssrf.log'; my $q = CGI->new; if ($q->upload("uploaded_file")) { my $original_filename = $q->param("uploaded_file"); + my $converted = `$smtk2ssrf $tmp_filename -`; my $tmp_filename = $q->tmpFileName($original_filename); my $new_filename = $original_filename; $new_filename =~ s/.*[\/\\]//; $new_filename =~ s/\..*$/.ssrf/; - print "Content-Disposition: attachment; filename=\"$new_filename\"\n"; - print "Content-type: subsurface/xml\n\n"; - system "$smtk2ssrf $tmp_filename -"; + if (length($converted) > 5) { + + print "Content-Disposition: attachment; filename=\"$new_filename\"\n"; + print "Content-type: subsurface/xml\n\n"; + print $converted; + } else { + print "Content-type: text/html\n\n"; + print "

Conversion failed

"; + print 'Please contact Robert Helling (robert@thetheoreticaldiver.org) if the problem persits.'; + } } else { print "Content-type: text/html\n\n"; -- cgit v1.2.3-70-g09d2