Return to imageresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/imageresponse.pm between versions 1.68 and 1.90

version 1.68, 2005/05/10 11:24:01	version 1.90, 2007/10/15 09:47:29
Line 1	Line 1
	#
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# image click response style	# image click response style
#	#
Line 37 use Apache::londefdef();	Line 37 use Apache::londefdef();
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonnet;	use Apache::lonnet;
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));	&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
Line 57 sub start_imageresponse {	Line 60 sub start_imageresponse {
} elsif ($target eq 'analyze') {	} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";	my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);	push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
	push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
	1);
	} elsif ( $target eq 'edit' ) {
	$result .= &Apache::edit::tag_start($target,$token).
	&Apache::edit::text_arg('Max Number Of Shown Foils:',
	'max',$token,'4').
	&Apache::edit::end_row().
	&Apache::edit::start_spanning_row();
	} elsif ( $target eq 'modified' ) {
	my $constructtag=
	&Apache::edit::get_new_args($token,$parstack,$safeeval,'max');
	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}	}
return $result;	return $result;
}	}

sub end_imageresponse {	sub end_imageresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
&Apache::response::end_response;
pop @Apache::lonxml::namespace;	my $part_id = $Apache::inputtags::part;
	my $response_id = $Apache::inputtags::response[-1];

	pop(@Apache::lonxml::namespace);
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));	&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));

my $result;	my $result;
if ($target eq 'edit') { $result=&Apache::edit::end_table(); }	if ($target eq 'edit') {
	$result=&Apache::edit::end_table();
	} elsif ($target eq 'tex'
	&& $Apache::lonhomework::type eq 'exam') {
	$result=&Apache::inputtags::exam_score_line($target);
	}

undef(%Apache::response::foilnames);	undef(%Apache::response::foilnames);

	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' \|\|
	$target eq 'tex' \|\| $target eq 'analyze') {
	&Apache::lonxml::increment_counter(&Apache::response::repetition(),
	"$part_id.$response_id");
	if ($target eq 'analyze') {
	&Apache::lonhomework::set_bubble_lines();
	}

	}
	&Apache::response::end_response();

return $result;	return $result;
}	}

Line 86 sub getfoilcounts {	Line 123 sub getfoilcounts {
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');	my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2');
# +1 since instructors will count from 1	# +1 since instructors will count from 1
my $count = $#{ $Apache::response::foilgroup{'names'} }+1;	my $count = $#{ $Apache::response::foilgroup{'names'} }+1;
#if (&Apache::response::showallfoils()) { $max=$count; }	if (&Apache::response::showallfoils()) { $max=$count; }
return ($count,$max);	return ($count,$max);
}	}

