--- loncom/homework/lonhomework.pm 2005/11/21 21:51:29 1.226 +++ loncom/homework/lonhomework.pm 2005/12/21 17:53:25 1.230 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.226 2005/11/21 21:51:29 albertel Exp $ +# $Id: lonhomework.pm,v 1.230 2005/12/21 17:53:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -171,8 +171,8 @@ sub proctor_checked_in { my $key; if ($type eq 'Task') { - my $version=$Apache::lonhomework::history{'resource.version'}; - $key ="resource.$version.checkedin"; + my $version=$Apache::lonhomework::history{'resource.0.version'}; + $key ="resource.$version.0.checkedin"; } elsif ($type eq 'problem') { $key ='resource.0.checkedin'; } @@ -260,8 +260,8 @@ sub check_slot_access { if ($type eq 'Task') { my $version=$Apache::lonhomework::history{'resource.version'}; - if ($Apache::lonhomework::history{"resource.$version.checkedin"} && - $Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { + if ($Apache::lonhomework::history{"resource.$version.0.checkedin"} && + $Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass') { return ('SHOW_ANSWER'); } } @@ -297,11 +297,11 @@ sub check_slot_access { my ($pass_status,$checkedin); if ($type eq 'Task') { - my $version=$Apache::lonhomework::history{'resource.version'}; + my $version=$Apache::lonhomework::history{'resource.0.version'}; $pass_status = - $Apache::lonhomework::history{"resource.$version.status"} eq 'fail'; + $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail'; $checkedin = - $Apache::lonhomework::history{"resource.$version.checkedin"}; + $Apache::lonhomework::history{"resource.$version.0.checkedin"}; } elsif ($type eq 'problem') { $pass_status = 1; $checkedin = $Apache::lonhomework::history{"resource.0.checkedin"}; @@ -753,23 +753,28 @@ sub editxmlmode { my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef, ($env{'environment.remote'} ne 'off')); my $html=&Apache::lonxml::xmlbegin(); - $result.=$html.$bodytag. + my $head="