[system] / branches / rel-2-2-dev / webwork2 / lib / WeBWorK / ContentGenerator / Problem.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-2-dev/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm

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

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