--- loncom/interface/statistics/lonstathelpers.pm 2020/08/26 18:13:39 1.76 +++ loncom/interface/statistics/lonstathelpers.pm 2020/08/26 21:50:16 1.76.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA # -# $Id: lonstathelpers.pm,v 1.76 2020/08/26 18:13:39 raeburn Exp $ +# $Id: lonstathelpers.pm,v 1.76.2.1 2020/08/26 21:50:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -108,17 +108,10 @@ sub render_resource { #################################################### #################################################### sub get_resources { - my ($navmap,$sequence,$include_tools) = @_; - my @resources; - if ($include_tools) { - @resources = $navmap->retrieveResources($sequence, - sub { shift->is_gradable(); }, - 0,0,0); - } else { - @resources = $navmap->retrieveResources($sequence, - sub { shift->is_problem(); }, - 0,0,0); - } + my ($navmap,$sequence) = @_; + my @resources = $navmap->retrieveResources($sequence, + sub { shift->is_problem(); }, + 0,0,0); return @resources; } @@ -165,7 +158,7 @@ sub problem_selector { return $navmap if (! ref($navmap)); # error foreach my $seq (@sequences) { my $seq_str = ''; - foreach my $res (&get_resources($navmap,$seq,$include_tools)) { + foreach my $res (&get_resources($navmap,$seq)) { my $title = $res->compTitle; if (! defined($title) || $title eq '') { ($title) = ($res->src =~ m:/([^/]*)$:); @@ -190,14 +183,8 @@ sub problem_selector { } my %partsseen; foreach my $part (@{$res->parts}) { - my (@response_ids,@response_types); - if ($res->is_tool) { - @response_ids = (); - @response_types = ('tool'); - } else { - @response_ids = $res->responseIds($part); - @response_types = $res->responseType($part); - } + my @response_ids = $res->responseIds($part); + my @response_types = $res->responseType($part); for (my $i=0;$i