--- loncom/homework/imageresponse.pm 2005/01/31 23:09:55 1.61
+++ loncom/homework/imageresponse.pm 2005/04/22 14:03:56 1.67
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.61 2005/01/31 23:09:55 albertel Exp $
+# $Id: imageresponse.pm,v 1.67 2005/04/22 14:03:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use Apache::randomlylabel();
use Apache::londefdef();
use Apache::Constants qw(:common :http);
use Apache::lonlocal;
+use Apache::lonnet;
BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -227,7 +228,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';
}
}
@@ -242,8 +244,8 @@ sub gradefoils {
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"} })) {
@@ -294,7 +296,7 @@ sub end_foilgroup {
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']);
@@ -341,6 +343,7 @@ 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') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
@@ -360,8 +363,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 {
@@ -433,7 +445,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()
@@ -443,7 +455,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()
) {
@@ -454,75 +466,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;
}