--- loncom/homework/imageresponse.pm	2001/05/15 20:48:43	1.6
+++ loncom/homework/imageresponse.pm	2001/05/31 22:34:33	1.7
@@ -13,7 +13,7 @@ sub BEGIN {
 sub start_imageresponse {
   my ($target,$token,$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 '';
@@ -28,17 +28,17 @@ sub end_imageresponse {
 %Apache::response::foilgroup={};
 sub start_foilgroup {
   %Apache::response::foilgroup={};
-  $Apache::optionresponse::conceptgroup=0;
+  $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);
 }
 
@@ -46,8 +46,9 @@ sub whichfoils {
   my ($max)=@_;
   my @names = @{ $Apache::response::foilgroup{'names'} };
   my @whichopt =();
-  while ((($#whichopt) < $max) && ($#names > -1)) {
-    my $aopt=int rand $#names;
+  while ((($#whichopt+1) < $max) && ($#names > -1)) {
+    &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");
@@ -133,25 +134,23 @@ sub end_foilgroup {
 }
 
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
+  $Apache::imageresponse::conceptgroup=1;
   %Apache::response::conceptgroup={};
   return '';
 }
 
 sub end_conceptgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::conceptgroup=0;  
+  $Apache::imageresponse::conceptgroup=0;  
   if ($target eq 'web' || $target eq 'grade') {
     my @names = @{ $Apache::response::conceptgroup{'names'} };
-    my $pick=int rand $#names+1;
+    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 $args;
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
+    my $concept = &Apache::lonxml::get_param('concept',$parstack,$safeeval);
     $Apache::response::foilgroup{"$name.concept"} = $concept;
     &Apache::lonxml::debug("Selecting $name in $concept");
   }
@@ -162,11 +161,13 @@ $Apache::imageresponse::curname='';
 sub start_foil {
   my ($target,$token,$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 '';
@@ -187,7 +188,11 @@ sub end_text {
   my ($target,$token,$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 '';
 }
@@ -204,7 +209,11 @@ sub end_image {
     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 '';
 }
@@ -236,7 +245,11 @@ sub end_rectangle {
     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 '';
 }