[WWcvs] webwork2: Allow users to specify default values for max_attempts and value of a problem

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Allow users to specify default values for max_attempts and value of a problem

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        ProblemSetList.pm

Revision Data
-------------
Index: ProblemSetList.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm,v
retrieving revision 1.107
retrieving revision 1.108
diff -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -Llib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm -u -r1.107 -r1.108
--- lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/ProblemSetList.pm
@@ -1574,6 +1574,8 @@
 	my ($self, $fileName) = @_;
 	my $templateDir   = $self->{ce}->{courseDirs}->{templates};
 	my $filePath      = "$templateDir/$fileName";
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};
 
 	my $setName = '';
 
@@ -1761,10 +1763,10 @@
 			$name =~ s/\s*//g;
 			$value = "" unless defined($value);
 			$value =~ s/[^\d\.]*//g;
-			unless ($value =~ /\d+/) {$value = 1;}
+			unless ($value =~ /\d+/) {$value = $value_default;}
 			$attemptLimit = "" unless defined($attemptLimit);
 			$attemptLimit =~ s/[^\d-]*//g;
-			unless ($attemptLimit =~ /\d+/) {$attemptLimit = -1;}
+			unless ($attemptLimit =~ /\d+/) {$attemptLimit = $max_attempts_default;}
 			$continueFlag = "0" unless( defined($continueFlag) && @problemData );  
 			# can't put continuation flag onto the first problem
 			push(@problemData, {source_file    => $name,