Remove WeBWorK::Constants and improve the webwork2 app configuration.

bin/OPL-update

@@ -18,10 +18,6 @@ use strict;
 use warnings;
 
 BEGIN {
-        die "WEBWORK_ROOT not found in environment.\n"
-                unless exists $ENV{WEBWORK_ROOT};
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
 	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
 	$ENV{PG_ROOT} //= "$ENV{WEBWORK_ROOT}/../pg";
 	die "The pg directory must be defined in PG_ROOT" unless (-e $ENV{PG_ROOT});
@@ -34,7 +30,7 @@ use lib "$ENV{WEBWORK_ROOT}/bin";
 use WeBWorK::CourseEnvironment;
 use Helper 'runScript';
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $ENV{PG_ROOT} });
 
 print "\nDownloading the latest OPL release.\n";
 runScript("$ENV{WEBWORK_ROOT}/bin/download-OPL-metadata-release.pl");

bin/OPL-update-legacy

@@ -25,10 +25,7 @@ use DBI;
  #You can increase path length to  4096 for mysql > 5.0.3)
 
 BEGIN {
-        die "WEBWORK_ROOT not found in environment.\n"
-                unless exists $ENV{WEBWORK_ROOT};
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
+	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
 }
 
 # Taxonomy global variables
@@ -90,7 +87,7 @@ use WeBWorK::CourseEnvironment;
 use WeBWorK::Utils::Tags;
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree writeJSONtoFile/;
 
-my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL
@@ -715,7 +712,7 @@ sub pgfiles {
 			my $lang    = $tags->{Language} || 'en';
 			my $mathobj = $tags->{MO}       || 0;
 			my $static  = $tags->{Static}   || 0;
-	
+
 			my @pgfile_ids = ();
 
 			for my $DBsection_id (@DBsection_ids) {

bin/addcourse

@@ -84,7 +84,7 @@ use lib "$pg_dir/lib";
 use WeBWorK::CourseEnvironment;
 
 # Grab course environment (by reading webwork2/conf/defaults.config)
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $webwork_dir });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $webwork_dir, pg_dir => $pg_dir });
 
 use WeBWorK::DB;
 use WeBWorK::File::Classlist;

bin/change_user_id

@@ -45,7 +45,8 @@ my $new_user_id = shift;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID
+	pg_dir      => $pg_dir,
+	courseName  => $courseID
 });
 
 my $db = new WeBWorK::DB($ce->{dbLayout});

bin/delcourse

@@ -137,7 +137,8 @@ usage_error("must specify COURSEID.") unless $courseID;
 # bring up a minimal course environment
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID,
+	pg_dir      => $ENV{PG_ROOT},
+	courseName  => $courseID,
 });
 
 my $dbLayout = $ce->{dbLayoutName};

bin/download-OPL-metadata-release.pl

@@ -27,7 +27,7 @@ BEGIN
 use WeBWorK::CourseEnvironment;
 use Helper 'runScript';
 
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 my $rawData;
 my $releaseDataFF =

bin/dump-OPL-tables.pl

@@ -37,9 +37,7 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
-	webwork_dir => $ENV{WEBWORK_ROOT},
-});
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 my $configured_OPL_path = $ce->{problemLibrary}{root};
 

bin/dump_past_answers

@@ -126,8 +126,9 @@ my $csv               = new Text::CSV->new({ binary => 1 })
 	or die "Cannot use CSV: " . Text::CSV->error_diag();
 $csv->eol("\n");
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 });
 
 my @courses          = listCourses($ce);
@@ -140,8 +141,9 @@ my @row;
 foreach my $courseID (@courses) {
 	next if $courseID eq 'admin' || $courseID eq 'modelCourse';
 
-	$ce = new WeBWorK::CourseEnvironment({
+	$ce = WeBWorK::CourseEnvironment->({
 		webwork_dir => $ENV{WEBWORK_ROOT},
+		pg_dir      => $pg_dir,
 		courseName  => $courseID,
 	});
 	$db = new WeBWorK::DB($ce->{dbLayout});

bin/generate-OPL-set-def-lists.pl

@@ -43,7 +43,7 @@ BEGIN
 use OPLUtils qw/writeJSONtoFile/;
 use WeBWorK::CourseEnvironment;
 
-my $ce          = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce          = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_root });
 my $libraryRoot = $ce->{problemLibrary}{root};
 my $contribRoot = $ce->{contribLibrary}{root};
 

bin/importClassList.pl

@@ -53,6 +53,7 @@ BEGIN
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 	courseName  => $courseID
 });
 

bin/integrity_check.pl

@@ -44,8 +44,9 @@ BEGIN
 
 my $courseName = "tmp_course";
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 	courseName  => $courseName
 });
 

bin/load-OPL-global-statistics.pl

@@ -38,8 +38,9 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir
 });
 
 my $dbh = DBI->connect(

bin/newpassword

@@ -96,6 +96,7 @@ sub dopasswd {
 # bring up a minimal course environment
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 	courseName => $courseID
 });
 

bin/remove_stale_images

