--- loncom/homework/imageresponse.pm	2008/03/12 02:46:53	1.93
+++ loncom/homework/imageresponse.pm	2012/10/12 12:45:46	1.104
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.93 2008/03/12 02:46:53 raeburn Exp $
+# $Id: imageresponse.pm,v 1.104 2012/10/12 12:45:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,87 @@
 #FIXME LATER assumes multiple possible submissions but only one is possible 
 #currently
 
+
+=head1 NAME
+
+Apache::imageresponse
+
+=head1 SYNOPSIS
+
+Coordinates the response to clicking an image.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item start_imageresponse()
+
+=item end_imageresponse()
+
+=item start_foilgroup()
+
+=item getfoilcounts()
+
+=item whichfoils()
+
+=item prep_image()
+
+=item draw_image()
+
+=item displayfoils()
+
+=item format_prior_response()
+
+=item display_answers()
+
+=item clean_up_image()
+
+=item gradefoils()
+
+=item stringify_submission()
+
+=item get_submission()
+
+=item end_foilgroup()
+
+=item start_conceptgroup()
+
+=item end_conceptgroup()
+
+=item insert_foil()
+
+=item start_foil()
+
+=item end_foil()
+
+=item start_text()
+
+=item end_text()
+
+=item start_image()
+
+=item end_image()
+
+=item start_rectangle()
+
+=item grade_rectangle()
+
+=item end_rectangle()
+
+=item start_polygon()
+
+=item grade_polygon()
+
+=item end_polygon()
+
+=back
+
+=cut
+
+
 package Apache::imageresponse;
 use strict;
 use Image::Magick();
