--- loncom/homework/bridgetask.pm 2016/05/30 02:45:32 1.266 +++ loncom/homework/bridgetask.pm 2018/01/31 15:28:28 1.270 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.266 2016/05/30 02:45:32 raeburn Exp $ +# $Id: bridgetask.pm,v 1.270 2018/01/31 15:28:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -97,7 +97,7 @@ sub proctor_check_auth { sub check_in { my ($type,$user,$domain,$slot_name,$needsiptied) = @_; my $useslots = &Apache::lonnet::EXT("resource.0.useslots"); - my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'}; + my $ip=$ENV{'REMOTE_ADDR'} || $env{'request.host'}; if ( $useslots eq 'map_map') { my $result = &check_in_sequence($user,$domain,$slot_name,$ip,$needsiptied); if ($result =~ /^error: /) { @@ -123,7 +123,7 @@ sub check_in_sequence { my ($symb) = &Apache::lonnet::whichuser(); my ($map) = &Apache::lonnet::decode_symb($symb); my @resources = - $navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0); + $navmap->retrieveResources($map, sub { $_[0]->is_problem() || $_[0]->is_tool() },0,0); my %old_history = %Apache::lonhomework::history; my %old_results = %Apache::lonhomework::results; @@ -131,7 +131,14 @@ sub check_in_sequence { foreach my $res (@resources) { &Apache::lonxml::debug("doing ".$res->src); &Apache::structuretags::initialize_storage($res->symb); - my $type = ($res->is_task()) ? 'Task' : 'problem'; + my $type; + if ($res->is_task()) { + $type = 'Task'; + } elsif ($res->is_tool) { + $type = 'tool'; + } else { + $type = 'problem'; + } my $result = &create_new_version($type,$user,$domain,$slot_name,$res->symb,$ip,$needsiptied); if ($result eq 'ok') { &Apache::structuretags::finalize_storage($res->symb); @@ -187,7 +194,7 @@ sub create_new_version { $domain = $env{'user.domain'}; } - } elsif ($type eq 'problem') { + } elsif (($type eq 'problem') || ($type eq 'tool')) { &Apache::lonxml::debug("authed $slot_name"); } if (!defined($user) || !defined($domain)) {