sub whichfoils {	sub whichfoils {
my ($max)=@_;	my ($max)=@_;
if (!defined(@{ $Apache::response::foilgroup{'names'} })) { return; }	return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
my @names = @{ $Apache::response::foilgroup{'names'} };	my @names = @{ $Apache::response::foilgroup{'names'} };
my @whichopt =();	my @whichopt;
while ((($#whichopt+1) < $max) && ($#names > -1)) {	while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");	&Apache::lonxml::debug("Have $#whichopt max is $max");
my $aopt;	my $aopt;
# if (&Apache::response::showallfoils()) {	if (&Apache::response::showallfoils()) {
# $aopt=0;	$aopt=0;
# } else {	} else {
$aopt=int(&Math::Random::random_uniform() * ($#names+1));	$aopt=int(&Math::Random::random_uniform() * ($#names+1));
# }	}
&Apache::lonxml::debug("From $#names elms, picking $aopt");	&Apache::lonxml::debug("From $#names elms, picking $aopt");
$aopt=splice(@names,$aopt,1);	$aopt=splice(@names,$aopt,1);
&Apache::lonxml::debug("Picked $aopt");	&Apache::lonxml::debug("Picked $aopt");
push (@whichopt,$aopt);	push(@whichopt,$aopt);
}	}
return @whichopt;	return @whichopt;
}	}

sub prep_image {	sub prep_image {
my ($image,$mode,$name)=@_;	my ($image,$mode,$name)=@_;
my $part=$Apache::inputtags::part;
my $respid=$Apache::inputtags::response['-1'];	my ($x,$y)= &get_submission($name);
	&Apache::lonxml::debug("for $name drawing click at $x and $y");
	&draw_image($mode,$image,$x,$y,$Apache::response::foilgroup{"$name.area"});
	}

	sub draw_image {
	my ($mode,$image,$x,$y,$areas) = @_;

my $id=&Apache::loncommon::get_cgi_id();	my $id=&Apache::loncommon::get_cgi_id();

my (%x,$i);	my (%x,$i);
$x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);	$x{"cgi.$id.BGIMG"}=&escape($image);
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
if (defined($x) && $x=~/\S/ && defined($y) && $y =~/\S/ && !&Apache::response::show_answer()) {
	if (defined($x) && $x =~/\S/
	&& defined($y) && $y =~/\S/
	&& ($mode eq 'submission' \|\| !&Apache::response::show_answer())
	&& $mode ne 'answeronly') {
my $length = 6;	my $length = 6;
my $width = 1;	my $width = 1;
my $extrawidth = 2;	my $extrawidth = 2;
Line 147 sub prep_image {	Line 196 sub prep_image {
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),	$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
"FF0000",($width)));	"FF0000",($width)));
}	}
if ($mode eq 'answer') {	if ($mode eq 'answer' \|\| $mode eq 'answeronly') {
my $width = 1;	my $width = 1;
my $extrawidth = 2;	my $extrawidth = 2;
my @areas = @{ $Apache::response::foilgroup{"$name.area"} };	foreach my $area (@{ $areas }) {
foreach my $area (@areas) {
if ($area=~/^rectangle:/) {	if ($area=~/^rectangle:/) {
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';	$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
$i=$x{"cgi.$id.OBJCOUNT"}++;	$i=$x{"cgi.$id.OBJCOUNT"}++;
Line 181 sub prep_image {	Line 229 sub prep_image {
sub displayfoils {	sub displayfoils {
my ($target,@whichopt) = @_;	my ($target,@whichopt) = @_;
my $result ='';	my $result ='';
my $name;
my $temp=1;	my $temp=1;
foreach $name (@whichopt) {	my @images;
	foreach my $name (@whichopt) {
$result.=$Apache::response::foilgroup{"$name.text"};	$result.=$Apache::response::foilgroup{"$name.text"};
&Apache::lonxml::debug("Text is $result");	&Apache::lonxml::debug("Text is $result");
if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}	if ($target eq 'tex') {$result.="\\vskip 0 mm \n";} else {$result.="<br />\n";}
Line 191 sub displayfoils {	Line 239 sub displayfoils {
&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=&clean_up_image($image);	$image=&clean_up_image($image);
}	}
	push(@images,$image);
&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 204 sub displayfoils {	Line 253 sub displayfoils {
if ($target eq 'tex') {	if ($target eq 'tex') {
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";	$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
} else {	} else {
my $id=$Apache::inputtags::response['-1'];	my $respid=$Apache::inputtags::response['-1'];
my $token=&prep_image($image);	my $token=&prep_image($image,'submission',$name);
my $temp=1;	my $input_id = "HWVAL_$respid:$temp";
$result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ".	my $id = $env{'form.request.prefix'}.$input_id;
"src=\"/adm/randomlabel.png?token=$token\" /><br />\n";	$result.='<img onclick="image_response_click(\''.$id.'\',event);"
	src="/adm/randomlabel.png?token='.$token.'"
	id="'.$id.'_imageresponse"
	/>'.
	'<br />'.
	'<input type="hidden" name="'.$input_id.'_token" value="'.$token.'" />'.
	'<input type="hidden" name="'.$input_id.'" value="'.
	join(':',&get_submission($name)).'" />';
}	}
}	}
$temp++;	$temp++;
}	}
	if ($target eq 'web') {
	&Apache::response::setup_prior_tries_hash(\&format_prior_response,
	[\@images,\@whichopt]);
	}
	return $result;
	}

	sub format_prior_response {
	my ($mode,$answer,$other_data) = @_;

	my $result;

	# make a copy of the data in the refs
	my @images = @{ $other_data->[0] };
	my @foils = @{ $other_data->[1] };
	foreach my $name (@foils) {
	my $image = pop(@images);
	my ($x,$y) = &get_submission($name,$answer);
	my $token = &draw_image('submission',$image,$x,$y);
	$result .=
	'<img class="LC_prior_image"
	src="/adm/randomlabel.png?token='.$token.'" /><br />';
	}
	return $result;
	}

	sub display_answers {
	my ($target,$whichopt)=@_;

	my $result=&Apache::response::answer_header('imageresponse');
	foreach my $name (@$whichopt) {
	my $image=$Apache::response::foilgroup{"$name.image"};
	&Apache::lonxml::debug("image is $image");
	if ( $target eq 'web' && $image !~ /^http:/ ) {
	$image = &clean_up_image($image);
	}
	my $token=&prep_image($image,'answeronly',$name);

	$result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
	}
	$result.=&Apache::response::answer_footer('imageresponse');
return $result;	return $result;
}	}

Line 238 sub clean_up_image {	Line 335 sub clean_up_image {

sub gradefoils {	sub gradefoils {
my (@whichopt) = @_;	my (@whichopt) = @_;
my $x;
my $y;	my $partid = $Apache::inputtags::part;
my $result;	my $id = $Apache::inputtags::response['-1'];
my $id=$Apache::inputtags::response['-1'];
	if ($Apache::lonhomework::type eq 'exam') {
	&Apache::response::scored_response($partid,$id);
	return;
	}

	my @results;
my $temp=1;	my $temp=1;
	my %response;
foreach my $name (@whichopt) {	foreach my $name (@whichopt) {
$x=$env{"form.HWVAL_$id:$temp.x"};	my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"});
$y=$env{"form.HWVAL_$id:$temp.y"};	$response{$name} = $env{"form.HWVAL_$id:$temp"};
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name");	&Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
if (defined($x) && defined($y) &&	if (defined($x) && defined($y) &&
defined(@{ $Apache::response::foilgroup{"$name.area"} })) {	defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
Line 266 sub gradefoils {	Line 370 sub gradefoils {
if ($grade eq 'APPROX_ANS') { last; }	if ($grade eq 'APPROX_ANS') { last; }
}	}
&Apache::lonxml::debug("Foil was $grade");	&Apache::lonxml::debug("Foil was $grade");
if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }	push(@results, $grade)
if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }	} else {
&Apache::lonxml::debug("Question is $result");	push(@results, 'MISSING_ANSWER')
$temp++;
}	}
	$temp++;
}	}
my $responsestr="$x:$y";	my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
	&Apache::lonxml::debug("Question is $result");

my $part=$Apache::inputtags::part;	my $part=$Apache::inputtags::part;
my %previous=&Apache::response::check_for_previous($responsestr,$part,$id);	my %previous=
	&Apache::response::check_for_previous(&stringify_submission(\%response),
	$part,$id);
if ($result	if ($result
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }	&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
&Apache::response::handle_previous(\%previous,$result);	&Apache::response::handle_previous(\%previous,$result);
$Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr;	$Apache::lonhomework::results{"resource.$part.$id.submission"}=
	&stringify_submission(\%response);
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;	$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result;
return '';	return;
	}

	sub stringify_submission {
	my ($response) = @_;
	return &Apache::lonnet::hash2str(%{ $response });


	}

	sub get_submission {
	my ($name,$string) = @_;

	if (!defined($string)) {
	my $part=$Apache::inputtags::part;
	my $respid=$Apache::inputtags::response['-1'];
	$string =
	$Apache::lonhomework::history{"resource.$part.$respid.submission"};
	}

	if ($string !~ /=/) {
	return split(':',$string);
	} else {
	my %response = &Apache::lonnet::str2hash($string);
	return split(':',$response{$name});
	}
}	}

sub end_foilgroup {	sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
my @whichopt;	my @whichopt;

if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$target eq 'analyze' \|\| $target eq 'answer') {

my ($count,$max) = &getfoilcounts($parstack,$safeeval);	my ($count,$max) = &getfoilcounts($parstack,$safeeval);
if ($count>$max) { $count=$max }	if ($count>$max) { $count=$max }
&Apache::lonxml::debug("Count is $count from $max");	&Apache::lonxml::debug("Count is $count from $max");

@whichopt = &whichfoils($max);	@whichopt = &whichfoils($max);

if ($target eq 'web' \|\| $target eq 'tex') {	if ($target eq 'web' \|\| $target eq 'tex') {
$result=&displayfoils($target,@whichopt);	$result=&displayfoils($target,@whichopt);
	$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'grade') {	} elsif ($target eq 'grade') {
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }	if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
} elsif ( $target eq 'analyze') {	} elsif ( $target eq 'analyze') {
&Apache::response::analyze_store_foilgroup(\@whichopt,	&Apache::response::analyze_store_foilgroup(\@whichopt,
['text','image','area']);	['text','image','area']);
	} elsif ($target eq 'answer'
	&& $env{'form.answer_output_mode'} ne 'tex') {
	$result=&display_answers($target,\@whichopt);
}	}

} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();	$result=&Apache::edit::end_table();
}	}
Line 345 sub start_foil {	Line 488 sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$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) {	if ($name eq "") {
&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");	&Apache::lonxml::warning("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})) {
Line 356 sub start_foil {	Line 499 sub start_foil {
}	}
$Apache::response::foilnames{$name}++;	$Apache::response::foilnames{$name}++;
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
push(@{ $Apache::response::conceptgroup{'names'} }, $name);	push(@{ $Apache::response::conceptgroup{'names'} }, $name);
} else {	} else {
Line 388 sub end_foil {	Line 531 sub end_foil {
sub start_text {	sub start_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze'
	\|\| $target eq 'answer') {
&Apache::lonxml::startredirection;	&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
my $descr=&Apache::lonxml::get_all_text('/text',$parser);	my $descr=&Apache::lonxml::get_all_text('/text',$parser,$style);
$result=&Apache::edit::tag_start($target,$token,'Task Description').	$result=&Apache::edit::tag_start($target,$token,'Task Description').
&Apache::edit::editfield($token->[1],$descr,'Text',60,2).	&Apache::edit::editfield($token->[1],$descr,'Text',60,2).
&Apache::edit::end_row();	&Apache::edit::end_row();
Line 404 sub start_text {	Line 548 sub start_text {
sub end_text {	sub end_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze'
	\|\| $target eq 'answer') {
my $name = $Apache::imageresponse::curname;	my $name = $Apache::imageresponse::curname;
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;	$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection;
} else {	} else {
Line 422 sub end_text {	Line 567 sub end_text {
sub start_image {	sub start_image {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {	my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze'
	\|\| $target eq 'answer') {
&Apache::lonxml::startredirection;	&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser);	my $bgimg=&Apache::lonxml::get_all_text('/image',$parser,$style);
$Apache::edit::bgimgsrc=$bgimg;	$Apache::edit::bgimgsrc=$bgimg;
$Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;	$Apache::edit::bgimgsrcdepth=$Apache::lonxml::curdepth;

$result=&Apache::edit::tag_start($target,$token,'Clickable Image').	$result=&Apache::edit::tag_start($target,$token,'Clickable Image').
&Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);	&Apache::edit::editline($token->[1],$bgimg,'Image Source File',40);
$result.=&Apache::edit::browse(undef,'textnode').' ';	$result.=&Apache::edit::browse(undef,'textnode',undef,$only).' ';
$result.=&Apache::edit::search(undef,'textnode').	$result.=&Apache::edit::search(undef,'textnode').
&Apache::edit::end_row();	&Apache::edit::end_row();
} elsif ($target eq "modified") {	} elsif ($target eq "modified") {
Line 444 sub end_image {	Line 591 sub end_image {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
my $name = $Apache::imageresponse::curname;	my $name = $Apache::imageresponse::curname;
if ($target eq 'web') {	if ($target eq 'web' \|\| $target eq 'answer') {
my $image = &Apache::lonxml::endredirection();	my $image = &Apache::lonxml::endredirection();
&Apache::lonxml::debug("original image is $image");	&Apache::lonxml::debug("original image is $image");
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
$Apache::response::conceptgroup{"$name.image"} = $image;	$Apache::response::conceptgroup{"$name.image"} = $image;
} else {	} else {
Line 457 sub end_image {	Line 604 sub end_image {
} elsif ($target eq 'analyze') {	} elsif ($target eq 'analyze') {
my $image = &Apache::lonxml::endredirection();	my $image = &Apache::lonxml::endredirection();
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
$Apache::response::conceptgroup{"$name.image"} = $image;	$Apache::response::conceptgroup{"$name.image"} = $image;
} else {	} else {
Line 470 sub end_image {	Line 617 sub end_image {

# There may be all sorts of whitespace on fore and aft:	# There may be all sorts of whitespace on fore and aft:

$src =~ s/\s+$//;	$src =~ s/\s+$//s;
$src =~ s/^\s+//;	$src =~ s/^\s+//s;

#	#
# Gnuplot e.g. just generates the latex to put inplace.	# Gnuplot e.g. just generates the latex to put inplace.
#	#
my $graphinclude;	my $graphinclude;
if ($src =~ /^\\graphicspath/) {	if ($src =~ /^%DYNAMICIMAGE/) {
	# This is needed because the newline is not always passed -> tex.
	# At present we don't care about the sizing info.

	my ($commentline, $restofstuff) = split(/\n/, $src);
$graphinclude = $src;	$graphinclude = $src;
	$graphinclude =~ s/^$commentline//;
} else {	} else {
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)=
Line 494 sub start_rectangle {	Line 646 sub start_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$target eq 'analyze' \|\| $target eq 'answer') {
&Apache::lonxml::startredirection;	&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser);	my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser,$style);
$result=&Apache::edit::tag_start($target,$token,'Rectangle').	$result=&Apache::edit::tag_start($target,$token,'Rectangle').
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).	&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
&Apache::edit::entercoord(undef,'textnode',undef,undef,'box').	&Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
Line 526 sub end_rectangle {	Line 678 sub end_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$target eq 'analyze' \|\| $target eq 'answer') {
my $name = $Apache::imageresponse::curname;	my $name = $Apache::imageresponse::curname;
my $area = &Apache::lonxml::endredirection;	my $area = &Apache::lonxml::endredirection;
$area=~s/\s//g;	$area=~s/\s//g;
&Apache::lonxml::debug("out is $area for $name");	&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";	push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area";
} else {	} else {
Line 548 sub start_polygon {	Line 700 sub start_polygon {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$target eq 'analyze' \|\| $target eq 'answer') {
&Apache::lonxml::startredirection;	&Apache::lonxml::startredirection;
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
my $coords=&Apache::lonxml::get_all_text('/polygon',$parser);	my $coords=&Apache::lonxml::get_all_text('/polygon',$parser,$style);
$result=&Apache::edit::tag_start($target,$token,'Polygon').	$result=&Apache::edit::tag_start($target,$token,'Polygon').
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40).	&Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').	&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
Line 607 sub end_polygon {	Line 759 sub end_polygon {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'tex' \|\|
$target eq 'analyze') {	$target eq 'analyze' \|\| $target eq 'answer') {
my $name = $Apache::imageresponse::curname;	my $name = $Apache::imageresponse::curname;
my $area = &Apache::lonxml::endredirection;	my $area = &Apache::lonxml::endredirection;
$area=~s/\s*//g;	$area=~s/\s*//g;
&Apache::lonxml::debug("out is $area for $name");	&Apache::lonxml::debug("out is $area for $name");
if ( $Apache::imageresponse::conceptgroup	if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()	&& !&Apache::response::showallfoils()
) {	) {
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";	push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area";
} else {	} else {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.68
changed lines
	Added in v.1.90