[system] / trunk / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /trunk/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 918 Revision 919
13=cut 13=cut
14 14
15use strict; 15use strict;
16use warnings; 16use warnings;
17use CGI qw(); 17use CGI qw();
18use File::Path qw(rmtree);
18use File::Temp qw(tempdir); 19use File::Temp qw(tempdir);
19use WeBWorK::Form; 20use WeBWorK::Form;
20use WeBWorK::PG; 21use WeBWorK::PG;
21use WeBWorK::PG::IO; 22use WeBWorK::PG::IO;
22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 23use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string);
668 } 669 }
669 return $result; 670 return $result;
670 } elsif ($displayMode eq "images") { 671 } elsif ($displayMode eq "images") {
671 # how are we going to name this? 672 # how are we going to name this?
672 my $targetPathCommon = "/png/" 673 my $targetPathCommon = "/png/"
673 . $effectiveUser->id . "." 674 . $effectiveUser->user_id . "."
674 . $set->set_id . "." 675 . $set->set_id . "."
675 . $problem->problem_id . "." 676 . $problem->problem_id . "."
676 . $answerResult->{ans_name} . ".png"; 677 . $answerResult->{ans_name} . ".png";
677 678
678 # figure out where to put things 679 # figure out where to put things
684 # isolate it from the problem enivronment first 685 # isolate it from the problem enivronment first
685 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon; 686 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
686 687
687 # call dvipng to generate a preview 688 # call dvipng to generate a preview
688 dvipng($wd, $latex, $dvipng, $tex, $targetPath); 689 dvipng($wd, $latex, $dvipng, $tex, $targetPath);
690 rmtree($envir->{dvipngTempDir}, 0, 0);
689 if (-e $targetPath) { 691 if (-e $targetPath) {
690 return "<img src=\"$targetURL\" alt=\"$tex\" />"; 692 return "<img src=\"$targetURL\" alt=\"$tex\" />";
691 } else { 693 } else {
692 return "<b>[math2img failed]</b>"; 694 return "<b>[math2img failed]</b>";
693 } 695 }

Legend:
Removed from v.918  
changed lines
  Added in v.919

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9