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

Diff of /branches/gage_dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

Revision 906 Revision 1378
… …
5 5
6package WeBWorK::ContentGenerator::Problem; 6package WeBWorK::ContentGenerator::Problem;
7use base qw(WeBWorK::ContentGenerator); 7use base qw(WeBWorK::ContentGenerator);
8 8
9=head1 NAME 9=head1 NAME
10 10
11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem. 11WeBWorK::ContentGenerator::Problem - Allow a student to interact with a problem.
12 12
13=cut 13=cut
14 14my $timer0_ON=1; # times pg translation phase
15use strict; 15use strict;
16use warnings; 16use warnings;
17use CGI qw(); 17use CGI qw();
18use File::Temp qw(tempdir); 18use File::Path qw(rmtree);
19use WeBWorK::Form; 19use WeBWorK::Form;
20use WeBWorK::PG; 20use WeBWorK::PG;
21use WeBWorK::PG::ImageGenerator;
21use WeBWorK::PG::IO; 22use WeBWorK::PG::IO;
22use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string); 23use WeBWorK::Utils qw(writeLog encodeAnswers decodeAnswers ref2string makeTempDirectory);
24use WeBWorK::DB::Utils qw(global2user user2global findDefaults);
25use WeBWorK::Timing;
23 26
24############################################################ 27############################################################
25# 28#
26# user 29# user
27# effectiveUser 30# effectiveUser
… …
42# 45#
43############################################################ 46############################################################
44 47
45sub pre_header_initialize { 48sub pre_header_initialize {
46 my ($self, $setName, $problemNumber) = @_; 49 my ($self, $setName, $problemNumber) = @_;
47 my $r = $self->{r}; 50 my $r = $self->{r};
48 my $courseEnv = $self->{ce}; 51 my $courseEnv = $self->{ce};
49 my $db = $self->{db}; 52 my $db = $self->{db};
50 my $userName = $r->param('user'); 53 my $userName = $r->param('user');
51 my $effectiveUserName = $r->param('effectiveUser'); 54 my $effectiveUserName = $r->param('effectiveUser');
52 55 my $key = $r->param('key');
53 my $user = $db->getUser($userName); 56 my $user = $db->getUser($userName);
54 my $effectiveUser = $db->getUser($effectiveUserName); 57 my $effectiveUser = $db->getUser($effectiveUserName);
55 my $set = $db->getGlobalUserSet($effectiveUserName, $setName);
56 my $problem = $db->getGlobalUserProblem($effectiveUserName, $setName, $problemNumber);
57 my $psvn = $set->psvn();
58 my $permissionLevel = $db->getPermissionLevel($userName)->permission(); 58 my $permissionLevel = $db->getPermissionLevel($userName)->permission();
59 59
60 # obtain the merged set for $effectiveUser
61 my $set = $db->getMergedSet($effectiveUserName, $setName);
62
63 # obtain the merged problem for $effectiveUser
64 my $problem = $db->getMergedProblem($effectiveUserName, $setName, $problemNumber);
65
66 my $editMode = $r->param("editMode");
67
68 if ($permissionLevel > 0 and defined $editMode) {
69 # professors are allowed to fabricate sets and problems not
70 # assigned to them (or anyone). this allows them to use the
71 # editor to
72
73 # if that is not yet defined obtain the global set, convert
74 # it to a user set, and add fake user data
75 unless (defined $set) {
76 my $userSetClass = $db->{set_user}->{record};
77 $set = global2user($userSetClass,
78 $db->getGlobalSet($setName));
79 die "Set $setName does not exist"
80 unless defined $set;
81 $set->psvn(0);
82 }
83
84 # if that is not yet defined obtain the global problem,
85 # convert it to a user problem, and add fake user data
86 unless (defined $problem) {
87 my $userProblemClass = $db->{problem_user}->{record};
88 $problem = global2user($userProblemClass,
89 $db->getGlobalProblem($setName,$problemNumber));
90 die "Problem $problemNumber in set $setName does not exist"
91 unless defined $problem;
92 $problem->user_id($effectiveUserName);
93 $problem->problem_seed(0);
94 $problem->status(0);
95 $problem->attempted(0);
96 $problem->last_answer("");
97 $problem->num_correct(0);
98 $problem->num_incorrect(0);
99 }
100
101 # now we're sure we have valid UserSet and UserProblem objects
102 # yay!
103
104 # now deal with possible editor overrides:
105
106 # if the caller is asking to override the source file, and
107 # editMode calls for a temporary file, do so
108 my $sourceFilePath = $r->param("sourceFilePath");
109 if (defined $sourceFilePath and $editMode eq "temporaryFile") {
110 $problem->source_file($sourceFilePath);
111 }
112
113 # if the caller is asking to override the problem seed, do so
114 my $problemSeed = $r->param("problemSeed");
115 if (defined $problemSeed) {
116 $problem->problem_seed($problemSeed);
117 }
118 } else {
119 # students can't view problems not assigned to them
120 die "Set $setName is not assigned to $effectiveUserName"
121 unless defined $set;
122 die "Problem $problemNumber in set $setName is not assigned to $effectiveUserName"
123 unless defined $problem;
124 }
125
60 $self->{userName} = $userName; 126 $self->{userName} = $userName;
127 $self->{effectiveUserName} = $effectiveUserName;
61 $self->{user} = $user; 128 $self->{user} = $user;
62 $self->{effectiveUser} = $effectiveUser; 129 $self->{effectiveUser} = $effectiveUser;
63 $self->{set} = $set;
64 $self->{problem} = $problem;
65 $self->{permissionLevel} = $permissionLevel; 130 $self->{permissionLevel} = $permissionLevel;
131 $self->{set} = $set;
132 $self->{problem} = $problem;
133 $self->{editMode} = $editMode;
66 134
67 ##### form processing ##### 135 ##### form processing #####
68 136
69 # set options from form fields (see comment at top of file for names) 137 # set options from form fields (see comment at top of file for names)
70 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode}; 138 my $displayMode = $r->param("displayMode") || $courseEnv->{pg}->{options}->{displayMode};
71 my $redisplay = $r->param("redisplay"); 139 my $redisplay = $r->param("redisplay");
72 my $submitAnswers = $r->param("submitAnswers"); 140 my $submitAnswers = $r->param("submitAnswers");
73 my $checkAnswers = $r->param("checkAnswers"); 141 my $checkAnswers = $r->param("checkAnswers");
74 my $previewAnswers = $r->param("previewAnswers"); 142 my $previewAnswers = $r->param("previewAnswers");
143
144 # fields which may be defined when using Problem Editor
145 #my $override_seed = ($permissionLevel>=10) ? $r->param('problemSeed') : undef;
146 #my $override_problem_source = ($permissionLevel>=10) ? $r->param('sourceFilePath') : undef;
147 #my $editMode = undef;
148 #my $submit_button = $r->param('submit_button');
149 #if ( defined($submit_button ) ) {
150 # $editMode = "temporaryFile" if $submit_button eq 'Refresh';
151 # $editMode = 'savedFile' if $submit_button eq 'Save';
152 #}
153 #
154 ##override using the source file data from the form field
155 #$problem->source_file($override_problem_source) if defined($override_problem_source);
156 #$problem->problem_seed($override_seed) if defined($override_seed);
157 #
158 ## store path to source file for title.
159 #$self->{problem_source_name} = $problem->source_file;
160 #$self->{edit_mode} = $editMode;
161 #$self->{current_problem_source} = (defined($override_problem_source) ) ?
75 162
76 # coerce form fields into CGI::Vars format 163 # coerce form fields into CGI::Vars format
77 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars }; 164 my $formFields = { WeBWorK::Form->new_from_paramable($r)->Vars };
78 165
79 $self->{displayMode} = $displayMode; 166 $self->{displayMode} = $displayMode;
… …
127 $will{$_} = $can{$_} && ($want{$_} || $must{$_}); 214 $will{$_} = $can{$_} && ($want{$_} || $must{$_});
128 } 215 }
129 216
130 ##### sticky answers ##### 217 ##### sticky answers #####
131 218
132 if (not $submitAnswers and $will{showOldAnswers}) { 219 if (not ($submitAnswers or $previewAnswers or $checkAnswers) and $will{showOldAnswers}) {
133 # do this only if new answers are NOT being submitted 220 # do this only if new answers are NOT being submitted
134 my %oldAnswers = decodeAnswers($problem->last_answer); 221 my %oldAnswers = decodeAnswers($problem->last_answer);
135 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers; 222 $formFields->{$_} = $oldAnswers{$_} foreach keys %oldAnswers;
136 } 223 }
137 224
138 ##### translation ##### 225 ##### translation #####
139 226
227 $WeBWorK::timer0->continue("begin pg processing") if $timer0_ON;
140 my $pg = WeBWorK::PG->new( 228 my $pg = WeBWorK::PG->new(
141 $courseEnv, 229 $courseEnv,
142 $effectiveUser, 230 $effectiveUser,
143 $r->param('key'), 231 $key,
144 $set, 232 $set,
145 $problem, 233 $problem,
146 $psvn, 234 $set->psvn, # FIXME: this field should be removed
147 $formFields, 235 $formFields,
148 { # translation options 236 { # translation options
149 displayMode => $displayMode, 237 displayMode => $displayMode,
150 showHints => $will{showHints}, 238 showHints => $will{showHints},
151 showSolutions => $will{showSolutions}, 239 showSolutions => $will{showSolutions},
152 refreshMath2img => $will{showHints} || $will{showSolutions}, 240 refreshMath2img => $will{showHints} || $will{showSolutions},
153 processAnswers => 1, 241 processAnswers => 1,
154 }, 242 },
155 ); 243 );
156 244
245 $WeBWorK::timer0->continue("end pg processing") if $timer0_ON;
157 ##### fix hint/solution options ##### 246 ##### fix hint/solution options #####
158 247
159 $can{showHints} &&= $pg->{flags}->{hintExists}; 248 $can{showHints} &&= $pg->{flags}->{hintExists};
160 $can{showSolutions} &&= $pg->{flags}->{solutionExists}; 249 $can{showSolutions} &&= $pg->{flags}->{solutionExists};
161 250
… …
167 $self->{will} = \%will; 256 $self->{will} = \%will;
168 257
169 $self->{pg} = $pg; 258 $self->{pg} = $pg;
170} 259}
171 260
172sub if_warnings($$) { 261#sub if_warnings($$) {
173 my ($self, $arg) = @_; 262# my ($self, $arg) = @_;
174 return 0 unless $self->{isOpen}; 263# return 0 unless $self->{isOpen};
175 return $self->{pg}->{warnings} ne ""; 264# return $self->{pg}->{warnings} ne "";
176} 265#}
177 266
178sub if_errors($$) { 267sub if_errors($$) {
179 my ($self, $arg) = @_; 268 my ($self, $arg) = @_;
180 return 0 unless $self->{isOpen}; 269 return 0 unless $self->{isOpen};
181 return $self->{pg}->{flags}->{error_flag}; 270 return $self->{pg}->{flags}->{error_flag};
… …
183 272
184sub head { 273sub head {
185 my $self = shift; 274 my $self = shift;
186 return "" unless $self->{isOpen}; 275 return "" unless $self->{isOpen};
187 return $self->{pg}->{head_text} if $self->{pg}->{head_text}; 276 return $self->{pg}->{head_text} if $self->{pg}->{head_text};
277}
278
279sub options {
280 my $self = shift;
281 return join("",
282 CGI::start_form("POST", $self->{r}->uri),
283 $self->hidden_authen_fields,
284 CGI::hr(),
285 CGI::start_div({class=>"viewOptions"}),
286 $self->viewOptions(),
287 CGI::end_div(),
288 CGI::end_form()
289 );
188} 290}
189 291
190sub path { 292sub path {
191 my $self = shift; 293 my $self = shift;
192 my $args = $_[-1]; 294 my $args = $_[-1];
… …
211 313
212 my $ce = $self->{ce}; 314 my $ce = $self->{ce};
213 my $db = $self->{db}; 315 my $db = $self->{db};
214 my $root = $ce->{webworkURLs}->{root}; 316 my $root = $ce->{webworkURLs}->{root};
215 my $courseName = $ce->{courseName}; 317 my $courseName = $ce->{courseName};
216
217 print CGI::strong("Problems"), CGI::br(); 318 print CGI::strong("Problems"), CGI::br();
218 319
219 my $effectiveUser = $self->{r}->param("effectiveUser"); 320 my $effectiveUser = $self->{r}->param("effectiveUser");
220 my @problems;
221 push @problems, $db->getGlobalUserProblem($effectiveUser, $setName, $_)
222 foreach ($db->listUserProblems($effectiveUser, $setName)); 321 my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
223 foreach my $problem (sort { $a->problem_id <=> $b->problem_id } @problems) { 322 foreach my $problem (sort { $a <=> $b } @problemIDs) {
224 print CGI::a({-href=>"$root/$courseName/$setName/".$problem->problem_id."/?" 323 print '&nbsp;&nbsp;'.CGI::a({-href=>"$root/$courseName/$setName/".$problem."/?"
225 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}}, 324 . $self->url_authen_args . "&displayMode=" . $self->{displayMode}},
226 "Problem ".$problem->problem_id), CGI::br(); 325 "Problem ".$problem), CGI::br();
227 } 326 }
327
328 return "";
228} 329}
229 330
230sub nav { 331sub nav {
332 $WeBWorK::timer0->continue("begin nav subroutine") if $timer0_ON;
231 my $self = shift; 333 my $self = shift;
232 my $args = $_[-1]; 334 my $args = $_[-1];
233 my $setName = $self->{set}->set_id; 335 my $setName = $self->{set}->set_id;
234 my $problemNumber = $self->{problem}->problem_id; 336 my $problemNumber = $self->{problem}->problem_id;
235 337
… …
242 my $effectiveUser = $self->{r}->param("effectiveUser"); 344 my $effectiveUser = $self->{r}->param("effectiveUser");
243 my $tail = "&displayMode=".$self->{displayMode}; 345 my $tail = "&displayMode=".$self->{displayMode};
244 346
245 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList"); 347 my @links = ("Problem List" , "$root/$courseName/$setName", "navProbList");
246 348
247 my $prevProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber-1); 349 my @problemIDs = $db->listUserProblems($effectiveUser, $setName);
248 my $nextProblem = $db->getGlobalUserProblem($effectiveUser, $setName, $problemNumber+1); 350 my ($prevID, $nextID);
351 foreach my $id (@problemIDs) {
352 $prevID = $id if $id < $problemNumber
353 and (not defined $prevID or $id > $prevID);
354 $nextID = $id if $id > $problemNumber
355 and (not defined $nextID or $id < $nextID);
356 }
249 unshift @links, "Previous Problem" , ($prevProblem 357 unshift @links, "Previous Problem" , ($prevID
250 ? "$root/$courseName/$setName/".$prevProblem->problem_id 358 ? "$root/$courseName/$setName/".$prevID
251 : "") , "navPrev"; 359 : "") , "navPrev";
252 push @links, "Next Problem" , ($nextProblem 360 push @links, "Next Problem" , ($nextID
253 ? "$root/$courseName/$setName/".$nextProblem->problem_id 361 ? "$root/$courseName/$setName/".$nextID
254 : "") , "navNext"; 362 : "") , "navNext";
255 363
256 return $self->navMacro($args, $tail, @links); 364 my $result = $self->navMacro($args, $tail, @links);
365 $WeBWorK::timer0->continue("end nav subroutine") if $timer0_ON;
366 return $result;
257} 367}
258 368
259sub title { 369sub title {
260 my $self = shift; 370 my $self = shift;
261 my $setName = $self->{set}->set_id; 371 my $setName = $self->{set}->set_id;
… …
273 # unpack some useful variables 383 # unpack some useful variables
274 my $r = $self->{r}; 384 my $r = $self->{r};
275 my $db = $self->{db}; 385 my $db = $self->{db};
276 my $set = $self->{set}; 386 my $set = $self->{set};
277 my $problem = $self->{problem}; 387 my $problem = $self->{problem};
388 my $editMode = $self->{editMode};
278 my $permissionLevel = $self->{permissionLevel}; 389 my $permissionLevel = $self->{permissionLevel};
279 my $submitAnswers = $self->{submitAnswers}; 390 my $submitAnswers = $self->{submitAnswers};
280 my $checkAnswers = $self->{checkAnswers}; 391 my $checkAnswers = $self->{checkAnswers};
281 my $previewAnswers = $self->{previewAnswers}; 392 my $previewAnswers = $self->{previewAnswers};
282 my %want = %{ $self->{want} }; 393 my %want = %{ $self->{want} };
283 my %can = %{ $self->{can} }; 394 my %can = %{ $self->{can} };
284 my %must = %{ $self->{must} }; 395 my %must = %{ $self->{must} };
285 my %will = %{ $self->{will} }; 396 my %will = %{ $self->{will} };
286 my $pg = $self->{pg}; 397 my $pg = $self->{pg};
287 398
288 ##### translation errors? ##### 399 ##### translation errors? #####
… …
290 if ($pg->{flags}->{error_flag}) { 401 if ($pg->{flags}->{error_flag}) {
291 return $self->errorOutput($pg->{errors}, $pg->{body_text}); 402 return $self->errorOutput($pg->{errors}, $pg->{body_text});
292 } 403 }
293 404
294 ##### answer processing ##### 405 ##### answer processing #####
295 406 $WeBWorK::timer0->continue("begin answer processing") if $timer0_ON;
296 # if answers were submitted: 407 # if answers were submitted:
408 my $scoreRecordedMessage;
297 if ($submitAnswers) { 409 if ($submitAnswers) {
298 # get a "pure" (unmerged) UserProblem to modify 410 # get a "pure" (unmerged) UserProblem to modify
411 # this will be undefined if the problem has not been assigned to this user
299 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id); 412 my $pureProblem = $db->getUserProblem($problem->user_id, $problem->set_id, $problem->problem_id);
413 if (defined $pureProblem) {
300 # store answers in DB for sticky answers 414 # store answers in DB for sticky answers
301 my %answersToStore; 415 my %answersToStore;
302 my %answerHash = %{ $pg->{answers} }; 416 my %answerHash = %{ $pg->{answers} };
303 $answersToStore{$_} = $answerHash{$_}->{original_student_ans} 417 $answersToStore{$_} = $answerHash{$_}->{original_student_ans}
304 foreach (keys %answerHash); 418 foreach (keys %answerHash);
305 my $answerString = encodeAnswers(%answersToStore, 419 my $answerString = encodeAnswers(%answersToStore,
306 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }); 420 @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} });
421
422 # store last answer to database
423 $problem->last_answer($answerString);
307 $pureProblem->last_answer($answerString); 424 $pureProblem->last_answer($answerString);
308 $problem->last_answer($answerString);
309 $db->putUserProblem($pureProblem);
310
311 # store state in DB if it makes sense
312 if ($will{recordAnswers}) {
313 $problem->status($pg->{state}->{recorded_score});
314 $problem->attempted(1);
315 $problem->num_correct($pg->{state}->{num_of_correct_ans});
316 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
317 $pureProblem->status($pg->{state}->{recorded_score});
318 $pureProblem->attempted(1);
319 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
320 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
321 $db->putUserProblem($pureProblem); 425 $db->putUserProblem($pureProblem);
426
427 # store state in DB if it makes sense
428 if ($will{recordAnswers}) {
429 $problem->status($pg->{state}->{recorded_score});
430 $problem->attempted(1);
431 $problem->num_correct($pg->{state}->{num_of_correct_ans});
432 $problem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
433 $pureProblem->status($pg->{state}->{recorded_score});
434 $pureProblem->attempted(1);
435 $pureProblem->num_correct($pg->{state}->{num_of_correct_ans});
436 $pureProblem->num_incorrect($pg->{state}->{num_of_incorrect_ans});
437 if ($db->putUserProblem($pureProblem)) {
438 $scoreRecordedMessage = "Your score was recorded.";
439 } else {
440 $scoreRecordedMessage = "Your score was not recorded because there was a failure in storing the problem record to the database.";
441 }
322 # write to the transaction log, just to make sure 442 # write to the transaction log, just to make sure
323 writeLog($self->{ce}, "transaction", 443 writeLog($self->{ce}, "transaction",
324 $problem->problem_id."\t". 444 $problem->problem_id."\t".
325 $problem->set_id."\t". 445 $problem->set_id."\t".
326 $problem->user_id."\t". 446 $problem->user_id."\t".
327 $problem->source_file."\t". 447 $problem->source_file."\t".
328 $problem->value."\t". 448 $problem->value."\t".
329 $problem->max_attempts."\t". 449 $problem->max_attempts."\t".
330 $problem->problem_seed."\t". 450 $problem->problem_seed."\t".
331 $pureProblem->status."\t". 451 $pureProblem->status."\t".
332 $pureProblem->attempted."\t". 452 $pureProblem->attempted."\t".
333 $pureProblem->last_answer."\t". 453 $pureProblem->last_answer."\t".
334 $pureProblem->num_correct."\t". 454 $pureProblem->num_correct."\t".
335 $pureProblem->num_incorrect 455 $pureProblem->num_incorrect
336 ); 456 );
457 } else {
458 if (time < $set->open_date or time > $set->due_date) {
459 $scoreRecordedMessage = "Your score was not recorded because this problem set is closed.";
460 } else {
461 $scoreRecordedMessage = "Your score was not recorded.";
462 }
463 }
464 } else {
465 $scoreRecordedMessage = "Your score was not recorded because this problem has not been built for you.";
337 } 466 }
338 } 467 }
468
339 # logging student answers 469 # logging student answers
340 my $pastAnswerLog = undef; 470 my $pastAnswerLog = undef;
341 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) { 471 if (defined( $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'} )) {
342
343 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'}; 472 $pastAnswerLog = $self->{ce}->{webworkFiles}->{logs}->{'pastAnswerList'};
344
345 if ($submitAnswers and defined($pastAnswerLog) ) { 473 if ($submitAnswers and defined $pastAnswerLog) {
346 my $answerString = ""; 474 my $answerString = "";
347 my %answerHash = %{ $pg->{answers} }; 475 my %answerHash = %{ $pg->{answers} };
348 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t" 476 $answerString = $answerString . $answerHash{$_}->{original_student_ans}."\t"
349 foreach (sort keys %answerHash); 477 foreach (sort keys %answerHash);
478 $answerString = '' unless defined($answerString); # insure string is defined.
350 writeLog($self->{ce}, "pastAnswerList", 479 writeLog($self->{ce}, "pastAnswerList",
351 '|'.$problem->user_id. 480 '|'.$problem->user_id.
352 '|'.$problem->set_id. 481 '|'.$problem->set_id.
353 '|'.$problem->problem_id.'|'."\t". 482 '|'.$problem->problem_id.'|'."\t".
354 time()."\t". 483 time()."\t".
355 $answerString, 484 $answerString,
356
357 ); 485 );
358
359 } 486 }
360
361 } 487 }
362 # end logging student answers 488
489 $WeBWorK::timer0->continue("end answer processing") if $timer0_ON;
363 490
364 ##### output ##### 491 ##### output #####
492
365 print CGI::start_div({class=>"problemHeader"}); 493 print CGI::start_div({class=>"problemHeader"});
494
495 # custom message for editor
496 if ($permissionLevel >= 10 and defined $editMode) {
497 if ($editMode eq "temporaryFile") {
498 print CGI::p(CGI::i("Editing temporary file: ", $problem->source_file));
499 } elsif ($editMode eq "savedFile") {
500 print CGI::p(CGI::i("Problem saved to: ", $problem->source_file));
501 }
502 }
503
366 # attempt summary 504 # attempt summary
367 if ($submitAnswers or $will{showCorrectAnswers}) { 505 if ($submitAnswers or $will{showCorrectAnswers}) {
368 # print this if user submitted answers OR requested correct answers 506 # print this if user submitted answers OR requested correct answers
369 print $self->attemptResults($pg, $submitAnswers, 507 print $self->attemptResults($pg, $submitAnswers,
370 $will{showCorrectAnswers}, 508 $will{showCorrectAnswers},
371 $pg->{flags}->{showPartialCorrectAnswers}, 1, 0); 509 $pg->{flags}->{showPartialCorrectAnswers}, 1, 1);
372 } elsif ($checkAnswers) { 510 } elsif ($checkAnswers) {
373 # print this if user previewed answers 511 # print this if user previewed answers
374 print $self->attemptResults($pg, 1, 0, 1, 1, 0); 512 print $self->attemptResults($pg, 1, 0, 1, 1, 1);
375 # show attempt answers 513 # show attempt answers
376 # don't show correct answers 514 # don't show correct answers
377 # show attempt results (correctness) 515 # show attempt results (correctness)
378 # don't show attempt previews 516 # don't show attempt previews
379 } elsif ($previewAnswers) { 517 } elsif ($previewAnswers) {
… …
386 } 524 }
387 525
388 print CGI::end_div(); 526 print CGI::end_div();
389 527
390 print CGI::start_div({class=>"problem"}); 528 print CGI::start_div({class=>"problem"});
391 #print CGI::hr(); 529
392 # main form 530 # main form
393 print 531 print
394 CGI::startform("POST", $r->uri), 532 CGI::startform("POST", $r->uri),
395 $self->hidden_authen_fields, 533 $self->hidden_authen_fields,
396 CGI::p($pg->{body_text}), 534 CGI::p($pg->{body_text}),
… …
408 -label=>"Preview Answers"), 546 -label=>"Preview Answers"),
409 ); 547 );
410 print CGI::end_div(); 548 print CGI::end_div();
411 549
412 print CGI::start_div({class=>"scoreSummary"}); 550 print CGI::start_div({class=>"scoreSummary"});
551
413 # score summary 552 # score summary
414 my $attempts = $problem->num_correct + $problem->num_incorrect; 553 my $attempts = $problem->num_correct + $problem->num_incorrect;
415 my $attemptsNoun = $attempts != 1 ? "times" : "time"; 554 my $attemptsNoun = $attempts != 1 ? "times" : "time";
416 my $lastScore = int ($problem->status * 100) . "%"; 555 my $lastScore = sprintf("%.0f%%", $problem->status * 100); # Round to whole number
417 my ($attemptsLeft, $attemptsLeftNoun); 556 my ($attemptsLeft, $attemptsLeftNoun);
418 if ($problem->max_attempts == -1) { 557 if ($problem->max_attempts == -1) {
419 # unlimited attempts 558 # unlimited attempts
420 $attemptsLeft = "unlimited"; 559 $attemptsLeft = "unlimited";
421 $attemptsLeftNoun = "attempts"; 560 $attemptsLeftNoun = "attempts";
… …
428 my $setClosedMessage; 567 my $setClosedMessage;
429 if (time < $set->open_date or time > $set->due_date) { 568 if (time < $set->open_date or time > $set->due_date) {
430 $setClosed = 1; 569 $setClosed = 1;
431 $setClosedMessage = "This problem set is closed."; 570 $setClosedMessage = "This problem set is closed.";
432 if ($permissionLevel > 0) { 571 if ($permissionLevel > 0) {
433 $setClosedMessage .= " Since you are a privileged user, additional attempts will be recorded."; 572 $setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
434 } else { 573 } else {
435 $setClosedMessage .= " Additional attempts will not be recorded."; 574 $setClosedMessage .= " Additional attempts will not be recorded.";
436 } 575 }
437 } 576 }
438 print CGI::p( 577 print CGI::p(
578 $submitAnswers ? $scoreRecordedMessage . CGI::br() : "",
439 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(), 579 "You have attempted this problem $attempts $attemptsNoun.", CGI::br(),
440 $problem->attempted 580 $problem->attempted
441 ? "Your recorded score is $lastScore." . CGI::br() 581 ? "Your recorded score is $lastScore." . CGI::br()
442 : "", 582 : "",
443 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining." 583 $setClosed ? $setClosedMessage : "You have $attemptsLeft $attemptsLeftNoun remaining."
444 ); 584 );
445 print CGI::end_div(); 585 print CGI::end_div();
446 print CGI::hr(), CGI::start_div({class=>"viewOptions"}); 586
447 print 587 # save state for viewOptions
448 $self->viewOptions(),CGI::end_div(), 588 print CGI::hidden(
589 -name => "showOldAnswers",
590 -value => $will{showOldAnswers}
591 ),
592 CGI::hidden(
593 -name => "showCorrectAnswers",
594 -value => $will{showCorrectAnswers}
595 ),
596 CGI::hidden(
597 -name => "showHints",
598 -value => $will{showHints}),
599 CGI::hidden(
600 -name => "showSolutions",
601 -value => $will{showSolutions},
602 ),
603 CGI::hidden(
604 -name => "displayMode",
605 -value => $self->{displayMode}
606 );
607
608 # end of main form
449 CGI::endform(); 609 print CGI::endform();
450 610
451 print CGI::start_div({class=>"problemFooter"}); 611 # stuff we need below (pull these out at the beginning?)
452 # feedback form
453 my $ce = $self->{ce}; 612 my $ce = $self->{ce};
454 my $root = $ce->{webworkURLs}->{root}; 613 my $root = $ce->{webworkURLs}->{root};
455 my $courseName = $ce->{courseName}; 614 my $courseName = $ce->{courseName};
456 my $feedbackURL = "$root/$courseName/feedback/"; 615
616 print CGI::start_div({class=>"problemFooter"});
457 617
458 # arguments for answer inspection button 618 # arguments for answer inspection button
459 my $prof_url = $ce->{webworkURLs}->{oldProf}; 619 my $prof_url = $ce->{webworkURLs}->{oldProf};
460 my $cgi_url = $prof_url; 620 my $cgi_url = $prof_url;
461 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl 621 $cgi_url=~ s|/[^/]*$||; # clip profLogin.pl
462 my $authen_args = $self->url_authen_args(); 622 my $authen_args = $self->url_authen_args();
463 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl"; 623 my $showPastAnswersURL = "$cgi_url/showPastAnswers.pl";
624
625 # print answer inspection button
626 if ($self->{permissionLevel} > 0) {
627 print "\n",
628 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
629 $self->hidden_authen_fields,"\n",
630 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
631 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
632 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
633 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
634 CGI::p( {-align=>"left"},
635 CGI::submit(-name => 'action', -value=>'Show Past Answers')
636 ), "\n",
637 CGI::endform();
638 }
639
640 #print CGI::end_div();
641 #
642 #print CGI::start_div();
643
644 # arguments for feedback form
645 my $feedbackURL = "$root/$courseName/feedback/";
464 646
465 #print feedback form 647 #print feedback form
466 print 648 print
467 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n", 649 CGI::start_form(-method=>"POST", -action=>$feedbackURL),"\n",
468 $self->hidden_authen_fields,"\n", 650 $self->hidden_authen_fields,"\n",
… …
472 CGI::hidden("displayMode", $self->{displayMode}),"\n", 654 CGI::hidden("displayMode", $self->{displayMode}),"\n",
473 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n", 655 CGI::hidden("showOldAnswers", $will{showOldAnswers}),"\n",
474 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n", 656 CGI::hidden("showCorrectAnswers", $will{showCorrectAnswers}),"\n",
475 CGI::hidden("showHints", $will{showHints}),"\n", 657 CGI::hidden("showHints", $will{showHints}),"\n",
476 CGI::hidden("showSolutions", $will{showSolutions}),"\n", 658 CGI::hidden("showSolutions", $will{showSolutions}),"\n",
477 CGI::p({-align=>"right"}, 659 CGI::p({-align=>"left"},
478 CGI::submit(-name=>"feedbackForm", -label=>"Send Feedback") 660 CGI::submit(-name=>"feedbackForm", -label=>"Contact instructor")
479 ), 661 ),
480 CGI::endform(),"\n"; 662 CGI::endform(),"\n";
481 # print answer inspection button 663
482 if ($self->{permissionLevel} >0) {
483
484
485 print "\n",
486 CGI::start_form(-method=>"POST",-action=>$showPastAnswersURL,-target=>"information"),"\n",
487 $self->hidden_authen_fields,"\n",
488 CGI::hidden(-name => 'course', -value=>$courseName), "\n",
489 CGI::hidden(-name => 'probNum', -value=>$problem->problem_id), "\n",
490 CGI::hidden(-name => 'setNum', -value=>$problem->set_id), "\n",
491 CGI::hidden(-name => 'User', -value=>$problem->user_id), "\n",
492 CGI::submit(-name => 'action', -value=>'Show Past Answers'), "\n",
493 CGI::endform();
494
495
496
497 }
498 # FIXME print editor link 664 # FIXME print editor link
499 if ($self->{permissionLevel}>=10 ) { 665 # print editor link if the user is an instructor AND the file is not in temporary editing mode
666 if ($self->{permissionLevel}>=10 and ( (not defined($self->{edit_mode})) or $self->{edit_mode} eq 'savedFile') ) {
500 print CGI::a({-href=>"/webwork/$courseName/instructor/pgProblemEditor/".$set->set_id. 667 print CGI::a({-href=>$ce->{webworkURLs}->{root}."/$courseName/instructor/pgProblemEditor/".$set->set_id.
501 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem'); 668 '/'.$problem->problem_id.'?'.$self->url_authen_args},'Edit this problem');
502 } 669 }
670
503 print CGI::end_div(); 671 print CGI::end_div();
504 672
505 # end answer inspection button
506 # warning output 673 # warning output
507 if ($pg->{warnings} ne "") { 674 #if ($pg->{warnings} ne "") {
508 print CGI::hr(), $self->warningOutput($pg->{warnings}); 675 # print CGI::hr(), $self->warningOutput($pg->{warnings});
509 } 676 #}
510 677
511 # debugging stuff 678 # debugging stuff
512 if (0) { 679 if (0) {
513 print 680 print
514 CGI::hr(), 681 CGI::hr(),
… …
536 my $showAttemptAnswers = shift; 703 my $showAttemptAnswers = shift;
537 my $showCorrectAnswers = shift; 704 my $showCorrectAnswers = shift;
538 my $showAttemptResults = $showAttemptAnswers && shift; 705 my $showAttemptResults = $showAttemptAnswers && shift;
539 my $showSummary = shift; 706 my $showSummary = shift;
540 my $showAttemptPreview = shift || 0; 707 my $showAttemptPreview = shift || 0;
708 my $ce = $self->{ce};
541 my $problemResult = $pg->{result}; # the overall result of the problem 709 my $problemResult = $pg->{result}; # the overall result of the problem
542 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} }; 710 my @answerNames = @{ $pg->{flags}->{ANSWER_ENTRY_ORDER} };
543 711
544 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames; 712 my $showMessages = $showAttemptAnswers && grep { $pg->{answers}->{$_}->{ans_message} } @answerNames;
545 713
714 my $basename = "equation-" . $self->{set}->psvn. "." . $self->{problem}->problem_id . "-preview";
715 my $imgGen = WeBWorK::PG::ImageGenerator->new(
716 tempDir => $ce->{webworkDirs}->{tmp},
717 dir => $ce->{courseDirs}->{html_temp},
718 url => $ce->{courseURLs}->{html_temp},
719 basename => $basename,
720 latex => $ce->{externalPrograms}->{latex},
721 dvipng => $ce->{externalPrograms}->{dvipng},
722 );
723
724 my $header;
546 my $header = CGI::th("Part"); 725 #$header .= CGI::th("Part");
547 $header .= $showAttemptAnswers ? CGI::th("Entered") : ""; 726 $header .= $showAttemptAnswers ? CGI::th("Entered") : "";
548 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : ""; 727 $header .= $showAttemptPreview ? CGI::th("Answer Preview") : "";
549 $header .= $showCorrectAnswers ? CGI::th("Correct") : ""; 728 $header .= $showCorrectAnswers ? CGI::th("Correct") : "";
550 $header .= $showAttemptResults ? CGI::th("Result") : ""; 729 $header .= $showAttemptResults ? CGI::th("Result") : "";
551 $header .= $showMessages ? CGI::th("messages") : ""; 730 $header .= $showMessages ? CGI::th("messages") : "";
… …
553 my $numCorrect; 732 my $numCorrect;
554 foreach my $name (@answerNames) { 733 foreach my $name (@answerNames) {
555 my $answerResult = $pg->{answers}->{$name}; 734 my $answerResult = $pg->{answers}->{$name};
556 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans 735 my $studentAnswer = $answerResult->{student_ans}; # original_student_ans
557 my $preview = ($showAttemptPreview 736 my $preview = ($showAttemptPreview
558 ? $self->previewAnswer($answerResult) 737 ? $self->previewAnswer($answerResult, $imgGen)
559 : ""); 738 : "");
560 my $correctAnswer = $answerResult->{correct_ans}; 739 my $correctAnswer = $answerResult->{correct_ans};
561 my $answerScore = $answerResult->{score}; 740 my $answerScore = $answerResult->{score};
562 my $answerMessage = $showMessages ? $answerResult->{ans_message} : ""; 741 my $answerMessage = $showMessages ? $answerResult->{ans_message} : "";
563 742
564 $numCorrect += $answerScore > 0; 743 $numCorrect += $answerScore > 0;
… …
566 745
567 # get rid of the goofy prefix on the answer names (supposedly, the format 746 # get rid of the goofy prefix on the answer names (supposedly, the format
568 # of the answer names is changeable. this only fixes it for "AnSwEr" 747 # of the answer names is changeable. this only fixes it for "AnSwEr"
569 $name =~ s/^AnSwEr//; 748 $name =~ s/^AnSwEr//;
570 749
750 my $row;
571 my $row = CGI::td($name); 751 #$row .= CGI::td($name);
572 $row .= $showAttemptAnswers ? CGI::td($studentAnswer) : ""; 752 $row .= $showAttemptAnswers ? CGI::td(nbsp($studentAnswer)) : "";
573 $row .= $showAttemptPreview ? CGI::td($preview) : ""; 753 $row .= $showAttemptPreview ? CGI::td(nbsp($preview)) : "";
574 $row .= $showCorrectAnswers ? CGI::td($correctAnswer) : ""; 754 $row .= $showCorrectAnswers ? CGI::td(nbsp($correctAnswer)) : "";
575 $row .= $showAttemptResults ? CGI::td($resultString) : ""; 755 $row .= $showAttemptResults ? CGI::td(nbsp($resultString)) : "";
576 $row .= $answerMessage ? CGI::td($answerMessage) : ""; 756 $row .= $answerMessage ? CGI::td(nbsp($answerMessage)) : "";
577 push @tableRows, $row; 757 push @tableRows, $row;
578 } 758 }
579 759
760 # render equation images
761 $imgGen->render(refresh => 1);
762
580 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions"; 763 my $numIncorrectNoun = scalar @answerNames == 1 ? "question" : "questions";
581 my $scorePercent = int ($problemResult->{score} * 100) . "\%"; 764 my $scorePercent = sprintf("%.0f%%", $problemResult->{score} * 100);
582 my $summary = "On this attempt, you answered $numCorrect out of " 765 my $summary = "On this attempt, you answered $numCorrect out of "
583 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent."; 766 . scalar @answerNames . " $numIncorrectNoun correct, for a score of $scorePercent.";
584 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p($summary) : ""); 767 return CGI::table({-class=>"attemptResults"}, CGI::Tr(\@tableRows)) . ($showSummary ? CGI::p({class=>'emphasis'},$summary) : "");
585} 768}
586 769sub nbsp {
770 my $str = shift;
771 ($str =~/\S/) ? $str : '&nbsp;' ; # returns non-breaking space for empty strings
772 # tricky cases: $str =0;
773 # $str is a complex number
774}
587sub viewOptions($) { 775sub viewOptions($) {
588 my $self = shift; 776 my $self = shift;
589 my $displayMode = $self->{displayMode}; 777 my $displayMode = $self->{displayMode};
590 my %must = %{ $self->{must} }; 778 my %must = %{ $self->{must} };
591 my %can = %{ $self->{can} }; 779 my %can = %{ $self->{can} };
592 my %will = %{ $self->{will} }; 780 my %will = %{ $self->{will} };
593 781
594 my $optionLine; 782 my $optionLine;
595 $can{showOldAnswers} and $optionLine .= join "", 783 $can{showOldAnswers} and $optionLine .= join "",
596 "Show: &nbsp;", 784 "Show: &nbsp;".CGI::br(),
597 CGI::checkbox( 785 CGI::checkbox(
598 -name => "showOldAnswers", 786 -name => "showOldAnswers",
599 -checked => $will{showOldAnswers}, 787 -checked => $will{showOldAnswers},
600 -label => "Saved answers", 788 -label => "Saved answers",
601 ), "&nbsp;&nbsp;"; 789 ), "&nbsp;&nbsp;".CGI::br();
602 $can{showCorrectAnswers} and $optionLine .= join "", 790 $can{showCorrectAnswers} and $optionLine .= join "",
603 CGI::checkbox( 791 CGI::checkbox(
604 -name => "showCorrectAnswers", 792 -name => "showCorrectAnswers",
605 -checked => $will{showCorrectAnswers}, 793 -checked => $will{showCorrectAnswers},
606 -label => "Correct answers", 794 -label => "Correct answers",
607 ), "&nbsp;&nbsp;"; 795 ), "&nbsp;&nbsp;".CGI::br();
608 $can{showHints} and $optionLine .= join "", 796 $can{showHints} and $optionLine .= join "",
609 CGI::checkbox( 797 CGI::checkbox(
610 -name => "showHints", 798 -name => "showHints",
611 -checked => $will{showHints}, 799 -checked => $will{showHints},
612 -label => "Hints", 800 -label => "Hints",
613 ), "&nbsp;&nbsp;"; 801 ), "&nbsp;&nbsp;".CGI::br();
614 $can{showSolutions} and $optionLine .= join "", 802 $can{showSolutions} and $optionLine .= join "",
615 CGI::checkbox( 803 CGI::checkbox(
616 -name => "showSolutions", 804 -name => "showSolutions",
617 -checked => $will{showSolutions}, 805 -checked => $will{showSolutions},
618 -label => "Solutions", 806 -label => "Solutions",
619 ), "&nbsp;&nbsp;"; 807 ), "&nbsp;&nbsp;".CGI::br();
620 $optionLine and $optionLine .= join "", CGI::br(); 808 $optionLine and $optionLine .= join "", CGI::br();
621 809
622 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex"}, 810 return CGI::div({-style=>"border: thin groove; padding: 1ex; margin: 2ex align: left"},
623 "View equations as: &nbsp;", 811 "View&nbsp;equations&nbsp;as:&nbsp;&nbsp;&nbsp;&nbsp;".CGI::br(),
624 CGI::radio_group( 812 CGI::radio_group(
625 -name => "displayMode", 813 -name => "displayMode",
626 -values => ['plainText', 'formattedText', 'images'], 814 -values => ['plainText', 'formattedText', 'images'],
627 -default => $displayMode, 815 -default => $displayMode,
816 -linebreak=>'true',
628 -labels => { 817 -labels => {
629 plainText => "plain text", 818 plainText => "plain",
630 formattedText => "formatted text", 819 formattedText => "formatted",
631 images => "images", 820 images => "images",
632 } 821 }
633 ), CGI::br(), 822 ), CGI::br(),CGI::hr(),
634 $optionLine, 823 $optionLine,
635 CGI::submit(-name=>"redisplay", -label=>"Redisplay Problem"), 824 CGI::submit(-name=>"redisplay", -label=>"Save Options"),
636 ); 825 );
637} 826}
638 827
639sub previewAnswer($$) { 828sub previewAnswer($$) {
640 my ($self, $answerResult) = @_; 829 my ($self, $answerResult, $imgGen) = @_;
641 my $ce = $self->{ce}; 830 my $ce = $self->{ce};
642 my $effectiveUser = $self->{effectiveUser}; 831 my $effectiveUser = $self->{effectiveUser};
643 my $set = $self->{set}; 832 my $set = $self->{set};
644 my $problem = $self->{problem}; 833 my $problem = $self->{problem};
645 my $displayMode = $self->{displayMode}; 834 my $displayMode = $self->{displayMode};
… …
649 # so we'll just deal with each case explicitly here. there's some code 838 # so we'll just deal with each case explicitly here. there's some code
650 # duplication that can be dealt with later by abstracting out tth/dvipng/etc. 839 # duplication that can be dealt with later by abstracting out tth/dvipng/etc.
651 840
652 my $tex = $answerResult->{preview_latex_string}; 841 my $tex = $answerResult->{preview_latex_string};
653 842
654 return "" if $tex eq ""; 843 return "" unless defined $tex and $tex ne "";
655 844
656 if ($displayMode eq "plainText") { 845 if ($displayMode eq "plainText") {
657 return $tex; 846 return $tex;
658 } elsif ($displayMode eq "formattedText") { 847 } elsif ($displayMode eq "formattedText") {
659 my $tthCommand = $ce->{externalPrograms}->{tth} 848 my $tthCommand = $ce->{externalPrograms}->{tth}
… …
666 if ($?) { 855 if ($?) {
667 return "<b>[tth failed: $? $@]</b>"; 856 return "<b>[tth failed: $? $@]</b>";
668 } 857 }
669 return $result; 858 return $result;
670 } elsif ($displayMode eq "images") { 859 } elsif ($displayMode eq "images") {
671 # how are we going to name this? 860 ## how are we going to name this?
672 my $targetPathCommon = "/png/" 861 #my $targetPathCommon = "/m2i/"
673 . $effectiveUser->id . "." 862 # . $effectiveUser->user_id . "."
674 . $set->set_id . "." 863 # . $set->set_id . "."
675 . $problem->problem_id . "." 864 # . $problem->problem_id . "."
676 . $answerResult->{ans_name} . ".png"; 865 # . $answerResult->{ans_name} . ".png";
677 866 #
678 # figure out where to put things 867 ## figure out where to put things
679 my $wd = tempdir("webwork-dvipng-XXXXXXXX", DIR => $ce->{courseDirs}->{html_temp}); 868 #my $wd = makeTempDirectory($ce->{courseDirs}->{html_temp}, "webwork-dvipng");
680 my $latex = $ce->{externalPrograms}->{latex}; 869 #my $latex = $ce->{externalPrograms}->{latex};
681 my $dvipng = $ce->{externalPrograms}->{dvipng}; 870 #my $dvipng = $ce->{externalPrograms}->{dvipng};
682 my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon; 871 #my $targetPath = $ce->{courseDirs}->{html_temp} . $targetPathCommon;
683 # should use surePathToTmpFile, but we have to 872 # # should use surePathToTmpFile, but we have to
684 # isolate it from the problem enivronment first 873 # # isolate it from the problem enivronment first
685 my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon; 874 #my $targetURL = $ce->{courseURLs}->{html_temp} . $targetPathCommon;
686 875 #
687 # call dvipng to generate a preview 876 ## call dvipng to generate a preview
688 dvipng($wd, $latex, $dvipng, $tex, $targetPath); 877 #dvipng($wd, $latex, $dvipng, $tex, $targetPath);
878 #rmtree($wd, 0, 0);
689 if (-e $targetPath) { 879 #if (-e $targetPath) {
690 return "<img src=\"$targetURL\" alt=\"$tex\" />"; 880 # return "<img src=\"$targetURL\" alt=\"$tex\" />";
691 } else { 881 #} else {
692 return "<b>[math2img failed]</b>"; 882 # return "<b>[math2img failed]</b>";
693 } 883 #}
884 $imgGen->add($answerResult->{preview_latex_string});
885
694 } 886 }
695} 887}
888
696##### logging subroutine #### 889##### logging subroutine ####
697 890
698 891
699 892
700##### permission queries ##### 893##### permission queries #####
Legend:
Removed from v.906  
changed lines
  Added in v.1378
aubreyja at gmail dot com
 ViewVC Help
Powered by ViewVC 1.0.9