@@ -98,7 +179,8 @@ sub end_imageresponse {
     
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter(&Apache::response::repetition(), 
+        my $repetition = &Apache::response::repetition();
+	&Apache::lonxml::increment_counter($repetition, 
 					   "$part_id.$response_id");
 	if ($target eq 'analyze') {
 	    &Apache::lonhomework::set_bubble_lines();
@@ -106,15 +188,15 @@ sub end_imageresponse {
 	
     }
     &Apache::response::end_response();
-
     return $result;
 }
 
 %Apache::response::foilgroup=();
 sub start_foilgroup {
+    my ($target) = @_;
     %Apache::response::foilgroup=();
     $Apache::imageresponse::conceptgroup=0;
-    &Apache::response::pushrandomnumber();
+    &Apache::response::pushrandomnumber(undef,$target);
     return '';
 }
 
@@ -130,8 +212,11 @@ sub getfoilcounts {
 
 sub whichfoils {
     my ($max)=@_;
-    return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
-    my @names = @{ $Apache::response::foilgroup{'names'} };
+    my @names;
+    if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+        @names = @{ $Apache::response::foilgroup{'names'} };
+    }
+    return if (!@names);
     my @whichopt;
     while ((($#whichopt+1) < $max) && ($#names > -1)) {
 	&Apache::lonxml::debug("Have $#whichopt max is $max");
@@ -239,7 +324,7 @@ sub displayfoils {
 	my $image=$Apache::response::foilgroup{"$name.image"};
 	&Apache::lonxml::debug("image is $image");
 	if ( ($target eq 'web' || $target eq 'answer') 
-	     && $image !~ /^http:/ ) {
+	     && $image !~ /^https?\:/ ) {
 	    $image=&clean_up_image($image);
 	}
 	push(@images,$image);
@@ -272,12 +357,49 @@ sub displayfoils {
 	$temp++;
     }
     if ($target eq 'web') {
-	&Apache::response::setup_prior_tries_hash(\&format_prior_response,
-						  [\@images,\@whichopt]);
+        &get_prior_options(\@images,\@whichopt);
     }
     return $result;
 }
 
+sub get_prior_options {
+    my ($currimages,$curropt) = @_;
+    return unless((ref($curropt) eq 'ARRAY') && 
+                  (ref($currimages) eq 'ARRAY'));
+    my $part = $Apache::inputtags::part;
+    my $respid   = $Apache::inputtags::response[-1];
+    foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+        my $partprefix = "$i:resource.$part";
+        my $sub_key = "$partprefix.$respid.submission";
+        next if (!exists($Apache::lonhomework::history{$sub_key}));
+        my $type_key = "$partprefix.type";
+        my @whichopt = ();
+        my @images = ();
+        if ($Apache::lonhomework::history{$type_key} eq 'randomizetry') {
+            my $order_key = "$partprefix.$respid.foilorder";
+            @whichopt = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+            if (@whichopt > 0) {
+                foreach my $name (@whichopt) {
+                    my $image=$Apache::response::foilgroup{"$name.image"};
+                    if ($image !~ /^https?\:/ ) {
+                        $image=&clean_up_image($image);
+                    }
+                    push(@images,$image);
+                }
+            }
+        } else {
+            @whichopt = @{$curropt};
+            @images = @{$currimages};
+        }
+        my $submission = $Apache::lonhomework::history{$sub_key};
+        my $output =  &format_prior_response('grade',$submission,
+                                             [\@images,\@whichopt]);
+        if (defined($output)) {
+            $Apache::inputtags::submission_display{$sub_key} = $output;
+        }
+    }
+}
+
 sub format_prior_response {
     my ($mode,$answer,$other_data) = @_;
     
@@ -305,7 +427,7 @@ sub display_answers {
 	my $image=$Apache::response::foilgroup{"$name.image"};
 	&Apache::lonxml::debug("image is $image");
 	if ( ($target eq 'web' || $target eq 'answer')
-	     && $image !~ /^http:/ ) {
+	     && $image !~ /^https?\:/ ) {
 	    $image = &clean_up_image($image);
 	} 
 	my $token=&prep_image($image,'answeronly',$name);
@@ -320,7 +442,7 @@ sub clean_up_image {
     my ($image)=@_;
     if ($image =~ /\s*<img\s*/) {
 	($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
-	if ($image !~ /^http:/) {
+	if ($image !~ /^https?\:/) {
 	    $image=&Apache::lonnet::hreflocation('',$image);
 	}
 	if (!$image) {
@@ -354,9 +476,11 @@ sub gradefoils {
 	my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"});
 	$response{$name} = $env{"form.HWVAL_$id:$temp"};
 	&Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
-	if (defined($x) && defined($y) &&
-	    defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
-	    my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+        my @areas; 
+        if (ref($Apache::response::foilgroup{"$name.area"}) eq 'ARRAY') {
+            @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+        }
+	if (defined($x) && defined($y) && @areas) {
 	    my $grade="INCORRECT";
 	    foreach my $area (@areas) {
 		&Apache::lonxml::debug("Area is $area for $name");
@@ -367,7 +491,7 @@ sub gradefoils {
 		} elsif ($1 eq 'polygon') {
 		    $grade=&grade_polygon($area,$x,$y);
 		} else {
-		    &Apache::lonxml::error("Unknown area style $area");
+		    &Apache::lonxml::error(&mt('Unknown area style [_1]',$area));
 		}
 		&Apache::lonxml::debug("Area said $grade");
 		if ($grade eq 'APPROX_ANS') { last; }
@@ -379,6 +503,9 @@ sub gradefoils {
 	}
 	$temp++;
     }
+    if ($Apache::lonhomework::type eq 'randomizetry') {
+        $Apache::lonhomework::results{"resource.$partid.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
+    }
     my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
     &Apache::lonxml::debug("Question is $result");
 
@@ -386,8 +513,18 @@ sub gradefoils {
     my %previous=
 	&Apache::response::check_for_previous(&stringify_submission(\%response),
 					      $part,$id);
-    if ($result 
-	&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
+    if ($result) { 
+	if ($Apache::lonhomework::type eq 'survey') { 
+            $result='SUBMITTED';
+        } elsif ($Apache::lonhomework::type eq 'surveycred') { 
+            $result='SUBMITTED_CREDIT'; 
+        } elsif ($Apache::lonhomework::type eq 'anonsurvey') { 
+            $result='ANONYMOUS'; 
+        } elsif ($Apache::lonhomework::type eq 'anonsurveycred') { 
+            $result='ANONYMOUS_CREDIT'; 
+        }
+    }
+
     &Apache::response::handle_previous(\%previous,$result);
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=
 	&stringify_submission(\%response);
@@ -398,8 +535,6 @@ sub gradefoils {
 sub stringify_submission {
     my ($response) = @_;
     return &Apache::lonnet::hash2str(%{ $response });
-
-    
 }
 
 sub get_submission {
@@ -436,6 +571,11 @@ sub end_foilgroup {
 
 	if ($target eq 'web' || $target eq 'tex') {
 	    $result=&displayfoils($target,@whichopt);
+            if ($Apache::lonhomework::type eq 'randomizetry') {
+                if ($target eq 'web') {
+                    &get_prior_options($target,@whichopt);
+                }
+            }
 	    $Apache::lonxml::post_evaluate=0;
 	} elsif ($target eq 'grade') {
 	    if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
@@ -494,11 +634,12 @@ sub start_foil {
 	$target eq 'analyze' || $target eq 'answer') {
 	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	if ($name eq "") {
-	    &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
+	    &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
 	    $name=$Apache::lonxml::curdepth;
 	}
 	if (defined($Apache::response::foilnames{$name})) {
-	    &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
+	    &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique."
+                                      ,'<b><tt>'.$name.'</tt></b>'));
 	}
 	$Apache::response::foilnames{$name}++;
 	if ( $Apache::imageresponse::conceptgroup
@@ -634,11 +775,13 @@ sub end_image {
 	    my ($commentline, $restofstuff) = split(/\n/, $src);
 	    $graphinclude = $src;
 	    $graphinclude =~ s/^$commentline//;
-	} else {
+	} elsif (!($src =~ /\\/)) {
 	    my ($path,$file) = &Apache::londefdef::get_eps_image($src);
 	    my ($height_param,$width_param)=
 		&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
 	    $graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}';
+	} else {
+	    $graphinclude = $src;   # Already fully formed.
 	}
 	$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     }