[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.pm

Revision Data
-------------
Index: Instructor.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor.pm,v
retrieving revision 1.64
retrieving revision 1.65
diff -Llib/WeBWorK/ContentGenerator/Instructor.pm -Llib/WeBWorK/ContentGenerator/Instructor.pm -u -r1.64 -r1.65
--- lib/WeBWorK/ContentGenerator/Instructor.pm
+++ lib/WeBWorK/ContentGenerator/Instructor.pm
@@ -518,6 +518,9 @@
 sub addProblemToSet {
 	my ($self, %args) = @_;
 	my $db = $self->r->db;
+	my $value_default = $self->{ce}->{problemDefaults}->{value};
+	my $max_attempts_default = $self->{ce}->{problemDefaults}->{max_attempts};	
+	
 
 	die "addProblemToSet called without specifying the set name." if $args{setName} eq "";
 	my $setName = $args{setName};
@@ -526,8 +529,8 @@
 		die "addProblemToSet called without specifying the sourceFile.";
 
 	# The rest of the arguments are optional
-	my $value = $args{value} || 1;
-	my $maxAttempts = $args{maxAttempts} || -1;
+	my $value = $args{value} || $value_default;
+	my $maxAttempts = $args{maxAttempts} || $max_attempts_default;
 	my $problemID = $args{problemID};
 
 	unless ($problemID) {