--- loncom/homework/imageresponse.pm 2008/11/18 19:14:28 1.96
+++ loncom/homework/imageresponse.pm 2013/04/30 03:03:34 1.105
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# image click response style
#
-# $Id: imageresponse.pm,v 1.96 2008/11/18 19:14:28 jms Exp $
+# $Id: imageresponse.pm,v 1.105 2013/04/30 03:03:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -179,7 +179,8 @@ sub end_imageresponse {
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
$target eq 'tex' || $target eq 'analyze') {
- &Apache::lonxml::increment_counter(&Apache::response::repetition(),
+ my $repetition = &Apache::response::repetition();
+ &Apache::lonxml::increment_counter($repetition,
"$part_id.$response_id");
if ($target eq 'analyze') {
&Apache::lonhomework::set_bubble_lines();
@@ -187,15 +188,15 @@ sub end_imageresponse {
}
&Apache::response::end_response();
-
return $result;
}
%Apache::response::foilgroup=();
sub start_foilgroup {
+ my ($target) = @_;
%Apache::response::foilgroup=();
$Apache::imageresponse::conceptgroup=0;
- &Apache::response::pushrandomnumber();
+ &Apache::response::pushrandomnumber(undef,$target);
return '';
}
@@ -211,8 +212,11 @@ sub getfoilcounts {
sub whichfoils {
my ($max)=@_;
- return if (!defined(@{ $Apache::response::foilgroup{'names'} }));
- my @names = @{ $Apache::response::foilgroup{'names'} };
+ my @names;
+ if (ref($Apache::response::foilgroup{'names'}) eq 'ARRAY') {
+ @names = @{ $Apache::response::foilgroup{'names'} };
+ }
+ return if (!@names);
my @whichopt;
while ((($#whichopt+1) < $max) && ($#names > -1)) {
&Apache::lonxml::debug("Have $#whichopt max is $max");
@@ -320,7 +324,7 @@ sub displayfoils {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
if ( ($target eq 'web' || $target eq 'answer')
- && $image !~ /^http:/ ) {
+ && $image !~ /^https?\:/ ) {
$image=&clean_up_image($image);
}
push(@images,$image);
@@ -353,12 +357,59 @@ sub displayfoils {
$temp++;
}
if ($target eq 'web') {
- &Apache::response::setup_prior_tries_hash(\&format_prior_response,
- [\@images,\@whichopt]);
+ &get_prior_options(\@images,\@whichopt);
}
return $result;
}
+sub get_prior_options {
+ my ($currimages,$curropt) = @_;
+ return unless((ref($curropt) eq 'ARRAY') &&
+ (ref($currimages) eq 'ARRAY'));
+ my $part = $Apache::inputtags::part;
+ my $respid = $Apache::inputtags::response[-1];
+ foreach my $i (1..$Apache::lonhomework::history{'version'}) {
+ my $partprefix = "$i:resource.$part";
+ my $sub_key = "$partprefix.$respid.submission";
+ next if (!exists($Apache::lonhomework::history{$sub_key}));
+ my $type_key = "$partprefix.type";
+ my @whichopt = ();
+ my @images = ();
+ if ($Apache::lonhomework::history{$type_key} eq 'randomizetry') {
+ my $order_key = "$partprefix.$respid.foilorder";
+ @whichopt = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+ if (@whichopt > 0) {
+ foreach my $name (@whichopt) {
+ my $image=$Apache::response::foilgroup{"$name.image"};
+ if ($image !~ /^https?\:/ ) {
+ $image=&clean_up_image($image);
+ }
+ push(@images,$image);
+ }
+ }
+ } else {
+ @whichopt = @{$curropt};
+ @images = @{$currimages};
+ }
+ my $submission;
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $submission = $Apache::lonhomework::history{$sub_key};
+ } else {
+ unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+ $submission = $Apache::lonhomework::history{$sub_key};
+ }
+ }
+ my $output = &format_prior_response('grade',$submission,
+ [\@images,\@whichopt]);
+ if (defined($output)) {
+ $Apache::inputtags::submission_display{$sub_key} = $output;
+ }
+ }
+}
+
sub format_prior_response {
my ($mode,$answer,$other_data) = @_;
@@ -386,7 +437,7 @@ sub display_answers {
my $image=$Apache::response::foilgroup{"$name.image"};
&Apache::lonxml::debug("image is $image");
if ( ($target eq 'web' || $target eq 'answer')
- && $image !~ /^http:/ ) {
+ && $image !~ /^https?\:/ ) {
$image = &clean_up_image($image);
}
my $token=&prep_image($image,'answeronly',$name);
@@ -401,7 +452,7 @@ sub clean_up_image {
my ($image)=@_;
if ($image =~ /\s*<img\s*/) {
($image) = ($image =~ /src\s*=\s*[\"\']([^\"\']+)[\"\']/i);
- if ($image !~ /^http:/) {
+ if ($image !~ /^https?\:/) {
$image=&Apache::lonnet::hreflocation('',$image);
}
if (!$image) {
@@ -435,9 +486,11 @@ sub gradefoils {
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"} })) {
- my @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+ my @areas;
+ if (ref($Apache::response::foilgroup{"$name.area"}) eq 'ARRAY') {
+ @areas = @{ $Apache::response::foilgroup{"$name.area"} };
+ }
+ if (defined($x) && defined($y) && @areas) {
my $grade="INCORRECT";
foreach my $area (@areas) {
&Apache::lonxml::debug("Area is $area for $name");
@@ -460,6 +513,9 @@ sub gradefoils {
}
$temp++;
}
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ $Apache::lonhomework::results{"resource.$partid.$id.foilorder"} = &Apache::lonnet::array2str(@whichopt);
+ }
my ($result) = &Apache::inputtags::finalizeawards(\@results,[]);
&Apache::lonxml::debug("Question is $result");
@@ -467,8 +523,18 @@ sub gradefoils {
my %previous=
&Apache::response::check_for_previous(&stringify_submission(\%response),
$part,$id);
- if ($result
- && $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; }
+ if ($result) {
+ 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::lonhomework::results{"resource.$part.$id.submission"}=
&stringify_submission(\%response);
@@ -479,8 +545,6 @@ sub gradefoils {
sub stringify_submission {
my ($response) = @_;
return &Apache::lonnet::hash2str(%{ $response });
-
-
}
sub get_submission {
@@ -489,8 +553,29 @@ sub get_submission {
if (!defined($string)) {
my $part=$Apache::inputtags::part;
my $respid=$Apache::inputtags::response['-1'];
- $string =
- $Apache::lonhomework::history{"resource.$part.$respid.submission"};
+ my $newvariation;
+ if ((($Apache::lonhomework::history{"resource.$part.type"} eq 'randomizetry') ||
+ ($Apache::lonhomework::type eq 'randomizetry')) &&
+ ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+ if ($env{'form.'.$part.'.rndseed'} ne
+ $Apache::lonhomework::history{"resource.$part.rndseed"}) {
+ $newvariation = 1;
+ }
+ }
+ unless ($newvariation) {
+ if ((($env{'form.grade_username'} eq '') && ($env{'form.grade_domain'} eq '')) ||
+ (($env{'form.grade_username'} eq $env{'user.name'}) &&
+ ($env{'form.grade_domain'} eq $env{'user.domain'}))) {
+ $string =
+ $Apache::lonhomework::history{"resource.$part.$respid.submission"};
+ } else {
+ unless (($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurvey') ||
+ ($Apache::lonhomework::history{"resource.$part.type"} eq 'anonsurveycred')) {
+ $string =
+ $Apache::lonhomework::history{"resource.$part.$respid.submission"};
+ }
+ }
+ }
}
if ($string !~ /=/) {
@@ -504,7 +589,7 @@ sub get_submission {
sub end_foilgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- my @whichopt;
+ my (@images,@whichopt);
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex' ||
$target eq 'analyze' || $target eq 'answer') {
@@ -517,6 +602,11 @@ sub end_foilgroup {
if ($target eq 'web' || $target eq 'tex') {
$result=&displayfoils($target,@whichopt);
+ if ($Apache::lonhomework::type eq 'randomizetry') {
+ if ($target eq 'web') {
+ &get_prior_options(\@images,\@whichopt);
+ }
+ }
$Apache::lonxml::post_evaluate=0;
} elsif ($target eq 'grade') {
if ( defined $env{'form.submitted'}) { &gradefoils(@whichopt); }
@@ -716,11 +806,13 @@ sub end_image {
my ($commentline, $restofstuff) = split(/\n/, $src);
$graphinclude = $src;
$graphinclude =~ s/^$commentline//;
- } else {
+ } elsif (!($src =~ /\\/)) {
my ($path,$file) = &Apache::londefdef::get_eps_image($src);
my ($height_param,$width_param)=
&Apache::londefdef::image_size($src,0.3,$parstack,$safeeval);
$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;
}