--- loncom/homework/imageresponse.pm 2005/12/01 18:46:31 1.73 +++ loncom/homework/imageresponse.pm 2006/03/09 01:11:12 1.74 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # image click response style # -# $Id: imageresponse.pm,v 1.73 2005/12/01 18:46:31 albertel Exp $ +# $Id: imageresponse.pm,v 1.74 2006/03/09 01:11:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -63,12 +63,25 @@ sub start_imageresponse { 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') { + $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; } @@ -238,10 +251,18 @@ sub clean_up_image { sub gradefoils { my (@whichopt) = @_; + + 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 $x; my $y; my $result; - my $id=$Apache::inputtags::response['-1']; my $temp=1; foreach my $name (@whichopt) { $x=$env{"form.HWVAL_$id:$temp.x"}; @@ -280,7 +301,7 @@ sub gradefoils { &Apache::response::handle_previous(\%previous,$result); $Apache::lonhomework::results{"resource.$part.$id.submission"}=$responsestr; $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$result; - return ''; + return; } sub end_foilgroup {