Classlist Manager has improved performance

.gitignore

@@ -1,4 +1,5 @@
-vn
+*~
+.svn
 .DS_Store
 .*
 *~
@@ -13,8 +14,4 @@ htdocs/applets/*.swf
 bin/wwapache2ctl
 webwork2.komodoproject
 #courses.dist/*
-node_modules
-node_modules/*
-WeBWorK.sublime-project
-WeBWorK.sublime-workspace
-conf/*.apache-config
+library-tree.json

VERSION

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

bin/build_library_directory_tree

@@ -0,0 +1,84 @@
+#!/usr/bin/env perl
+
+# This is the script build-library-directory-tree
+
+# This is used to create the file library-directory-tree.json which can be used to load in 
+# directory information for the OPL.  It writes the file as a JSON of directories to be easily loaded. 
+
+use strict;
+use warnings;
+use File::Find::Rule;
+use File::Basename;
+use Cwd;
+use DBI;
+use JSON;
+
+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 = '';
+}
+
+# Get database connection
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+
+my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $libraryRoot = $ce->{problemLibrary}->{root};
+$libraryRoot =~ s|/+$||;
+my $libraryVersion = $ce->{problemLibrary}->{version};
+
+my($filename, $directories) = fileparse($libraryRoot);
+my $dirs = buildTree($libraryRoot);
+
+
+#$dbh->disconnect;
+
+my $webwork_htdocs = $ce->{webwork_dir}."/htdocs";
+my $file = "$webwork_htdocs/library-directory-tree.json";
+
+# use a variable for the file handle
+my $OUTFILE;
+
+# use the three arguments version of open
+# and check for errors
+open $OUTFILE, '>', $file  or die "Cannot open $file";
+
+# you can check for errors (e.g., if after opening the disk gets full)
+print { $OUTFILE } to_json($dirs) or die "Cannot write to $file";
+
+# check for errors
+close $OUTFILE or die "Cannot close $file";
+
+
+print "Wrote Library Tree to $file\n";
+
+sub buildTree {
+	my $absoluteDir = shift;
+	my $branch = {};
+	my ($name,$dir) = fileparse($absoluteDir);
+	$branch->{name} = $name;
+	my @dirs = File::Find::Rule->maxdepth(1)->relative(1)->directory->in($absoluteDir);
+	if (scalar(@dirs)==0){
+		return undef;
+	}
+
+	my @branches = ();
+
+	for my $dir (@dirs){
+		my $theBranch = buildTree($absoluteDir . "/" . $dir);
+		if ($theBranch) {
+			push(@branches,$theBranch)
+		} else {
+			$b = {};
+			$b->{name} = $dir;
+			push(@branches,$b);
+		}
+	}
+
+	$branch->{subfields} = \@branches;
+
+	return $branch;
+}

bin/build_library_subject_tree

@@ -0,0 +1,141 @@
+#!/usr/bin/env perl
+
+# This is the script build-library-tree
+
+# This is used to create the file library-tree.json which can be used to load in 
+# subject-chapter-section information for the OPL
+
+use strict;
+use warnings;
+use File::Find;
+use File::Basename;
+use Cwd;
+use DBI;
+use JSON;
+
+ #(maximum varchar length is 255 for mysql version < 5.0.3.  
+ #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 = '';
+}
+
+# Get database connection
+
+use lib "$ENV{WEBWORK_ROOT}/lib";
+use WeBWorK::CourseEnvironment;
+
+my $ce = new WeBWorK::CourseEnvironment({webwork_dir=>$ENV{WEBWORK_ROOT}});
+my $dbh = DBI->connect(
+        $ce->{database_dsn},
+        $ce->{database_username},
+        $ce->{database_password},
+        {
+                PrintError => 0,
+                RaiseError => 1,
+        },
+);
+
+my $passwd = $ce->{database_password};
+my $user = $ce->{database_username};
+my $libraryRoot = $ce->{problemLibrary}->{root};
+$libraryRoot =~ s|/+$||;
+my $libraryVersion = $ce->{problemLibrary}->{version};
+
+
+my $tree;  # the library subject tree will be stored as arrays of objects. 
+
+my $sth = $dbh->prepare("select * from OPL_DBsubject");
+$sth->execute;
+
+my @subjects = ();
+my @subject_names = ();
+while ( my @row = $sth->fetchrow_array ) {
+	push(@subjects,$row[0]);
+	push(@subject_names,$row[1]);
+  }
+
+
+my @subject_tree;  # array to store the individual library tree for each subject 
+
+foreach my $i (0..$#subjects){
+
+	my $subject_row = $subjects[$i];
+	my $subject_name = $subject_names[$i];
+
+	my $sth = $dbh->prepare("select * from OPL_DBchapter where DBsubject_id = $subject_row;");
+	$sth->execute;
+
+	my @chapters = ();
+	my @chapter_names = ();
+	while ( my @row = $sth->fetchrow_array ) {
+		push(@chapters,$row[0]);
+		push(@chapter_names,$row[1]);
+	  }
+
+
+	my @chapter_tree; # array to store the individual library tree for each chapter
+
+	foreach my $j (0..$#chapters) {
+		my $chapter_row = $chapters[$j];
+		my $chapter_name = $chapter_names[$j];
+		my $sth = $dbh->prepare("SELECT * FROM OPL_DBsection WHERE DBchapter_id=$chapter_row");
+		$sth->execute;
+
+		my @subfields = ();
+		while ( my @row = $sth->fetchrow_array ) {
+			my $section_name;
+			$section_name->{name} = $row[1];
+			my $clone = { %{ $section_name } };  # need to clone it before pushing into the @subfields array.
+		    push(@subfields,$clone);
+	    }
+
+		my $chapter_tree;
+		$chapter_tree->{name} = $chapter_name;
+		$chapter_tree->{subfields} = \@subfields;
+
+		my $clone = { %{ $chapter_tree } };  # need to clone it before pushing into the @chapter_tree array.
+		push(@chapter_tree,$clone);
+
+
+
+	}
+
+	my $subject_tree; 
+	$subject_tree->{name} = $subject_name;
+	$subject_tree->{subfields} = \@chapter_tree; 
+
+	my $clone = { % {$subject_tree}};
+	push (@subject_tree, $clone);
+}
+
+	#print to_json(\@subject_tree);
+	#print "\n\n";
+
+
+
+
+$dbh->disconnect;
+
+my $webwork_htdocs = $ce->{webwork_dir}."/htdocs";
+my $file = "$webwork_htdocs/library-tree.json";
+
+# use a variable for the file handle
+my $OUTFILE;
+
+# use the three arguments version of open
+# and check for errors
+open $OUTFILE, '>', $file  or die "Cannot open $file";
+
+# you can check for errors (e.g., if after opening the disk gets full)
+print { $OUTFILE } to_json(\@subject_tree) or die "Cannot write to $file";
+
+# check for errors
+close $OUTFILE or die "Cannot close $file";
+
+
+print "Wrote Library Tree to $file\n";
+

conf/defaults.config

@@ -762,7 +762,7 @@ $session_management_via = "key";
 $pg{displayModes} = [
 #	"plainText",     # display raw TeX for math expressions
 	"images",        # display math expressions as images generated by dvipng
-#	"MathJax",       # render TeX math expressions on the client side using MathJax --- we strongly recommend people install and use MathJax
+	"MathJax",       # render TeX math expressions on the client side using MathJax --- we strongly recommend people install and use MathJax
 ];
 
 ###########################################################################################
@@ -773,7 +773,7 @@ $pg{displayModes} = [
 ###########################################################################################
 
 # Default display mode. Should be listed above (uncomment only one).
-$pg{options}{displayMode}        = "images";
+$pg{options}{displayMode}        = "MathJax";
 
 # The default grader to use, if a problem doesn't specify.
 $pg{options}{grader}             = "avg_problem_grader";
@@ -1468,7 +1468,43 @@ A value such as 0.1 means 0.1 percent error is allowed.",
 		  type => 'list',
 		  hashVar => '{mail}->{feedbackRecipients}'
 		}
-	]	
+	],
+	['Editor',
+		{ var => 'editor{author}',
+		  doc => 'Default name of the problem author',
+		  doc2 => 'In the PGSimpleEditor, this will automatically fill the problem Author field.',
+		  width => 45,
+		  type => 'text',
+		  hashVar => '{editor}->{author}'
+		},
+		{ var => 'editor{authorInstitute}',
+		  doc => 'Institute of the problem author',
+		  doc2 => 'In the PGSimpleEditor, this will automatically fill the institute field of the problem author',
+		  width => 45,
+		  type => 'text',
+		  hashVar => '{editor}->{authorInstitute}'
+		 },
+		{ var => 'editor{textTitle}',
+		  doc => 'Text Title of the problems',
+		  doc2 => 'In the PGSimpleEditor, this will automatically fill the text title field',
+		  width => 45,
+		  type => 'text',
+		  hashVar => '{editor}->{textTitle}'
+		},
+		{ var => 'editor{textEdition}',
+		  doc => 'Text Edition of the problems',
+		  doc2 => 'In the PGSimpleEditor, this will automatically fill the text edition field',
+		  width => 45,
+		  type => 'text',
+		  hashVar => '{editor}->{textEdition}'
+		},
+		{ var => 'editor{textAuthor}',
+		  doc => 'Text Author of the problems',
+		  doc2 => 'In the PGSimpleEditor, this will automatically fill the text author field',
+		  width => 45,
+		  type => 'text',
+		  hashVar => '{editor}->{textAuthor}'
+		}]	
 ];