--- loncom/homework/imageresponse.pm	2005/01/31 22:46:22	1.60
+++ loncom/homework/imageresponse.pm	2006/11/06 23:44:42	1.80
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.60 2005/01/31 22:46:22 albertel Exp $
+# $Id: imageresponse.pm,v 1.80 2006/11/06 23:44:42 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,10 @@ use Apache::randomlylabel();
 use Apache::londefdef();
 use Apache::Constants qw(:common :http);
 use Apache::lonlocal;
+use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 BEGIN {
     &Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -62,12 +66,26 @@ sub start_imageresponse {
 
 sub end_imageresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    &Apache::response::end_response;
-    pop @Apache::lonxml::namespace;
+
+    pop(@Apache::lonxml::namespace);
     &Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+
     my $result;
-    if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
+    if ($target eq 'edit') {
+	$result=&Apache::edit::end_table();
+    } elsif ($target eq 'tex'
+	     && $Apache::lonhomework::type eq 'exam') {
+	$result=&Apache::inputtags::exam_score_line($target);
+    }
+
     undef(%Apache::response::foilnames);
+    
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
+	$target eq 'tex' || $target eq 'analyze') {
+	&Apache::lonxml::increment_counter(&Apache::response::repetition());
+    }
+    &Apache::response::end_response();
+
     return $result;
 }
 
@@ -116,11 +134,14 @@ sub prep_image {
     my $respid=$Apache::inputtags::response['-1'];
     my $id=&Apache::loncommon::get_cgi_id();
     my (%x,$i);
-    $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);
+    $x{"cgi.$id.BGIMG"}=&escape($image);
     my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
     #draws 2 xs on the image at the clicked location
     #one in white and then one in red on top of the one in white
-    if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/ && !&Apache::response::show_answer()) {
+    if (defined($x)    && $x =~/\S/ 
+	&& defined($y) && $y =~/\S/ 
+	&& !&Apache::response::show_answer()
+	&& $mode ne 'answeronly') {
 	my $length = 6;
 	my $width = 1;
 	my $extrawidth = 2;
@@ -146,7 +167,7 @@ sub prep_image {
 	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
 				      "FF0000",($width)));
     }
