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

Diff of /trunk/webwork2/lib/WeBWorK/PG.pm

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

Revision 432 Revision 433
186 $envir{displayMode} = translateDisplayModeNames($options->{displayMode}); 186 $envir{displayMode} = translateDisplayModeNames($options->{displayMode});
187 $envir{languageMode} = $envir{displayMode}; 187 $envir{languageMode} = $envir{displayMode};
188 $envir{outputMode} = $envir{displayMode}; 188 $envir{outputMode} = $envir{displayMode};
189 $envir{displayHintsQ} = $options->{hints}; 189 $envir{displayHintsQ} = $options->{hints};
190 $envir{displaySolutionsQ} = $options->{solutions}; 190 $envir{displaySolutionsQ} = $options->{solutions};
191 $envir{externalTTHPath} = $courseEnv->{externalPrograms}->{tth};
192 191
193 # Problem Information 192 # Problem Information
194 # ADDED: courseName 193 # ADDED: courseName
195 194
196 $envir{openDate} = $set->open_date; 195 $envir{openDate} = $set->open_date;
219 # Answer Information 218 # Answer Information
220 # REMOVED: refSubmittedAnswers (alledgedly unused, causes errors) 219 # REMOVED: refSubmittedAnswers (alledgedly unused, causes errors)
221 220
222 $envir{inputs_ref} = $formFields; 221 $envir{inputs_ref} = $formFields;
223 222
224 # Default values for evaluating answers 223 # External Programs
225 224 $envir{externalTTHPath} = $courseEnv->{externalPrograms}->{tth};
226 my $ansEvalDefaults = $courseEnv->{pg}->{ansEvalDefaults}; 225 $envir{externalMath2imgPath} = $courseEnv->{externalPrograms}->{math2img};
227 $envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults);
228 226
229 # Directories and URLs 227 # Directories and URLs
230 # REMOVED: courseName 228 # REMOVED: courseName
231 229
232 $envir{cgiDirectory} = undef; 230 $envir{cgiDirectory} = undef;
240 $envir{tempDirectory} = $courseEnv->{courseDirs}->{html_temp}."/"; 238 $envir{tempDirectory} = $courseEnv->{courseDirs}->{html_temp}."/";
241 $envir{tempURL} = $courseEnv->{courseURLs}->{html_temp}; 239 $envir{tempURL} = $courseEnv->{courseURLs}->{html_temp};
242 $envir{scriptDirectory} = undef; 240 $envir{scriptDirectory} = undef;
243 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs}; 241 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs};
244 242
245 # Other things... (where's your brain?!?!) 243 # Default values for evaluating answers
244
245 my $ansEvalDefaults = $courseEnv->{pg}->{ansEvalDefaults};
246 $envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults);
247
248 # Other things...
246 249
247 $envir{PROBLEM_GRADER_TO_USE} = $courseEnv->{pg}->{options}->{grader}; 250 $envir{PROBLEM_GRADER_TO_USE} = $courseEnv->{pg}->{options}->{grader};
248 251
249 return \%envir; 252 return \%envir;
250} 253}
252sub translateDisplayModeNames($) { 255sub translateDisplayModeNames($) {
253 my $name = shift; 256 my $name = shift;
254 return { 257 return {
255 plainText => "HTML", 258 plainText => "HTML",
256 formattedText => "HTML_tth", 259 formattedText => "HTML_tth",
257 images => "Latex2HTML" 260 images => "HTML_img"
258 }->{$name}; 261 }->{$name};
259} 262}
260 263
261sub safetyFilter { 264sub safetyFilter {
262 my $answer = shift; # accepts one answer and checks it 265 my $answer = shift; # accepts one answer and checks it

Legend:
Removed from v.432  
changed lines
  Added in v.433

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9