--- loncom/interface/printout.pl 2003/10/16 15:30:43 1.38 +++ loncom/interface/printout.pl 2004/03/04 05:21:34 1.40.2.2 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.38 2003/10/16 15:30:43 sakharuk Exp $ +# $Id: printout.pl,v 1.40.2.2 2004/03/04 05:21:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,14 +26,39 @@ # http://www.lon-capa.org/ # +use lib '/home/httpd/lib/perl'; +use LONCAPA::loncgi(); use File::Path; use IO::File; use Image::Magick; + +my %origENV=%ENV; +if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { + print < +Bad Cookie + +Your cookie information is incorrect. + + +END + return; +} + print "Content-type: text/html\n\n"; print "\n"; - my ($texfile,$laystyle,$numberofcolumns,$selectionmade) = split(/&/,$ENV{'QUERY_STRING'}); - my $advans_role=0; - if ($selectionmade>=10000) {$selectionmade=$selectionmade/10000; $advans_role=1;} + + my $identifier = $ENV{'QUERY_STRING'}; + my $texfile = $ENV{'cgi.'.$identifier.'.file'}; + my $laystyle = $ENV{'cgi.'.$identifier.'.layout'}; + my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'}; + my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'}; + my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'}; + my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'}; + my $advans_role = $ENV{'cgi.'.$identifier.'role'}; + my $figfile = $texfile; $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/; my $duefile = $texfile; @@ -46,13 +71,18 @@ use Image::Magick; my $noteps; foreach $not_eps (@content_of_file) { if ($not_eps ne '') { + $not_eps=~s|\/\.\/|\/|g; my $eps_f = $not_eps; $eps_f =~ s/\.[^.]*$/\.eps/i; - $_ = $eps_f; - m/\/home\/httpd\/html\/res\/(.+)/; - $eps_f = '/home/httpd/prtspool/'.$1; + if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { + $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; + $eps_f = '/home/httpd/prtspool/'.$eps_f; + } else { + $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/; + $eps_f = '/home/httpd/prtspool/'.$1; + } my $path=$eps_f; - $path=~s/\/([^\/]+)\.eps$//; + $path=~s/\/([^\/]+)\.eps$//; File::Path::mkpath($path,0,0777); my $image = Image::Magick->new; $not_eps =~ s/^\s+//; @@ -81,10 +111,12 @@ use Image::Magick; my $path_file = $1.'/'; chdir $path_file; system("latex $name_file 1>/dev/null 2>/dev/null"); - if ($selectionmade>=10) {system("latex $name_file 1>/dev/null 2>/dev/null");} #to create table of contents + if ($tableofcontents eq 'yes') { + system("latex $name_file 1>/dev/null 2>/dev/null"); + } #to create table of contents my $idxname=$name_file; $idxname=~s/\.tex$/\.idx/; - if ($selectionmade>=100) { + if ($tableofindex eq 'yes') { system("makeindex $idxname"); system("latex $name_file 1>/dev/null 2>/dev/null"); } #to create index @@ -246,6 +278,8 @@ use Image::Magick; } else { print "LaTeX file $texfile was not created successfully"; } + #got what we needed reset ENV in case it is to big for system + %ENV=%origENV;