--- loncom/homework/default_homework.lcpm	2011/02/26 17:50:13	1.152
+++ loncom/homework/default_homework.lcpm	2011/05/22 03:04:51	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.152 2011/02/26 17:50:13 raeburn Exp $
+# $Id: default_homework.lcpm,v 1.155 2011/05/22 03:04:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1125,11 +1125,24 @@ sub class {
     return $course;
 }
 
+sub classid {
+    my $courseid = &EXT('request.course.id');
+    $courseid = '' if $courseid eq "";
+    return $courseid;
+}
+
 sub firstname {
     my $firstname = &EXT('environment.firstname');
     $firstname = '' if $firstname eq "";
     return $firstname;
 }
+
+sub middlename {
+    my $middlename = &EXT('environment.middlename');
+    $middlename = '' if $middlename eq "";
+    return $middlename;
+}
+
                                                                                 
 sub lastname {
     my $lastname = &EXT('environment.lastname');
@@ -1196,6 +1209,40 @@ sub answer_date_epoch {
     return &EXT('resource.'.$partid.'.answerdate');
 }
 
+sub parameter_setting {
+    my ($which,$partid)=@_;
+    unless ($partid) { $partid=0; }
+    return &EXT('resource.'.$partid.'.'.$which);
+}
+
+sub stored_data {
+    my ($which,$partid)=@_;
+    unless ($partid) { $partid=0; }
+    return &EXT('user.resource.resource.'.$partid.'.'.$which);
+}
+
+sub wrong_bubbles {
+    my ($correct,$lower,$upper,$step,@given)=@_;
+    my @array=();
+    my %hash=();
+    foreach my $new (@given) {
+        $hash{$new}=1;
+    }
+    my $num=int(&parameter_setting('numbubbles',&currentpart()));
+    unless ($num) { $num=8; }
+    if ($num>1) {
+        for (my $i=0;$i<=500;$i++) {
+            my $new=&random($lower,$upper,$step);
+            if ($hash{$new}) { next; }
+            if (abs($new-$correct)<$step) { next; }
+            $hash{$new}=1;
+            @array=keys(%hash);
+            if ($#array+2>=$num) { last; }
+        }
+    }
+    return @array;
+}
+
 sub array_moments {
     my @input=@_;
     my (@output,$N);