-    if ($mode eq 'answer') {
+    if ($mode eq 'answer' || $mode eq 'answeronly') {
 	my $width = 1;
 	my $extrawidth = 2;
 	my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
@@ -215,6 +236,25 @@ sub displayfoils {
     return $result;
 }
 
+sub display_answers {
+    my ($target,$whichopt)=@_;
+
+    my $result;
+    foreach my $name (@$whichopt) {
+	my $image=$Apache::response::foilgroup{"$name.image"};
+	&Apache::lonxml::debug("image is $image");
+	if ( $target eq 'web' && $image !~ /^http:/ ) {
+	    $image = &clean_up_image($image);
+	} 
+	my $token=&prep_image($image,'answeronly',$name);
+
+	$result.=&Apache::response::answer_header('imageresponse');
+	$result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
+	$result.=&Apache::response::answer_footer('imageresponse');
+    }
+    return $result;
+}
+
 sub clean_up_image {
     my ($image)=@_;
     if ($image =~ /\s*<img\s*/) {
@@ -227,7 +267,8 @@ sub clean_up_image {
 	}
     } else {
 	$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
-	if (&Apache::lonnet::repcopy($image) ne OK) {
+	&Apache::lonxml::debug("repcopying: $image");
+	if (&Apache::lonnet::repcopy($image) ne 'ok') {
 	    $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
 	}
     }
@@ -236,14 +277,22 @@ sub clean_up_image {
 
 sub gradefoils {
     my (@whichopt) = @_;
+
+    my $partid = $Apache::inputtags::part;
+    my $id     = $Apache::inputtags::response['-1'];
+
+    if ($Apache::lonhomework::type eq 'exam') {
+	&Apache::response::scored_response($partid,$id);
+	return;
+    }
+    
     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"};
+	$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($x) && defined($y) &&
 	    defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
@@ -272,34 +321,41 @@ sub gradefoils {
     }
     my $responsestr="$x:$y";
     my $part=$Apache::inputtags::part;
-    my $id = $Apache::inputtags::response['-1'];
     my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
     if ($result 
 	&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
     &Apache::response::handle_previous(\%previous,$result);
     $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;
     $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
-    return '';
+    return;
 }
 
 sub end_foilgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my @whichopt;
+
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') {
+	$target eq 'analyze' || $target eq 'answer') {
+
 	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' || $target eq 'tex') {
 	    $result=&displayfoils($target,@whichopt);
 	} elsif ($target eq 'grade') {
-	    if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); }
+	    if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
 	} elsif ( $target eq 'analyze') {
 	    &Apache::response::analyze_store_foilgroup(\@whichopt,
 						      ['text','image','area']);
+	} elsif ($target eq 'answer'
+		 && $env{'form.answer_output_mode'} ne 'tex') {
+	    $result=&display_answers($target,\@whichopt);
 	}
+
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }
@@ -342,11 +398,12 @@ sub insert_foil {
 $Apache::imageresponse::curname='';
 sub start_foil {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') {
+	$target eq 'analyze' || $target eq 'answer') {
 	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
-	if (!$name) {
-	    &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+	if ($name eq "") {
+	    &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
 	    $name=$Apache::lonxml::curdepth;
 	}
 	if (defined($Apache::response::foilnames{$name})) {
@@ -361,8 +418,17 @@ sub start_foil {
 	    push(@{ $Apache::response::foilgroup{'names'} }, $name);
 	}
 	$Apache::imageresponse::curname=$name;
-    }
-    return '';
+    } elsif ($target eq 'edit') {
+	$result  = &Apache::edit::tag_start($target,$token);
+	$result .= &Apache::edit::text_arg('Name:','name',$token);
+	$result .= &Apache::edit::end_row().
+	    &Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'name');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    } 
+    return $result;;
 }
 
 sub end_foil {
@@ -377,10 +443,11 @@ sub end_foil {
 sub start_text {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+	|| $target eq 'answer') { 
 	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
-	my $descr=&Apache::lonxml::get_all_text('/text',$parser);
+	my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
 	$result=&Apache::edit::tag_start($target,$token,'Task Description').
 	    &Apache::edit::editfield($token->[1],$descr,'Text',60,2).
 	    &Apache::edit::end_row();
@@ -393,7 +460,8 @@ sub start_text {
 sub end_text {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
-    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+	|| $target eq 'answer') {
 	my $name = $Apache::imageresponse::curname;
 	if ( $Apache::imageresponse::conceptgroup
 	     #&& !&Apache::response::showallfoils()
@@ -411,10 +479,11 @@ sub end_text {
 sub start_image {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
+    if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze'
+	|| $target eq 'answer') { 
 	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
-	my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);
+	my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
 	$Apache::edit::bgimgsrc=$bgimg;
 	$Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;
 
@@ -433,8 +502,8 @@ sub end_image {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     my $name = $Apache::imageresponse::curname;
-    if ($target eq 'web') {
-	my $image = &Apache::lonxml::endredirection;
+    if ($target eq 'web' || $target eq 'answer') {
+	my $image = &Apache::lonxml::endredirection();
 	&Apache::lonxml::debug("original image is $image");
 	if ( $Apache::imageresponse::conceptgroup
 	     #&& !&Apache::response::showallfoils()
@@ -444,7 +513,7 @@ sub end_image {
 	    $Apache::response::foilgroup{"$name.image"} = $image;
 	}
     } elsif ($target eq 'analyze') {
-	my $image = &Apache::lonxml::endredirection;
+	my $image = &Apache::lonxml::endredirection();
 	if ( $Apache::imageresponse::conceptgroup
 	     #&& !&Apache::response::showallfoils()
 	     ) {
@@ -455,75 +524,31 @@ sub end_image {
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     } elsif ($target eq 'tex') {
-	my $src = &Apache::lonxml::endredirection;
-	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-	my $width_param = '';
-	my $height_param = '';
-	my $scaling = .3;
-	my $image = Image::Magick->new;
-	my $current_figure = $image->Read($src);
-	$width_param = $image->Get('width') * $scaling;;
-	$height_param = $image->Get('height') * $scaling;;
-	undef $image;
-	my $epssrc = $src;
-	$epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-	if (not -e $epssrc) {
-	    my $localfile = $epssrc;
-	    $localfile =~ s/.*(\/res)/$1/;	
-	    my $file;
-	    my $path;	
-	    if ($localfile =~ m!(.*)/([^/]*)$!) {
-		$file = $2;
-		$path = $1.'/'; 
-	    }	
-	    my $signal_eps = 0;
-	    my @content_directory = &Apache::lonnet::dirlist($path);
-	    for (my $iy=0;$iy<=$#content_directory;$iy++) {
-		my @tempo_array = split(/&/,$content_directory[$iy]);
-		$content_directory[$iy] = $tempo_array[0];
-		if ($file eq $tempo_array[0]) {
-		    $signal_eps = 1;
-		    last;
-		}
-	    }
-	    if ($signal_eps) {
-		my $eps_file = &Apache::lonnet::getfile($localfile);
-	    } else {
-		$localfile = $src;
-		$localfile =~ s/.*(\/res)/$1/;	
-		my $as = &Apache::lonnet::getfile($src);		      
-	    }
-	}
-	my $file;
-	my $path;	
-	if ($src =~ m!(.*)/([^/]*)$!) {
-	    $file = $2;
-	    $path = $1.'/'; 
-	}
-	my $newsrc = $src;
-	$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
-	$file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i;
-	#do we have any specified size of the picture?
-	my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
-	my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
-	my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
-	if ($TeXwidth ne '') { 
-	    $width_param = $TeXwidth; 
-	} elsif ($TeXheight ne '') { 
-	    $width_param = $TeXheight/$height_param*$width_param;
-	} elsif ($width ne '') {
-	    $width_param = $width*$scaling;      
-	}
-	$width_param=&Apache::randomlabel::adjust_textwidth($width_param);
-	#where can we find the picture?
-	if (-e $newsrc) {
-	    if ($path) {
-		$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
-	    }
+	my $src = &Apache::lonxml::endredirection();
+
+	#  There may be all sorts of whitespace on fore and aft:
+
+	$src =~ s/\s+$//s;
+	$src =~ s/^\s+//s;
+
+	#
+	#  Gnuplot e.g. just generates the latex to put inplace.
+	#
+	my $graphinclude;
+	if ($src =~ /^%DYNAMICIMAGE/) {
+	    # This is needed because the newline is not always passed -> tex.
+	    # At present we don't care about the sizing info.
+
+	    my ($commentline, $restofstuff) = split(/\n/, $src);
+	    $graphinclude = $src;
+	    $graphinclude =~ s/^$commentline//;
 	} else {
-	    #care about eps dynamical generation
-	    $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);
+	    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.'}';
 	}
+	$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude;
     } 
     return $result;
 }
@@ -532,10 +557,10 @@ sub start_rectangle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') { 
+	$target eq 'analyze' || $target eq 'answer') { 
 	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
-	my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);
+	my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
 	$result=&Apache::edit::tag_start($target,$token,'Rectangle').
 	    &Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
 	    &Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
@@ -564,7 +589,7 @@ sub end_rectangle {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') {
+	$target eq 'analyze' || $target eq 'answer') {
 	my $name = $Apache::imageresponse::curname;
 	my $area = &Apache::lonxml::endredirection;
 	$area=~s/\s//g;
@@ -586,10 +611,10 @@ sub start_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') { 
+	$target eq 'analyze' || $target eq 'answer') { 
 	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
-	my $coords=&Apache::lonxml::get_all_text('/polygon',$parser);
+	my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
 	$result=&Apache::edit::tag_start($target,$token,'Polygon').
 	    &Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
 	    &Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
@@ -645,7 +670,7 @@ sub end_polygon {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
-	$target eq 'analyze') {
+	$target eq 'analyze' || $target eq 'answer') {
 	my $name = $Apache::imageresponse::curname;
 	my $area = &Apache::lonxml::endredirection;
 	$area=~s/\s*//g;