version 1.25, 2003/05/05 18:24:50
|
version 1.29, 2003/06/09 22:29:45
|
Line 103 sub displayfoils {
|
Line 103 sub displayfoils {
|
my $temp=1; |
my $temp=1; |
foreach $name (@whichopt) { |
foreach $name (@whichopt) { |
$result.=$Apache::response::foilgroup{"$name.text"}; |
$result.=$Apache::response::foilgroup{"$name.text"}; |
|
&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";} |
my $image=$Apache::response::foilgroup{"$name.image"}; |
my $image=$Apache::response::foilgroup{"$name.image"}; |
|
&Apache::lonxml::debug("image is $image"); |
if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { |
if ($Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"} =~ /^correct/ ) { |
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"; |
Line 134 sub gradefoils {
|
Line 136 sub gradefoils {
|
$x=$ENV{"form.HWVAL_$id:$temp.x"}; |
$x=$ENV{"form.HWVAL_$id:$temp.x"}; |
$y=$ENV{"form.HWVAL_$id:$temp.y"}; |
$y=$ENV{"form.HWVAL_$id:$temp.y"}; |
&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(@{ $Apache::response::foilgroup{"$name.area"} })) { |
if (defined($x) && defined($y) && |
|
defined(@{ $Apache::response::foilgroup{"$name.area"} })) { |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
my @areas = @{ $Apache::response::foilgroup{"$name.area"} }; |
my $grade="INCORRECT"; |
my $grade="INCORRECT"; |
foreach my $area (@areas) { |
foreach my $area (@areas) { |
Line 170 sub end_foilgroup {
|
Line 173 sub end_foilgroup {
|
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); |
} elsif ($target eq 'grade') { |
} |
if ( defined $ENV{'form.submitted'}) { &gradefoils(@whichopt); } |
if ($target eq 'grade') { |
} |
if ( defined $ENV{'form.submitted'}) { |
} elsif ($target eq 'edit') { |
&gradefoils(@whichopt); |
$result=&Apache::edit::end_table(); |
} |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 190 sub start_conceptgroup {
|
Line 192 sub start_conceptgroup {
|
|
|
sub end_conceptgroup { |
sub end_conceptgroup { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
$Apache::imageresponse::conceptgroup=0; |
$Apache::imageresponse::conceptgroup=0; |
|
my $result; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
if (defined(@{ $Apache::response::conceptgroup{'names'} })) { |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
my @names = @{ $Apache::response::conceptgroup{'names'} }; |
Line 206 sub end_conceptgroup {
|
Line 209 sub end_conceptgroup {
|
&Apache::lonxml::debug("Selecting $name in $concept"); |
&Apache::lonxml::debug("Selecting $name in $concept"); |
} |
} |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
return ''; |
return $result; |
} |
} |
|
|
$Apache::imageresponse::curname=''; |
$Apache::imageresponse::curname=''; |
Line 228 sub start_foil {
|
Line 233 sub start_foil {
|
} |
} |
|
|
sub end_foil { |
sub end_foil { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
return ''; |
my $result; |
|
if ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
|
} |
|
return $result; |
} |
} |
|
|
sub start_text { |
sub start_text { |
Line 238 sub start_text {
|
Line 247 sub start_text {
|
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $descr=$$parser[$#$parser]->get_text("/text"); |
my $descr=&Apache::lonxml::get_all_text('/text',$parser); |
$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::start_spanning_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $bgimg=$$parser[$#$parser]->get_text("/text"); |
my $descr=&Apache::lonxml::get_all_text('/text',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
&Apache::lonxml::debug($result); |
&Apache::lonxml::debug($result); |
} |
} |
Line 252 sub start_text {
|
Line 261 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; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
Line 260 sub end_text {
|
Line 270 sub end_text {
|
} else { |
} else { |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
return ''; |
return $result; |
} |
} |
|
|
sub start_image { |
sub start_image { |
Line 270 sub start_image {
|
Line 282 sub start_image {
|
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $bgimg=$$parser[$#$parser]->get_text("/image"); |
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); |
|
$Apache::edit::bgimgsrc=$bgimg; |
|
$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').' '; |
$result.=&Apache::edit::search(undef,'textnode'). |
$result.=&Apache::edit::search(undef,'textnode'). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $bgimg=$$parser[$#$parser]->get_text("/image"); |
my $bgimg=&Apache::lonxml::get_all_text('/image',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
&Apache::lonxml::debug($result); |
&Apache::lonxml::debug($result); |
} |
} |
Line 285 sub start_image {
|
Line 300 sub start_image {
|
} |
} |
|
|
sub end_image { |
sub end_image { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result; |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection; |
Line 296 sub end_image {
|
Line 312 sub end_image {
|
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $src = &Apache::lonxml::endredirection; |
my $src = &Apache::lonxml::endredirection; |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
Line 343 sub end_image {
|
Line 361 sub end_image {
|
$path = $1.'/'; |
$path = $1.'/'; |
} |
} |
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/(\.gif|\.jpg)$/\.eps/i; |
$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; |
$file=~s/(\.gif|\.jpg)$/\.eps/i; |
$file=~s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; |
#do we have any specified size of the picture? |
#do we have any specified size of the picture? |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); |
my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); |
my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); |
Line 369 sub end_image {
|
Line 387 sub end_image {
|
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$Apache::response::foilgroup{"$name.image"} ='\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} |
} |
} |
} |
return ''; |
return $result; |
} |
} |
|
|
sub start_rectangle { |
sub start_rectangle { |
Line 378 sub start_rectangle {
|
Line 396 sub start_rectangle {
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
my $coords=$$parser[$#$parser]->get_text("/rectangle"); |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
$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::end_row().&Apache::edit::start_spanning_row(); |
&Apache::edit::entercoordpair(undef,'textnode'). |
|
&Apache::edit::end_row(); |
} elsif ($target eq "modified") { |
} elsif ($target eq "modified") { |
my $coords=$$parser[$#$parser]->get_text("/rectangle"); |
my $coords=&Apache::lonxml::get_all_text('/rectangle',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
&Apache::lonxml::debug($result); |
&Apache::lonxml::debug($result); |
} |
} |
Line 409 sub grade_rectangle {
|
Line 428 sub grade_rectangle {
|
|
|
sub end_rectangle { |
sub end_rectangle { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
my $area = &Apache::lonxml::endredirection; |
my $area = &Apache::lonxml::endredirection; |
Line 419 sub end_rectangle {
|
Line 439 sub end_rectangle {
|
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
} |
} |
|
} elsif ($target eq 'edit') { |
|
$result=&Apache::edit::end_table(); |
} |
} |
return ''; |
return $result; |
} |
} |
1; |
1; |
__END__ |
__END__ |