version 1.46, 2004/01/28 20:00:26
|
version 1.47, 2004/02/11 21:59:34
|
Line 113 sub prep_image {
|
Line 113 sub prep_image {
|
my $respid=$Apache::inputtags::response['-1']; |
my $respid=$Apache::inputtags::response['-1']; |
my $id=&Apache::loncommon::get_cgi_id(); |
my $id=&Apache::loncommon::get_cgi_id(); |
my %x; |
my %x; |
$x{"cgi.$id.BGIMG"}=$image; |
$x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image); |
my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"}); |
my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"}); |
#draws 2 xs on the image at the clicked location |
#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 |
#one in white and then one in red on top of the one in white |
Line 174 sub displayfoils {
|
Line 174 sub displayfoils {
|
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
if ( $target eq 'web' && $image !~ /^http:/ ) { |
$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); |
$image=&clean_up_image($image); |
if (&Apache::lonnet::repcopy($image) ne OK) { |
} |
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} |
|
&Apache::lonxml::debug("image is $image"); |
&Apache::lonxml::debug("image is $image"); |
if ( &Apache::response::show_answer() ) { |
if ( &Apache::response::show_answer() ) { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 203 sub displayfoils {
|
Line 200 sub displayfoils {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub clean_up_image { |
|
my ($image)=@_; |
|
if ($image =~ /\s*<img\s*/) { |
|
($image) = ($image =~ /src\s*=\s*\"([^\"]+)\"/i); |
|
if ($image !~ /^http:/) { |
|
$image=&Apache::lonnet::hreflocation('',$image); |
|
} |
|
if (!$image) { |
|
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} else { |
|
$image=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$image); |
|
if (&Apache::lonnet::repcopy($image) ne OK) { |
|
$image='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; |
|
} |
|
} |
|
return $image; |
|
} |
|
|
sub gradefoils { |
sub gradefoils { |
my (@whichopt) = @_; |
my (@whichopt) = @_; |
my $x; |
my $x; |