--- loncom/homework/imageresponse.pm	2004/12/08 01:00:41	1.58
+++ loncom/homework/imageresponse.pm	2005/03/16 21:35:17	1.64
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.58 2004/12/08 01:00:41 albertel Exp $
+# $Id: imageresponse.pm,v 1.64 2005/03/16 21:35:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -227,7 +227,7 @@ sub clean_up_image {
 	}
     } else {
 	$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image);
-	if (&Apache::lonnet::repcopy($image) ne OK) {
+	if (&Apache::lonnet::repcopy($image) ne 'ok') {
 	    $image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
 	}
     }
@@ -270,10 +270,14 @@ sub gradefoils {
 	    $temp++;
 	}
     }
+    my $responsestr="$x:$y";
+    my $part=$Apache::inputtags::part;
+    my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);
     if ($result 
 	&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
-    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y";
-    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result;
+    &Apache::response::handle_previous(\%previous,$result);
+    $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;
+    $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
     return '';
 }
 
@@ -340,7 +344,10 @@ sub start_foil {
     if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
 	$target eq 'analyze') {
 	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
-	if ($name eq '') { $name=$Apache::lonxml::curdepth; }
+	if (!$name) {
+	    &Apache::lonxml::error("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));
 	}
@@ -426,7 +433,7 @@ sub end_image {
     my $result;
     my $name = $Apache::imageresponse::curname;
     if ($target eq 'web') {
-	my $image = &Apache::lonxml::endredirection;
+	my $image = &Apache::lonxml::endredirection();
 	&Apache::lonxml::debug("original image is $image");
 	if ( $Apache::imageresponse::conceptgroup
 	     #&& !&Apache::response::showallfoils()
@@ -436,7 +443,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()
 	     ) {
@@ -447,75 +454,11 @@ 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.'} ';
-	    }
-	} else {
-	    #care about eps dynamical generation
-	    $Apache::response::foilgroup{"$name.image"}='\vskip 0 mm '.&Apache::londefdef::eps_generation($src,$file,$width_param);
-	}
+	my $src = &Apache::lonxml::endredirection();
+	my ($path,$file) = &Apache::londefdef::get_eps_image($src);
+	my ($height_param,$width_param)=
+	    &Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
+	$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     } 
     return $result;
 }