Devel

.gitignore

@@ -8,8 +8,13 @@ htdocs/tmp/*
 tmp/*
 logs/*
 conf/*.conf
+conf/*apache-config
 conf/*.apache2-config
 htdocs/site_info.txt
 bin/wwapache2ctl
 webwork2.komodoproject
 #courses.dist/*
+node_modules
+node_modules/*
+WeBWorK.sublime-project
+WeBWorK.sublime-workspace

.gitmodules

@@ -1,3 +1 @@
-[submodule "htdocs/mathjax"]
-	path = htdocs/mathjax
-	url = https://github.com/mathjax/MathJax.git
+

VERSION

@@ -1,3 +1,4 @@
-$WW_VERSION  ='2.5.1.3';
+$WW_VERSION  ='development';
 $WW_COPYRIGHT_YEARS = '1996-2013';
+
 1;

bin/OPL-update

@@ -26,6 +26,8 @@ use DBI;
 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 = '';
 }
 
 ### Data for creating the database tables
@@ -44,6 +46,8 @@ my %OPLtables = (
  chapter => 'OPL_chapter',
  section => 'OPL_section',
  problem => 'OPL_problem',
+ morelt => 'OPL_morelt',
+ morelt_pgfile => 'OPL_morelt_pgfile',
  pgfile_problem => 'OPL_pgfile_problem',
 );
 
@@ -61,6 +65,8 @@ my %NPLtables = (
  chapter => 'NPL-chapter',
  section => 'NPL-section',
  problem => 'NPL-problem',
+ morelt => 'NPL-morelt',
+ morelt_pgfile => 'NPL-morelt-pgfile',
  pgfile_problem => 'NPL-pgfile-problem',
 );
 
@@ -156,6 +162,7 @@ if($libraryVersion eq '2.5') {
 	institution tinyblob,
 	path_id int(15) NOT NULL,
 	filename varchar(255) NOT NULL,
+	morelt_id int(15),
 	PRIMARY KEY (pgfile_id)
 '],
 [$tables{keyword}, '
@@ -209,6 +216,19 @@ if($libraryVersion eq '2.5') {
 	KEY (section_id),
 	PRIMARY KEY (problem_id)
 '],
+[$tables{morelt}, '
+	morelt_id int(15) NOT NULL auto_increment,
+	name varchar(127) NOT NULL,
+	DBsection_id int(15),
+	leader int(15), # pgfile_id of the MLT leader
+	KEY (name),
+	PRIMARY KEY (morelt_id)
+'],
+[$tables{morelt_pgfile}, '
+	morelt_id int(15) DEFAULT 0 NOT NULL,
+	pgfile_id int(15) DEFAULT 0 NOT NULL,
+	PRIMARY KEY (morelt_id, pgfile_id)
+'],
 [$tables{pgfile_problem}, '
 	pgfile_id int(15) DEFAULT 0 NOT NULL,
 	problem_id int(15) DEFAULT 0 NOT NULL,
@@ -414,6 +434,7 @@ sub pgfiles {
 	my $name = $File::Find::name;
 	my ($subject, $chapter, $section, $date, $institution, $author, $text);
 	my ($edition, $textauthor, $textsection, $textproblem, $tagged);
+	my ($morelt, $morelt_leader);
 	%textinfo=();
 	my @textproblems = (-1);
   if ($name =~ /swf$/) {
@@ -431,42 +452,54 @@ sub pgfiles {
 		$tagged = 0;
 		while (<IN>) {
 		SWITCH: {
-				if (/\bKEYWORDS\((.*)\)/i) {
+				if (/#.*\bKEYWORDS\((.*)\)/i) {
 					@keyword = keywordcleaner($1);
 					last SWITCH;
 				}
-				if (/\bDBsubject\s*\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bDBsubject\s*\(\s*'?(.*?)'?\s*\)/) {
 					$subject = $1;
 					$subject =~ s/'/\'/g;
 					last SWITCH;
 				}
-				if (/\bDBchapter\s*\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bDBchapter\s*\(\s*'?(.*?)'?\s*\)/) {
 					$chapter = $1;
 					$chapter =~ s/'/\'/g;
 					$tagged = 1;
 					last SWITCH;
 				}
-				if (/\bDBsection\s*\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bDBsection\s*\(\s*'?(.*?)'?\s*\)/) {
 					$section = $1;
 					$section =~ s/'/\'/g;
 					last SWITCH;
 				}
-				if (/\bDate\s*\(\s*'(.*?)'\s*\)/) {
+				if (/#.*\bDate\s*\(\s*'(.*?)'\s*\)/) {
 					$date = $1;
 					$date =~ s/'/\'/g;
 					last SWITCH;
 				}
-				if (/\bInstitution\s*\(\s*'(.*?)'\s*\)/) {
+				if (/#.*\bInstitution\s*\(\s*'(.*?)'\s*\)/) {
 					$institution = $1;
 					$institution =~ s/'/\'/g;
 					last SWITCH;
 				}
-				if (/\bAuthor\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bAuthor\(\s*'?(.*?)'?\s*\)/) {
 					$author = $1;
 					$author =~ s/'/\'/g;
 					last SWITCH;
 				}
-				if (/\bTitleText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bMLTleader\(\s*'?(.*?)'?\s*\)/) {
+					$morelt_leader = $1;
+					$morelt_leader =~ s/['"]//g;
+					$morelt_leader= ($morelt_leader =~ /\S/) ? 1 : 0;
+					last SWITCH;
+				}
+				if (/#.*\bMLT\(\s*'?(.*?)'?\s*\)/) {
+					$morelt = $1;
+					$morelt =~ s/'//g;
+					$morelt = lc($morelt);
+					last SWITCH;
+				}
+				if (/#.*\bTitleText(\d+)\(\s*'?(.*?)'?\s*\)/) {
 					$textno = $1;
 					$text = $2;
 					$text =~ s/'/\'/g;
@@ -476,7 +509,7 @@ sub pgfiles {
 					}
 					last SWITCH;
 				}
-				if (/\bEditionText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bEditionText(\d+)\(\s*'?(.*?)'?\s*\)/) {
 					$textno = $1;	
 					$edition = $2;
 					$edition =~ s/'/\'/g;
@@ -486,7 +519,7 @@ sub pgfiles {
 					}
 					last SWITCH;
 				}
-				if (/\bAuthorText(\d+)\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bAuthorText(\d+)\(\s*'?(.*?)'?\s*\)/) {
 					$textno = $1;
 					$textauthor = $2;
 					$textauthor =~ s/'/\'/g;
@@ -496,7 +529,7 @@ sub pgfiles {
 					}
 					last SWITCH;
 				}
-				if (/\bSection(\d+)\(\s*'?(.*?)'?\s*\)/) {
+				if (/#.*\bSection(\d+)\(\s*'?(.*?)'?\s*\)/) {
 					$textno = $1;
 					$textsection = $2;
 					$textsection =~ s/'/\'/g;
@@ -513,7 +546,7 @@ sub pgfiles {
 					}
 					last SWITCH;
 				}
-				if (/\bProblem(\d+)\(\s*(.*?)\s*\)/) {
+				if (/#.*\bProblem(\d+)\(\s*(.*?)\s*\)/) {
 					$textno = $1;
 					$textproblem = $2;
 					$textproblem =~ s/\D/ /g;
@@ -537,6 +570,7 @@ sub pgfiles {
 			#
 			# kludge to fix the omission of a subject field
 			unless($subject) {
+print "NO SUBJECT $name\n";
 				if ($text =~ /precalculus/i) {
 					$subject = "Precalculus";
 				} elsif ($text =~ /calculus/i) {
@@ -570,6 +604,10 @@ sub pgfiles {
 			#    in that file.
 			#
 
+			# Fill in missing data with Misc. instead of blank
+			$chapter = 'Misc.' unless $chapter =~ /\S/;
+			$section = 'Misc.' unless $section =~ /\S/;
+
 			#selectrow_array returns first field of first row in scalar context or undef 
 			# undef for failure also, $dbh->{RaiseError} = 1 should catch that case.
 			#
@@ -672,13 +710,47 @@ sub pgfiles {
 						\"$author_id\",
 						\"$institution\",
 						\"$path_id\",
-						\"$pgfile\"
+						\"$pgfile\",
+						\"\" # morelt_id filled in below
 					)"
 					);
 			dbug "INSERT INTO pgfile VALUES( \"\", \"$DBsection_id\", \"$author_id\", \"$institution\", \"$path_id\", \"$pgfile\", \"\" )\n";
 			$query = "SELECT pgfile_id FROM `$tables{pgfile}` WHERE filename = \"$pgfile\" and path_id=$path_id";
 			$pgfile_id = $dbh->selectrow_array($query);
 
+			# morelt table, and morelt_pgfile many-many table
+			if($morelt) {
+				$query = "SELECT morelt_id FROM `$tables{morelt}` WHERE name = \"$morelt\"";
+				$morelt_id = $dbh->selectrow_array($query);
+				if (!defined($morelt_id)) {
+					$dbh->do("INSERT INTO `$tables{morelt}`
+							VALUES(
+								\"\",
+								\"$morelt\",
+								\"$DBsection_id\",
+								\"\"
+					)");
+					dbug "INSERT INTO morelt VALUES( \"\", \"$morelt\", \"$pgfile_id\" )\n";
+				}
+				$morelt_id = $dbh->selectrow_array($query);
+				$dbh->do("UPDATE `$tables{pgfile}` SET
+					morelt_id = \"$morelt_id\"
+					WHERE pgfile_id = \"$pgfile_id\" "
+				);
+				dbug "UPDATE pgfile morelt_id for $pgfile_id to $morelt_id\n";
+				if($morelt_leader) {
+					$dbh->do("UPDATE `$tables{morelt}` SET
+							leader = \"$pgfile_id\"
+							WHERE morelt_id = \"$morelt_id\" "
+					);
+					dbug "UPDATE morelt leader for $morelt_id to $pgfile_id\n";
+				}
+				$dbh->do("INSERT INTO `$tables{morelt_pgfile}`
+					VALUES(\"$morelt_id\", \"$pgfile_id\")");
+				dbug "INSERT INTO `$tables{morelt_pgfile}`
+					VALUES($morelt_id, $pgfile_id)";
+			}
+
 			# keyword table, and problem_keyword many-many table
 			#
 			foreach my $keyword (@keyword) {

conf/database.conf.dist

@@ -286,7 +286,8 @@ $dbLayouts{sql_single} = {
 		source => $database_dsn,
 		params => { %sqlParams,
 			tableOverride => "${courseName}_achievement"
-
+		},
+	},
 	past_answer => {
 		record => "WeBWorK::DB::Record::PastAnswer",
 		schema => "WeBWorK::DB::Schema::NewSQL::Std",
@@ -297,7 +298,6 @@ $dbLayouts{sql_single} = {
 	 	},
     },
 
-
 	achievement_user => {
 		record => "WeBWorK::DB::Record::UserAchievement",
 		schema => "WeBWorK::DB::Schema::NewSQL::Std",

conf/defaults.config

@@ -472,14 +472,22 @@ my $achievementTablesExist = (defined ($dbLayouts{$dbLayoutName}{global_user_ach
 ################################################################################
 # Problem library options
 ################################################################################
+# 
+# The problemLibrary configuration data should now be set in localOverrides.conf
 
 # For configuration instructions, see:
 # http://webwork.maa.org/wiki/National_Problem_Library
-# Set the location of the library in site.conf
-# These values usually do not need to be edited.
-
-# Problem Library version (currently version 2).
-$problemLibrary{version} = "2";
+# The directory containing the natinal problem library files. 
+# Set the root to "" if no problem
+# library is installed. Use version 2.0 for the NPL and use the version 2.5  for the OPL. 
+# When changing from the NPL to the OPL it is important to change the version number
+# because the names of the tables in the database have changed.
+
+#RE-CONFIGURE problemLibrary values in localOverrides.conf  
+#################################################
+$problemLibrary{root}        ="/opt/webwork/libraries/webwork-open-problem-library/OpenProblemLibrary";
+$problemLibrary{version}     ="2.0"; # 2.0 for NPL, 2.5 for OPL
+###########################################################
 
 # Problem Library SQL database connection information
 $problemLibrary_db = {
@@ -623,6 +631,7 @@ $authen{proctor_module} = "WeBWorK::Authen::Proctor";
 	edit_achievements			   => "professor",
 	create_and_delete_courses      => "professor",
 	fix_course_databases           => "professor",
+	modify_tags                    => undef,
 
 	##### Behavior of the interactive problem processor #####
 
@@ -1314,4 +1323,5 @@ A value such as 0.1 means 0.1 percent error is allowed.",
 
 
 include("conf/localOverrides.conf");
+
 1; #final line of the file to reassure perl that it was read properly.

conf/localOverrides.conf.dist

@@ -90,15 +90,20 @@ $webworkFiles{screenSnippets}{setHeader}         = "$webworkDirs{conf}/snippets/
 
 
 ################################################################################
-# National Problem Library
+# National Problem Library / Open Problem Library
 ################################################################################
 
 
 # For configuration instructions, see:
 # http://webwork.maa.org/wiki/National_Problem_Library
-# The directory containing the natinal problem library files. Set to "" if no problem
-# library is installed.
-$problemLibrary{root}        ="/opt/webwork/libraries/NationalProblemLibrary";
+# The directory containing the natinal problem library files. 
+# Set the root to "" if no problem
+# library is installed. Use version 2.0 for the NPL and use the version 2.5  for the OPL. 
+# When changing from the NPL to the OPL it is important to change the version number
+* because the names of the tables in the database have changed.
+
+$problemLibrary{root}        ="/opt/webwork/libraries/webwork-open-problem-library/OpenProblemLibrary";
+$problemLibrary{version}     ="2.5";
 
 # Additional library buttons can be added to the Library Browser (SetMaker.pm)
 # by adding the libraries you want to the following line.  For each key=>value
@@ -152,9 +157,14 @@ $courseFiles{problibs}    = {
 
 #  $permissionLevels{login} = "guest";
 
+
 # The above code would give the permission to login to any user with permission
 # level guest or higher.
 
+$permissionLevels{dont_log_past_answers} = undef;
+#$permissionLevels{record_set_version_answers_when_acting_as_student} = "professor";
+#$permissionLevels{record_answers_when_acting_as_student}             = "professor";
+
 ################################################################################
 # PG subsystem options
 ################################################################################
@@ -246,15 +256,18 @@ $problemDefaults{max_attempts} = -1;
  	homeworkseteditor1 => 1,
 # 	homeworkseteditor2 => 1,
 # 	
+# 	librarybrowsernojs    => 1,
  	librarybrowser1    => 1,
 # 	librarybrowser2    => 1,
 # 	librarybrowser3    => 1,
 # 	
 	pgproblemeditor1   => 1,
 # 	pgproblemeditor2   => 1,
 # 	pgproblemeditor3   => 1,
+
 );
 
+
 ################################################################################
 # Directory for temporary files
 ################################################################################