--- loncom/homework/imageresponse.pm	2001/03/01 01:19:50	1.4
+++ loncom/homework/imageresponse.pm	2001/08/06 17:39:37	1.11
@@ -1,253 +1,314 @@
-# The LearningOnline Network with CAPA
-# iimage click response style
+# The LON-CAPA image response handler
+# 
+# Image click response style
+#
+# YEAR=2001
+# 2/7,2/9,2/22,3/1,5/4,5/15,5/31,6/2,6/26 Guy Albertelli
+# 8/6 Scott Harrison
 
-#FIXME assumes multiple possbile submissions but only one is possible currently
+#FIXME assumes multiple possible submissions but only one is possible currently
 
 package Apache::imageresponse;
 use strict;
 
+# ======================================================================= BEGIN
 sub BEGIN {
-  &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
+    &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
 }
 
+# ======================================================== Start image response
 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'));
-  my $id = &Apache::response::start_response($parstack,$safeeval);
-  return '';
+    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',
+						       'conceptgroup'));
+    push (@Apache::lonxml::namespace,'imageresponse');
+    my $id = &Apache::response::start_response($parstack,$safeeval);
+    return '';
 }
 
+# ========================================================== End image response
 sub end_imageresponse {
-  &Apache::response::end_response;
-  return '';
+    &Apache::response::end_response;
+    pop @Apache::lonxml::namespace;
+    return '';
 }
 
-%Apache::response::foilgroup={};
+%Apache::response::foilgroup = {};
+# ============================================================ Start foil group
 sub start_foilgroup {
-  %Apache::response::foilgroup={};
-  $Apache::optionresponse::conceptgroup=0;
-  &setrandomnumber();
-  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);
-  return '';
+    %Apache::response::foilgroup = {};
+    $Apache::imageresponse::conceptgroup = 0;
+    &Apache::response::setrandomnumber();
+    return '';
 }
 
+# =================================== Get foil counts (returns 2 element array)
 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'} };
-  return ($count,$max);
+    my ($parstack,$safeeval) = @_;
+    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);
 }
 
+# ============================================== Which foils (returns an array)
 sub whichfoils {
-  my ($max)=@_;
-  my @names = @{ $Apache::response::foilgroup{'names'} };
-  my @whichopt =();
-  while ((($#whichopt+1) < $max) && ($#names > -1)) {
-    my $aopt=int rand $#names;
-    &Apache::lonxml::debug("From $#names elms, picking $aopt");
-    $aopt=splice(@names,$aopt,1);
-    &Apache::lonxml::debug("Picked $aopt");
-    push (@whichopt,$aopt);
-  }
-  return @whichopt;
+    my ($max) = @_;
+    if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }
+    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @whichopt =();
+    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");
+	push (@whichopt,$aopt);
+    }
+    return @whichopt;
 }
 
+# ======================================= Display foils (returns scalar string)
 sub displayfoils {
-  my (@whichopt) = @_;
-  my $result ='';
-  my $name;
-  my $temp=1;
-  foreach $name (@whichopt) {
-    $result.=$Apache::response::foilgroup{"$name.text"}."<br />\n";
-    my $image=$Apache::response::foilgroup{"$name.image"};
-    if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) {
-      $result.="<img src=\"$image\"/> <br />\n";
-    } else {
-      $result.="<input type=\"image\" name=\"HWVAL_$Apache::inputtags::response['-1']:$temp\" src=\"$image\"/> <br />\n";
-    }
-    $temp++;
-  }
-  return $result;
+    my (@whichopt) = @_;
+    my $result ='';
+    my $name;
+    my $temp = 1;
+    foreach $name (@whichopt) {
+	$result .= $Apache::response::foilgroup{"$name.text"}."<br />\n";
+	my $image = $Apache::response::foilgroup{"$name.image"};
+	if ($Apache::lonhomework::history{'resource.'.
+					  $Apache::inputtags::part.
+					  '.solved'} =~ /^correct/) {
+	    $result .= "<img src=\"$image\"/> <br />\n";
+	} else {
+	    $result .= "<input type=\"image\" name=\"HWVAL_".
+		       $Apache::inputtags::response['-1'].
+		       ":$temp\" src=\"$image\"/> <br />\n";
+	}
+	$temp++;
+    }
+    return $result;
 }
 
