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