@@ -217,7 +217,7 @@ sub count_report {
 
 
 # bring up a minimal course environment
-my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 my $dirHead = $ce->{webworkDirs}->{equationCache};
 my $cachePath = $ce->{webworkFiles}->{equationCacheDB};

bin/restore-OPL-tables.pl

@@ -38,8 +38,9 @@ BEGIN
 
 # get course environment and configured OPL path
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir
 });
 
 my $configured_OPL_path = $ce->{problemLibrary}{root};

bin/setfilepermissions

@@ -42,7 +42,7 @@ BEGIN {
 use lib "$ENV{WEBWORK_ROOT}/lib";
 use lib "$pg_dir/lib";
 use WeBWorK::CourseEnvironment;
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 # who is really running this script (even if sudo'ed)
 # We set relevant directories so that script runner owns them

bin/test_library_build.pl

@@ -6,9 +6,6 @@ BEGIN
 	die "WEBWORK_ROOT not found in environment.\n" unless exists $ENV{WEBWORK_ROOT};
 	$pg_dir = $ENV{PG_ROOT} // "$ENV{WEBWORK_ROOT}/../pg";
 	die "The pg directory must be defined in PG_ROOT" unless (-e $pg_dir);
-
-	# Unused variable, but define it to avoid an error message.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = '';
 }
 
 # Get database connection
@@ -19,7 +16,7 @@ BEGIN
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree/;
 use DBI;
 
-my $ce  = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce  = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 my $dbh = DBI->connect(
 	$ce->{database_dsn},
 	$ce->{database_username},

bin/update-OPL-statistics.pl

@@ -38,8 +38,9 @@ BEGIN
 my $time = time();
 
 # get course environment and open up database
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir
 });
 
 # decide whether the mysql installation can handle

bin/updateOPLextras.pl

@@ -83,7 +83,7 @@ BEGIN
 use WeBWorK::CourseEnvironment;
 use OPLUtils qw/build_library_directory_tree build_library_subject_tree build_library_textbook_tree/;
 
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $pg_dir });
 
 # decide whether the mysql installation can handle
 # utf8mb4 and that should be used for the OPL

bin/upgrade-database-to-utf8mb4.pl

@@ -154,7 +154,7 @@ BEGIN
 use WeBWorK::Utils::CourseManagement qw{listCourses};
 
 # Load a minimal course environment.
-my $ce = new WeBWorK::CourseEnvironment({ webwork_dir => $ENV{WEBWORK_ROOT} });
+my $ce = WeBWorK::CourseEnvironment->new({ webwork_dir => $ENV{WEBWORK_ROOT}, pg_dir => $ENV{PG_ROOT} });
 
 # Get DB connection settings.
 my $dbname = $ce->{database_name};

bin/upgrade_admin_db.pl

@@ -35,8 +35,9 @@ BEGIN
 ##########################
 my $upgrade_courseID = 'admin';
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 	courseName  => $upgrade_courseID,
 });
 #warn "do_upgrade_course: updating |$upgrade_courseID| from" , join("|",@upgrade_courseIDs);

bin/upload-OPL-statistics.pl

@@ -32,8 +32,9 @@ BEGIN
 use Net::Domain qw/domainname/;
 use String::ShellQuote;
 
-my $ce = new WeBWorK::CourseEnvironment({
+my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
+	pg_dir      => $pg_dir,
 });
 
 # Get DB connection settings
@@ -66,7 +67,7 @@ BEGIN
   * the average number of attempts made per user on the problem
   * the average completion percentage for each user who attempted the problem
 
-Share OPL usage statistics with the WeBWorK community [Y/N]: 
+Share OPL usage statistics with the WeBWorK community [Y/N]:
 END_REQUEST
 	$input = <STDIN>;
 	chomp $input;

bin/webwork2

@@ -33,9 +33,6 @@ BEGIN {
 
 	$WeBWorK::SeedCE{webwork_dir} = $ENV{WEBWORK_ROOT};
 	$WeBWorK::SeedCE{pg_dir}      = $ENV{PG_ROOT};
-	# Define these twice to avoid annoying used only once warnings.
-	$WeBWorK::Constants::WEBWORK_DIRECTORY = $WeBWorK::Constants::WEBWORK_DIRECTORY = $ENV{WEBWORK_ROOT};
-	$WeBWorK::Constants::PG_DIRECTORY      = $WeBWorK::Constants::PG_DIRECTORY      = $ENV{PG_ROOT};
 }
 
 use Mojolicious::Commands;

bin/ww_purge_old_nonces

@@ -69,7 +69,8 @@ usage() unless $course ;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $course,
+	pg_dir      => $pg_dir,
+	courseName  => $course,
 });
 
 my $db = WeBWorK::DB->new($ce->{dbLayout});

bin/wwdb

@@ -88,7 +88,8 @@ usage() unless $course and $command and $file;
 
 my $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $course,
+	pg_dir      => $pg_dir,
+	courseName  => $course,
 });
 
 my $db = WeBWorK::DB->new($ce->{dbLayout});

bin/wwsh

@@ -51,7 +51,8 @@ die 'You must pass scriptFile in as a path to the file' unless -e $scriptFile;
 
 $ce = WeBWorK::CourseEnvironment->new({
 	webwork_dir => $ENV{WEBWORK_ROOT},
-	courseName => $courseID,
+	pg_dir      => $pg_dir,
+	courseName  => $courseID,
 });