+# ================================================================= Grade foils
 sub gradefoils {
-  my (@whichopt) = @_;
-  my $result='';
-  my $x;
-  my $y;
-  my $result;
-  my $id=$Apache::inputtags::response['-1'];
-  my $temp=1;
-  foreach my $name (@whichopt) {
-    $x=$ENV{"form.HWVAL_$id:$temp.x"};
-    $y=$ENV{"form.HWVAL_$id:$temp.y"};
-    &Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
-    my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
-    my $grade="INCORRECT";
-    foreach my $area (@areas) {
-      &Apache::lonxml::debug("Area is $area for $name");
-      $area =~ m/([a-z]*):/;
-      &Apache::lonxml::debug("Area of type $1");
-      if ($1 eq 'rectangle') {
-	$grade=&grade_rectangle($area,$x,$y);
-      } else {
-	&Apache::lonxml::error("Unknown area style $area");
-      }
-      &Apache::lonxml::debug("Area said $grade");
-      if ($grade eq 'APPROX_ANS') { last; }
-    }
-    &Apache::lonxml::debug("Foil was $grade");
-    if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
-    if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
-    &Apache::lonxml::debug("Question is $result");
-    $temp++;
-  }
-  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
-  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
-  return '';
+    my (@whichopt) = @_;
+    my $result = '';
+    my $x;
+    my $y;
+    my $result;
+    my $id = $Apache::inputtags::response['-1'];
+    my $temp = 1;
+    foreach my $name (@whichopt) {
+	$x = $ENV{"form.HWVAL_$id:$temp.x"};
+	$y = $ENV{"form.HWVAL_$id:$temp.y"};
+	&Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
+	if (defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
+	    my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+	    my $grade = "INCORRECT";
+	    foreach my $area (@areas) {
+		&Apache::lonxml::debug("Area is $area for $name");
+		$area =~ m/([a-z]*):/;
+		&Apache::lonxml::debug("Area of type $1");
+		if ($1 eq 'rectangle') {
+		    $grade = &grade_rectangle($area,$x,$y);
+		} else {
+		    &Apache::lonxml::error("Unknown area style $area");
+		}
+		&Apache::lonxml::debug("Area said $grade");
+		if ($grade eq 'APPROX_ANS') { last; }
+	    }
+	    &Apache::lonxml::debug("Foil was $grade");
+	    if ($grade eq 'INCORRECT') { $result = 'INCORRECT'; }
+	    if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) {
+		$result = $grade; }
+	    &Apache::lonxml::debug("Question is $result");
+	    $temp++;
+	}
+    }
+    $Apache::lonhomework::results{'resource.'.
+				  $Apache::inputtags::part.
+				  ".$id.submission"} = "$x:$y";
+    $Apache::lonhomework::results{'resource.'.
+				  $Apache::inputtags::part.
+				  ".$id.awarddetail"} = $result;
+    return '';
 }
 
+# ======================================= End foil group (return scalar string)
 sub end_foilgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $result='';
-  my @whichopt;
-  if ($target eq 'web' || $target eq 'grade') {
-    my ($count,$max) = &getfoilcounts($parstack,$safeeval);
-    if ($count>$max) { $count=$max }
-    &Apache::lonxml::debug("Count is $count from $max");
-    @whichopt = &whichfoils($max);
-  }
-  if ($target eq 'web') {
-    $result=&displayfoils(@whichopt);
-  }
-  if ($target eq 'grade') {
-    if ( defined $ENV{'form.submitted'}) {
-      &gradefoils(@whichopt);
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    my $result = '';
+    my @whichopt;
+    if ($target eq 'web' || $target eq 'grade') {
+	my ($count,$max) = &getfoilcounts($parstack,$safeeval);
+	if ($count > $max) { $count = $max }
+	&Apache::lonxml::debug("Count is $count from $max");
+	@whichopt = &whichfoils($max);
+    }
+    if ($target eq 'web') {
+	$result = &displayfoils(@whichopt);
     }
-  }
-  return $result;
+    if ($target eq 'grade') {
+	if ( defined $ENV{'form.submitted'}) {
+	    &gradefoils(@whichopt);
+	}
+    }
+    return $result;
 }
 
+# ========================================================= Start concept group
 sub start_conceptgroup {
-  $Apache::optionresponse::conceptgroup=1;  
-  %Apache::response::conceptgroup={};
-  return '';
+    $Apache::imageresponse::conceptgroup = 1;
+    %Apache::response::conceptgroup = {};
+    return '';
 }
 
