version 1.96, 2008/11/18 19:14:28
|
version 1.99, 2010/02/28 23:37:44
|
Line 187 sub end_imageresponse {
|
Line 187 sub end_imageresponse {
|
|
|
} |
} |
&Apache::response::end_response(); |
&Apache::response::end_response(); |
|
|
return $result; |
return $result; |
} |
} |
|
|
Line 320 sub displayfoils {
|
Line 319 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 386 sub display_answers {
|
Line 385 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 401 sub clean_up_image {
|
Line 400 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 467 sub gradefoils {
|
Line 466 sub gradefoils {
|
my %previous= |
my %previous= |
&Apache::response::check_for_previous(&stringify_submission(\%response), |
&Apache::response::check_for_previous(&stringify_submission(\%response), |
$part,$id); |
$part,$id); |
if ($result |
if ($result) { |
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } |
if ($Apache::lonhomework::type eq 'survey') { |
|
$result='SUBMITTED'; |
|
} elsif ($Apache::lonhomework::type eq 'surveycred') { |
|
$result='SUBMITTED_CREDIT'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurvey') { |
|
$result='ANONYMOUS'; |
|
} elsif ($Apache::lonhomework::type eq 'anonsurveycred') { |
|
$result='ANONYMOUS_CREDIT'; |
|
} |
|
} |
|
|
&Apache::response::handle_previous(\%previous,$result); |
&Apache::response::handle_previous(\%previous,$result); |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
$Apache::lonhomework::results{"resource.$part.$id.submission"}= |
&stringify_submission(\%response); |
&stringify_submission(\%response); |
Line 716 sub end_image {
|
Line 725 sub end_image {
|
my ($commentline, $restofstuff) = split(/\n/, $src); |
my ($commentline, $restofstuff) = split(/\n/, $src); |
$graphinclude = $src; |
$graphinclude = $src; |
$graphinclude =~ s/^$commentline//; |
$graphinclude =~ s/^$commentline//; |
} else { |
} elsif (!($src =~ /\\/)) { |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my ($path,$file) = &Apache::londefdef::get_eps_image($src); |
my ($height_param,$width_param)= |
my ($height_param,$width_param)= |
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval); |
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval); |
$graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}'; |
$graphinclude = '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'}'; |
|
} else { |
|
$graphinclude = $src; # Already fully formed. |
} |
} |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude; |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \noindent '.$graphinclude; |
} |
} |