--- loncom/interface/groupsort.pm 2013/01/09 16:41:03 1.68.6.5 +++ loncom/interface/groupsort.pm 2012/06/30 23:02:20 1.69 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.68.6.5 2013/01/09 16:41:03 raeburn Exp $ +# $Id: groupsort.pm,v 1.69 2012/06/30 23:02:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -152,23 +152,12 @@ sub readfromfile { &Apache::lonnet::filelocation('',$env{'form.readfile'})); } else { my $parser = HTML::TokeParser->new(\$cont); - my ($token,$donechk,$allmaps); - $allmaps = {}; + my $token; while ($token = $parser->get_token) { if ($token->[0] eq 'S') { if ($token->[1] eq 'resource') { if ($env{'form.recover'}) { if ($token->[2]->{'type'} ne 'zombie') { next; } - if ($token->[2]->{'src'} =~ /\.(page|sequence)$/) { - if (($env{'request.course.id'}) && - ($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) { - unless ($donechk) { - $allmaps = &Apache::loncommon::allmaps_incourse(); - $donechk = 1; - } - } - if ($allmaps->{$token->[2]->{'src'}}) { next; } - } } else { if ($token->[2]->{'type'} eq 'zombie') { next; } } @@ -192,6 +181,7 @@ sub readfromfile { } } + # ---------------------------------------------------------------- Main Handler sub handler { my $r = shift; @@ -421,12 +411,12 @@ END $r->print(""); $r->print(""); $r->print(""); - if (($env{'form.recover'}) && + if (($env{'form.recover'}) && ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) { - my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'}); + my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'}); $r->print($title); } else { - $r->print($resource->{'title'}); + $r->print($resource->{'title'}); } $r->print($resource->{'notes'}."\n"); $r->print($resource->{'url'}.""