version 1.93, 2008/03/12 02:46:53
|
version 1.94.2.1, 2008/12/21 05:22:01
|
Line 239 sub displayfoils {
|
Line 239 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' || $target eq 'answer') |
if ( ($target eq 'web' || $target eq 'answer') |
&& $image !~ /^http:/ ) { |
&& $image !~ /^https?\:/ ) { |
$image=&clean_up_image($image); |
$image=&clean_up_image($image); |
} |
} |
push(@images,$image); |
push(@images,$image); |
Line 305 sub display_answers {
|
Line 305 sub display_answers {
|
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' || $target eq 'answer') |
if ( ($target eq 'web' || $target eq 'answer') |
&& $image !~ /^http:/ ) { |
&& $image !~ /^https?\:/ ) { |
$image = &clean_up_image($image); |
$image = &clean_up_image($image); |
} |
} |
my $token=&prep_image($image,'answeronly',$name); |
my $token=&prep_image($image,'answeronly',$name); |
Line 320 sub clean_up_image {
|
Line 320 sub clean_up_image {
|
my ($image)=@_; |
my ($image)=@_; |
if ($image =~ /\s*<img\s*/) { |
if ($image =~ /\s*<img\s*/) { |
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i); |
if ($image !~ /^http:/) { |
if ($image !~ /^https?\:/) { |
$image=&Apache::lonnet::hreflocation('',$image); |
$image=&Apache::lonnet::hreflocation('',$image); |
} |
} |
if (!$image) { |
if (!$image) { |
Line 367 sub gradefoils {
|
Line 367 sub gradefoils {
|
} elsif ($1 eq 'polygon') { |
} elsif ($1 eq 'polygon') { |
$grade=&grade_polygon($area,$x,$y); |
$grade=&grade_polygon($area,$x,$y); |
} else { |
} else { |
&Apache::lonxml::error("Unknown area style $area"); |
&Apache::lonxml::error(&mt('Unknown area style [_1]',$area)); |
} |
} |
&Apache::lonxml::debug("Area said $grade"); |
&Apache::lonxml::debug("Area said $grade"); |
if ($grade eq 'APPROX_ANS') { last; } |
if ($grade eq 'APPROX_ANS') { last; } |
Line 494 sub start_foil {
|
Line 494 sub start_foil {
|
$target eq 'analyze' || $target eq 'answer') { |
$target eq 'analyze' || $target eq 'answer') { |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval); |
if ($name eq "") { |
if ($name eq "") { |
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction."); |
&Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.')); |
$name=$Apache::lonxml::curdepth; |
$name=$Apache::lonxml::curdepth; |
} |
} |
if (defined($Apache::response::foilnames{$name})) { |
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)); |
&Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique." |
|
,'<b><tt>'.$name.'</tt></b>')); |
} |
} |
$Apache::response::foilnames{$name}++; |
$Apache::response::foilnames{$name}++; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |