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

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

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

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