--- loncom/homework/imageresponse.pm	2008/11/12 20:01:21	1.95
+++ loncom/homework/imageresponse.pm	2011/11/14 03:08:01	1.103
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.95 2008/11/12 20:01:21 jms Exp $
+# $Id: imageresponse.pm,v 1.103 2011/11/14 03:08:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,134 +41,69 @@ Coordinates the response to clicking an
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
-=head1 HANDLER SUBROUTINE
-
-
-
-=head1 OTHER SUBROUTINES
+=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 *
+=item start_imageresponse()
 
-clean_up_image()
+=item end_imageresponse()
 
-=item *
+=item start_foilgroup()
 
-gradefoils()
+=item getfoilcounts()
 
-=item *
+=item whichfoils()
 
-stringify_submission()
+=item prep_image()
 
-=item *
+=item draw_image()
 
-get_submission()
+=item displayfoils()
 
-=item *
+=item format_prior_response()
 
-end_foilgroup()
+=item display_answers()
 
-=item *
+=item clean_up_image()
 
-start_conceptgroup()
+=item gradefoils()
 
-=item *
+=item stringify_submission()
 
-end_conceptgroup()
+=item get_submission()
 
-=item *
+=item end_foilgroup()
 
-insert_foil()
+=item start_conceptgroup()
 
-=item *
+=item end_conceptgroup()
 
-start_foil()
+=item insert_foil()
 
-=item *
+=item start_foil()
 
-end_foil()
+=item end_foil()
 
-=item *
+=item start_text()
 
-start_text()
+=item end_text()
 
-=item *
+=item start_image()
 
-end_text()
+=item end_image()
 
-=item *
+=item start_rectangle()
 
-start_image()
+=item grade_rectangle()
 
+=item end_rectangle()
 
-=item *
+=item start_polygon()
 
-end_image()
+=item grade_polygon()
 
-=item *
-
-start_rectangle()
-
-=item *
-
-grade_rectangle()
-
-=item *
-
-end_rectangle()
-
-=item *
-
-start_polygon()
-
-=item *
-
-grade_polygon()
-
-=item *
-
-end_polygon()
+=item end_polygon()
 
 =back
 
@@ -244,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();
@@ -252,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 '';
 }
 
@@ -385,7 +321,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);
@@ -418,12 +354,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) = @_;
     
@@ -451,7 +424,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);
@@ -466,7 +439,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) {
@@ -525,6 +498,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");
 
@@ -532,8 +508,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);
@@ -544,8 +530,6 @@ sub gradefoils {
 sub stringify_submission {
     my ($response) = @_;
     return &Apache::lonnet::hash2str(%{ $response });
-
-    
 }
 
 sub get_submission {
@@ -582,6 +566,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); }
@@ -781,11 +770,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;
     }