--- loncom/homework/imageresponse.pm 2005/06/22 12:03:23 1.72
+++ loncom/homework/imageresponse.pm 2007/09/25 23:16:13 1.85
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.72 2005/06/22 12:03:23 albertel Exp $
+# $Id: imageresponse.pm,v 1.85 2007/09/25 23:16:13 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,9 @@ use Apache::londefdef();
use Apache::Constants qw(:common :http);
use Apache::lonlocal;
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
BEGIN {
&Apache::lonxml::register('Apache::imageresponse',('imageresponse'));
@@ -57,18 +60,34 @@ sub start_imageresponse {
} elsif ($target eq 'analyze') {
my $part_id="$Apache::inputtags::part.$id";
push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
+ push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} },
+ 1);
}
return $result;
}
sub end_imageresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- &Apache::response::end_response;
- pop @Apache::lonxml::namespace;
+
+ pop(@Apache::lonxml::namespace);
&Apache::lonxml::deregister('Apache::imageresponse',('foilgroup','foil','text','image','rectangle','conceptgroup'));
+
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);
+
+ if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze') {
+ &Apache::lonxml::increment_counter(&Apache::response::repetition());
+ }
+ &Apache::response::end_response();
+
return $result;
}
@@ -113,15 +132,27 @@ sub whichfoils {
sub prep_image {
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 (%x,$i);
- $x{"cgi.$id.BGIMG"}=&Apache::lonnet::escape($image);
- my ($x,$y)=split(/:/,$Apache::lonhomework::history{"resource.$part.$respid.submission"});
+ $x{"cgi.$id.BGIMG"}=&escape($image);
+
#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
- 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 $width = 1;
my $extrawidth = 2;
@@ -147,11 +178,10 @@ sub prep_image {
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin),
"FF0000",($width)));
}
- if ($mode eq 'answer') {
+ if ($mode eq 'answer' || $mode eq 'answeronly') {
my $width = 1;
my $extrawidth = 2;
- my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
- foreach my $area (@areas) {
+ foreach my $area (@{ $areas }) {
if ($area=~/^rectangle:/) {
$x{"cgi.$id.OBJTYPE"}.='RECTANGLE:';
$i=$x{"cgi.$id.OBJCOUNT"}++;
@@ -181,9 +211,9 @@ sub prep_image {
sub displayfoils {
my ($target,@whichopt) = @_;
my $result ='';
- my $name;
my $temp=1;
- foreach $name (@whichopt) {
+ my @images;
+ foreach my $name (@whichopt) {
$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";}
@@ -191,7 +221,8 @@ sub displayfoils {
&Apache::lonxml::debug("image is $image");
if ( $target eq 'web' && $image !~ /^http:/ ) {
$image=&clean_up_image($image);
- }
+ }
+ push(@images,$image);
&Apache::lonxml::debug("image is $image");
if ( &Apache::response::show_answer() ) {
if ($target eq 'tex') {
@@ -204,15 +235,63 @@ sub displayfoils {
if ($target eq 'tex') {
$result.=$Apache::response::foilgroup{"$name.image"}."\\vskip 0 mm \n";
} else {
- my $id=$Apache::inputtags::response['-1'];
- my $token=&prep_image($image);
- my $temp=1;
- $result.="<input type=\"image\" name=\"HWVAL_$id:$temp\" ".
- "src=\"/adm/randomlabel.png?token=$token\" /><br />\n";
+ my $respid=$Apache::inputtags::response['-1'];
+ my $token=&prep_image($image,'submission',$name);
+ my $id = "HWVAL_$respid:$temp";
+ $result.='<img onclick="image_response_click(\''.$id.'\',event);"
+ 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++;
}
+ 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;
+ 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_header('imageresponse');
+ $result.=&Apache::response::answer_part('imageresponse',"<img src=\"/adm/randomlabel.png?token=$token\" /><br />\n");
+ $result.=&Apache::response::answer_footer('imageresponse');
+ }
return $result;
}
@@ -238,14 +317,21 @@ sub clean_up_image {
sub gradefoils {
my (@whichopt) = @_;
- my $x;
- my $y;
- my $result;
- my $id=$Apache::inputtags::response['-1'];
+
+ my $partid = $Apache::inputtags::part;
+ 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 %response;
foreach my $name (@whichopt) {
- $x=$env{"form.HWVAL_$id:$temp.x"};
- $y=$env{"form.HWVAL_$id:$temp.y"};
+ my ($x,$y) = split(':',$env{"form.HWVAL_$id:$temp"});
+ $response{$name} = $env{"form.HWVAL_$id:$temp"};
&Apache::lonxml::debug("Got a x of $x and a y of $y for $name");
if (defined($x) && defined($y) &&
defined(@{ $Apache::response::foilgroup{"$name.area"} })) {
@@ -266,41 +352,80 @@ sub gradefoils {
if ($grade eq 'APPROX_ANS') { last; }
}
&Apache::lonxml::debug("Foil was $grade");
- if ($grade eq 'INCORRECT') { $result= 'INCORRECT'; }
- if (($grade eq 'APPROX_ANS') && ($result ne 'APPROX_ANS')) { $result=$grade; }
- &Apache::lonxml::debug("Question is $result");
- $temp++;
+ push(@results, $grade)
+ } else {
+ push(@results, 'MISSING_ANSWER')
}
+ $temp++;
}
- my $responsestr="$x:$y";
+ my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
+ &Apache::lonxml::debug("Question is $result");
+
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
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
&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;
- 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 {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my @whichopt;
+
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);
if ($count>$max) { $count=$max }
&Apache::lonxml::debug("Count is $count from $max");
+
@whichopt = &whichfoils($max);
+
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,@whichopt);
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'grade') {
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
} elsif ( $target eq 'analyze') {
&Apache::response::analyze_store_foilgroup(\@whichopt,
['text','image','area']);
+ } elsif ($target eq 'answer'
+ && $env{'form.answer_output_mode'} ne 'tex') {
+ $result=&display_answers($target,\@whichopt);
}
+
} elsif ($target eq 'edit') {
$result=&Apache::edit::end_table();
}
@@ -345,7 +470,7 @@ sub start_foil {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
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);
if ($name eq "") {
&Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");
@@ -388,10 +513,11 @@ sub end_foil {
sub start_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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;
} 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').
&Apache::edit::editfield($token->[1],$descr,'Text',60,2).
&Apache::edit::end_row();
@@ -404,7 +530,8 @@ sub start_text {
sub end_text {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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;
if ( $Apache::imageresponse::conceptgroup
#&& !&Apache::response::showallfoils()
@@ -422,16 +549,18 @@ sub end_text {
sub start_image {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
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;
} 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::bgimgsrcdepth=$Apache::lonxml::curdepth;
$result=&Apache::edit::tag_start($target,$token,'Clickable Image').
&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').
&Apache::edit::end_row();
} elsif ($target eq "modified") {
@@ -444,7 +573,7 @@ sub end_image {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
my $name = $Apache::imageresponse::curname;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'answer') {
my $image = &Apache::lonxml::endredirection();
&Apache::lonxml::debug("original image is $image");
if ( $Apache::imageresponse::conceptgroup
@@ -499,10 +628,10 @@ sub start_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
&Apache::lonxml::startredirection;
} 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').
&Apache::edit::editline($token->[1],$coords,'Coordinate Pairs',40).
&Apache::edit::entercoord(undef,'textnode',undef,undef,'box').
@@ -531,7 +660,7 @@ sub end_rectangle {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
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 $area = &Apache::lonxml::endredirection;
$area=~s/\s//g;
@@ -553,10 +682,10 @@ sub start_polygon {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'answer') {
&Apache::lonxml::startredirection;
} 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').
&Apache::edit::editline($token->[1],$coords,'Coordinate list',40).
&Apache::edit::entercoord(undef,'textnode',undef,undef,'polygon').
@@ -612,7 +741,7 @@ sub end_polygon {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
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 $area = &Apache::lonxml::endredirection;
$area=~s/\s*//g;