From: Mike G. v. a. <we...@ma...> - 2009-07-30 20:55:54
|
Log Message: ----------- replaced %WeBWorK::SeedCE with get_SeedCE($ce) because, if the webwork server hasn't been run recently %WeBWorK::SeedCE might not be defined. and addcourse will fail Modified Files: -------------- webwork2/lib/WeBWorK/Utils: CourseManagement.pm Revision Data ------------- Index: CourseManagement.pm =================================================================== RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Utils/CourseManagement.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -Llib/WeBWorK/Utils/CourseManagement.pm -Llib/WeBWorK/Utils/CourseManagement.pm -u -r1.46 -r1.47 --- lib/WeBWorK/Utils/CourseManagement.pm +++ lib/WeBWorK/Utils/CourseManagement.pm @@ -256,8 +256,8 @@ if (exists $options{templatesFrom}) { my $sourceCourse = $options{templatesFrom}; my $sourceCE = new WeBWorK::CourseEnvironment({ - %WeBWorK::SeedCE, - courseName => $sourceCourse, + get_SeedCE($ce), + courseName => $sourceCourse, # override courseName }); my $sourceDir = $sourceCE->{courseDirs}->{templates}; @@ -714,7 +714,7 @@ ##### step 3: read the course environment for this course ##### my $ce2 = new WeBWorK::CourseEnvironment({ - %WeBWorK::SeedCE, + get_SeedCE($ce), courseName => $currCourseID, }); @@ -784,7 +784,7 @@ # course environment for before the course is moved my $ce2 = new WeBWorK::CourseEnvironment({ - %WeBWorK::SeedCE, + get_SeedCE($ce), courseName => $courseID, }); @@ -803,7 +803,7 @@ # course environment for after the course is moved my $ce3 = new WeBWorK::CourseEnvironment({ - %WeBWorK::SeedCE, + get_SeedCE($ce), courseName => $tmpCourseID, }); @@ -1168,6 +1168,14 @@ } - - +sub get_SeedCE { + my $ce = shift; + warn "get_SeedCE needs current Course environment to create seed CE" unless ref($ce) ; + my %seedCE=(); + my @conf_items = qw( webwork_dir webwork_url pg_dir courseName) ; + foreach my $item (@conf_items) { + $seedCE{$item} = $ce->{$item}; + } + return( %seedCE); +} 1; |