version 1.75, 2006/03/09 01:33:57
|
version 1.85, 2007/09/25 23:16:13
|
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); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 70 sub end_imageresponse {
|
Line 75 sub end_imageresponse {
|
my $result; |
my $result; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex' |
|
&& $Apache::lonhomework::type eq 'exam') { |
$result=&Apache::inputtags::exam_score_line($target); |
$result=&Apache::inputtags::exam_score_line($target); |
} |
} |
|
|
Line 126 sub whichfoils {
|
Line 132 sub whichfoils {
|
|
|
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/ |
if (defined($x) && $x =~/\S/ |
&& defined($y) && $y =~/\S/ |
&& defined($y) && $y =~/\S/ |
&& !&Apache::response::show_answer() |
&& ($mode eq 'submission' || !&Apache::response::show_answer()) |
&& $mode ne 'answeronly') { |
&& $mode ne 'answeronly') { |
my $length = 6; |
my $length = 6; |
my $width = 1; |
my $width = 1; |
Line 166 sub prep_image {
|
Line 181 sub prep_image {
|
if ($mode eq 'answer' || $mode eq 'answeronly') { |
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 197 sub prep_image {
|
Line 211 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 207 sub displayfoils {
|
Line 221 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 220 sub displayfoils {
|
Line 235 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 $id = "HWVAL_$respid:$temp"; |
$result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ". |
$result.='<img onclick="image_response_click(\''.$id.'\',event);" |
"src=\"/adm/randomlabel.png?token=$token\" /><br />\n"; |
src="/adm/randomlabel.png?token='.$token.'" |
|
id="imageresponse_'.$id.'" |
|
/>'. |
|
'<br />'. |
|
'<input type="hidden" name="token_'.$id.'" value="'.$token.'" />'. |
|
'<input type="hidden" name="'.$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; |
return $result; |
} |
} |
|
|
Line 282 sub gradefoils {
|
Line 326 sub gradefoils {
|
return; |
return; |
} |
} |
|
|
my $x; |
my @results; |
my $y; |
|
my $result; |
|
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 309 sub gradefoils {
|
Line 352 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 |
|
join("\0",map {$_."\1".$response->{$_}} (sort(keys(%{ $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 !~ /\0/) { |
|
return split(':',$string); |
|
} else { |
|
my %response = map { split("\1",$_,2) } (split("\0",$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=''; |
Line 342 sub end_foilgroup {
|
Line 415 sub end_foilgroup {
|
|
|
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') { |
} elsif ($target eq 'answer' |
|
&& $env{'form.answer_output_mode'} ne 'tex') { |
$result=&display_answers($target,\@whichopt); |
$result=&display_answers($target,\@whichopt); |
} |
} |
|
|
Line 474 sub end_text {
|
Line 549 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=''; |
|
my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures')); |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze' |
|| $target eq 'answer') { |
|| $target eq 'answer') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
Line 484 sub start_image {
|
Line 560 sub start_image {
|
|
|
$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") { |