[system] / branches / rel-2-4-patches / webwork-modperl / lib / WeBWorK / PG.pm Repository:
ViewVC logotype

Diff of /branches/rel-2-4-patches/webwork-modperl/lib/WeBWorK/PG.pm

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

Revision 424 Revision 425
63 # initialize the Translator 63 # initialize the Translator
64 warn "PG: initializing the Translator\n"; 64 warn "PG: initializing the Translator\n";
65 $translator->initialize(); 65 $translator->initialize();
66 66
67 # load PG.pl and dangerousMacros.pl using unrestricted_load 67 # load PG.pl and dangerousMacros.pl using unrestricted_load
68 # i'd like to change this at some point to have the same sort of interface to global.conf
69 # that the module loading does -- have a list of macros to load unrestrictedly.
68 warn "PG: loading PG.pl and dangerousMacros.pl using unrestricted_load\n"; 70 warn "PG: loading PG.pl and dangerousMacros.pl using unrestricted_load\n";
69 my $pg_pl = $courseEnv->{webworkDirs}->{macros} . "/PG.pl"; 71 my $pg_pl = $courseEnv->{webworkDirs}->{macros} . "/PG.pl";
70 my $dangerousMacros_pl = $courseEnv->{webworkDirs}->{macros} . "/dangerousMacros.pl"; 72 my $dangerousMacros_pl = $courseEnv->{webworkDirs}->{macros} . "/dangerousMacros.pl";
71 my $err = $translator->unrestricted_load($pg_pl); 73 my $err = $translator->unrestricted_load($pg_pl);
72 warn "Error while loading $pg_pl: $err" if $err; 74 warn "Error while loading $pg_pl: $err" if $err;
236 $envir{templateDirectory} = $courseEnv->{courseDirs}->{templates}."/"; 238 $envir{templateDirectory} = $courseEnv->{courseDirs}->{templates}."/";
237 $envir{tempDirectory} = $courseEnv->{courseDirs}->{html_temp}."/"; 239 $envir{tempDirectory} = $courseEnv->{courseDirs}->{html_temp}."/";
238 $envir{tempURL} = $courseEnv->{courseURLs}->{html_temp}; 240 $envir{tempURL} = $courseEnv->{courseURLs}->{html_temp};
239 $envir{scriptDirectory} = undef; 241 $envir{scriptDirectory} = undef;
240 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs}; 242 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs};
243
244 # Other things... (where's your brain?!?!)
245
246 $envir{PROBLEM_GRADER_TO_USE} = $courseEnv->{pg}->{options}->{grader};
241 247
242 return \%envir; 248 return \%envir;
243} 249}
244 250
245sub translateDisplayModeNames($) { 251sub translateDisplayModeNames($) {

Legend:
Removed from v.424  
changed lines
  Added in v.425

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9