+# =========================================================== End concept group
 sub end_conceptgroup {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  $Apache::optionresponse::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 $args;
-    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-    my $concept = &Apache::run::run("{$args;".'return $concept}',$safeeval);
-    $Apache::response::foilgroup{"$name.concept"} = $concept;
-    &Apache::lonxml::debug("Selecting $name in $concept");
-  }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    $Apache::imageresponse::conceptgroup = 0;  
+    if ($target eq 'web' || $target eq 'grade') {
+	if (defined(@{ $Apache::response::conceptgroup{'names'} })) {
+	    my @names = @{ $Apache::response::conceptgroup{'names'} };
+	    my $pick = int(rand($#names+1));
+	    my $name = $names[$pick];
+	    if (defined(@{ $Apache::response::conceptgroup{"$name.area"} })) {
+		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='';
+$Apache::imageresponse::curname = '';
+# ================================================================== Start foil
 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);
-    if ($name eq '') { $name=$Apache::lonxml::curdepth; }
-    push(@{ $Apache::response::foilgroup{'names'} }, $name);
-    $Apache::imageresponse::curname=$name;
-  }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target eq 'web' || $target eq 'grade') {
+	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
+	if ($name eq '') { $name=$Apache::lonxml::curdepth; }
+	if ( $Apache::imageresponse::conceptgroup ) {
+	    push(@{ $Apache::response::conceptgroup{'names'} }, $name);
+	} else {
+	    push(@{ $Apache::response::foilgroup{'names'} }, $name);
+	}
+	$Apache::imageresponse::curname=$name;
+    }
+    return '';
 }
 
+# ==================================================================== End foil
 sub end_foil {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    return '';
 }
 
+# ================================================================== Start text
 sub start_text {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    if ($target eq 'web') { &Apache::lonxml::startredirection; }
+    return '';
 }
 
+# ==================================================================== End text
 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;
-  }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    if ($target eq 'web') {
+	my $name = $Apache::imageresponse::curname;
+	if ( $Apache::imageresponse::conceptgroup ) {
+	    $Apache::response::conceptgroup{"$name.text"} = 
+		                               &Apache::lonxml::endredirection;
+	} else {
+	    $Apache::response::foilgroup{"$name.text"} = 
+		                               &Apache::lonxml::endredirection;
+	}
+    }
+    return '';
 }
 
+# ================================================================= Start image
 sub start_image {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web') { &Apache::lonxml::startredirection; }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    if ($target eq 'web') { &Apache::lonxml::startredirection; }
+    return '';
 }
 
+# =================================================================== End image
 sub end_image {
-  my ($target,$token,$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;
-  }
-  return '';
+    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");
+	if ( $Apache::imageresponse::conceptgroup ) {
+	    $Apache::response::conceptgroup{"$name.image"} = $image;
+	} else {
+	    $Apache::response::foilgroup{"$name.image"} = $image;
+	}
+    }
+    return '';
 }
 
+# ============================================================= Start rectangle
 sub start_rectangle {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  if ($target eq 'web' || $target eq 'grade') { &Apache::lonxml::startredirection; }
-  return '';
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+    if ($target eq 'web' || $target eq 'grade') { 
+	&Apache::lonxml::startredirection;
+    }
+    return '';
 }
 
+# ====================================== Grade rectangle (return scalar string)
 sub grade_rectangle {
-  my ($spec,$x,$y) = @_;
-  &Apache::lonxml::debug("Spec is $spec");
-  $spec=~m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
-  my $x1=$1;
-  my $y1=$2;
-  my $x2=$3;
-  my $y2=$4;
-  &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
-  if ($x1 > $x2) { my $temp=$x1;$x1=$x2;$x2=$temp; }
-  if ($y1 > $y2) { my $temp=$y1;$y1=$y2;$y2=$temp; }
-  if ($x => $x1) { if ($x <= $x2) { if ($y => $y1) { if ($y <= $y2) { return 'APPROX_ANS'; } } } }
-  return 'INCORRECT';
+    my ($spec,$x,$y) = @_;
+    &Apache::lonxml::debug("Spec is $spec");
+    $spec =~ m/rectangle:\(([0-9]+),([0-9]+)\)\-\(([0-9]+),([0-9]+)\)/;
+    my $x1 = $1;
+    my $y1 = $2;
+    my $x2 = $3;
+    my $y2 = $4;
+    &Apache::lonxml::debug("Point $x1,$y1,$x2,$y2");
+    if ($x1 > $x2) { my $temp = $x1; $x1 = $x2; $x2 = $temp; }
+    if ($y1 > $y2) { my $temp = $y1; $y1 = $y2; $y2 = $temp; }
+    if ($x => $x1) { if ($x <= $x2) { if ($y => $y1) {
+	if ($y <= $y2) { return 'APPROX_ANS'; } } } }
+    return 'INCORRECT';
 }
 
+# =============================================================== End rectangle
 sub end_rectangle {
-  my ($target,$token,$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";
-  }
-  return '';
+    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");
+	if ( $Apache::imageresponse::conceptgroup ) {
+	    push @{ $Apache::response::conceptgroup{"$name.area"} },
+ 	         "rectangle:$area";
+	} else {
+	    push @{ $Apache::response::foilgroup{"$name.area"} },
+	         "rectangle:$area";
+	}
+    }
+    return '';
 }
+
 1;
+
 __END__