--- loncom/homework/imageresponse.pm	2001/02/22 01:13:43	1.3
+++ loncom/homework/imageresponse.pm	2001/06/02 03:59:59	1.8
@@ -11,40 +11,34 @@ sub BEGIN {
 }
 
 sub start_imageresponse {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   #when in a radiobutton response use these
-  &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle'));
+  &Apache::lonxml::register('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+  push (@Apache::lonxml::namespace,'imageresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   return '';
 }
 
 sub end_imageresponse {
   &Apache::response::end_response;
+  pop @Apache::lonxml::namespace;
   return '';
 }
 
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
-  return '';
-}
-
-sub setrandomnumber {
-  my $rndseed=&Apache::lonnet::rndseed();
-  $rndseed=unpack("%32i",$rndseed);
-  $rndseed=$rndseed
-    +&Apache::lonnet::numval($Apache::inputtags::part)
-      +&Apache::lonnet::numval($Apache::inputtags::response['-1']);
-  srand($rndseed);
+  $Apache::imageresponse::conceptgroup=0;
+  &Apache::response::setrandomnumber();
   return '';
 }
 
 sub getfoilcounts {
   my ($parstack,$safeeval)=@_;
-  my $rrargs ='';
-  if ( $#$parstack > 0 ) { $rrargs=$$parstack['-2']; }
-  my $max = &Apache::run::run("{$rrargs;".'return $max}',$safeeval);
-  my $count = $#{ $Apache::response::foilgroup{'names'} };
+
+  my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
+  # +1 since instructors will count from 1
+  my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
   return ($count,$max);
 }
 
@@ -53,7 +47,8 @@ sub whichfoils {
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();
   while ((($#whichopt+1) < $max) && ($#names > -1)) {
-    my $aopt=int rand $#names;
+    &Apache::lonxml::debug("Have $#whichopt max is $max");
+    my $aopt=int(rand($#names+1));
     &Apache::lonxml::debug("From $#names elms, picking $aopt");
     $aopt=splice(@names,$aopt,1);
     &Apache::lonxml::debug("Picked $aopt");
@@ -118,11 +113,10 @@ sub gradefoils {
 }
 
 sub end_foilgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   my @whichopt;
   if ($target eq 'web' || $target eq 'grade') {
-    &setrandomnumber();
     my ($count,$max) = &getfoilcounts($parstack,$safeeval);
     if ($count>$max) { $count=$max }
     &Apache::lonxml::debug("Count is $count from $max");
@@ -140,64 +134,92 @@ sub end_foilgroup {
 }
 
 sub start_conceptgroup {
+  $Apache::imageresponse::conceptgroup=1;
+  %Apache::response::conceptgroup={};
+  return '';
 }
 
 sub end_conceptgroup {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::imageresponse::conceptgroup=0;  
+  if ($target eq 'web' || $target eq 'grade') {
+    my @names = @{ $Apache::response::conceptgroup{'names'} };
+    my $pick=int(rand($#names+1));
+    my $name=$names[$pick];
+    push @{ $Apache::response::foilgroup{'names'} }, $name;
+    $Apache::response::foilgroup{"$name.text"} = $Apache::response::conceptgroup{"$name.text"};
+    $Apache::response::foilgroup{"$name.image"} = $Apache::response::conceptgroup{"$name.image"};
+    push(@{ $Apache::response::foilgroup{"$name.area"} }, @{ $Apache::response::conceptgroup{"$name.area"} });
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
+    $Apache::response::foilgroup{"$name.concept"} = $concept;
+    &Apache::lonxml::debug("Selecting $name in $concept");
+  }
+  return '';
 }
 
 $Apache::imageresponse::curname='';
 sub start_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {
-    my $args ='';
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
+    my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     if ($name eq '') { $name=$Apache::lonxml::curdepth; }
-    push(@{ $Apache::response::foilgroup{'names'} }, $name);
+    if ( $Apache::imageresponse::conceptgroup ) {
+      push(@{ $Apache::response::conceptgroup{'names'} }, $name);
+    } else {
+      push(@{ $Apache::response::foilgroup{'names'} }, $name);
+    }
     $Apache::imageresponse::curname=$name;
   }
   return '';
 }
 
 sub end_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   return '';
 }
 
 sub start_text {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
 sub end_text {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;
-    $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
+    if ( $Apache::imageresponse::conceptgroup ) {
+      $Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
+    } else {
+      $Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection;
+    }
   }
   return '';
 }
 
 sub start_image {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
   return '';
 }
 
 sub end_image {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web') {
     my $name = $Apache::imageresponse::curname;
     my $image = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $image");
-    $Apache::response::foilgroup{"$name.image"} = $image;
+    if ( $Apache::imageresponse::conceptgroup ) {
+      $Apache::response::conceptgroup{"$name.image"} = $image;
+    } else {
+      $Apache::response::foilgroup{"$name.image"} = $image;
+    }
   }
   return '';
 }
 
 sub start_rectangle {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
   return '';
 }
@@ -218,12 +240,16 @@ sub grade_rectangle {
 }
 
 sub end_rectangle {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web' || $target eq 'grade') {
     my $name = $Apache::imageresponse::curname;
     my $area = &Apache::lonxml::endredirection;
     &Apache::lonxml::debug("out is $area for $name");
-    push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
+    if ( $Apache::imageresponse::conceptgroup ) {
+      push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
+    } else {
+      push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area";
+    }
   }
   return '';
 }