--- loncom/interface/groupsort.pm 2012/05/02 19:10:13 1.68.6.1 +++ loncom/interface/groupsort.pm 2013/01/08 03:46:07 1.70 @@ -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.1 2012/05/02 19:10:13 raeburn Exp $ +# $Id: groupsort.pm,v 1.70 2013/01/08 03:46:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,7 @@ use GDBM_File; use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); my $iconpath; # variable to be accessible to multiple subroutines my %hash; # variable to tie to user specific database @@ -152,12 +152,18 @@ sub readfromfile { &Apache::lonnet::filelocation('',$env{'form.readfile'})); } else { my $parser = HTML::TokeParser->new(\$cont); - my $token; + my ($token,$donechk,%allmaps); 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)$/) { + unless ($donechk) { + $donechk = &get_allmaps(\%allmaps); + } + if ($allmaps{$token->[2]->{'src'}}) { next; } + } } else { if ($token->[2]->{'type'} eq 'zombie') { next; } } @@ -181,23 +187,33 @@ sub readfromfile { } } -# --------------------------------------------------------- Read from bookmarks - -sub readfrombookmarks { - my ($r,$resources)=@_; - my %bookmarks=&Apache::lonnet::dump('bookmarks'); -# the bookmark "hash" is just one entry -# it's a javascript program code with arguments like ('title','url'); - my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g); - for (my $index=0;$index<($#bookmarks+1)/2;$index++) { - if ($bookmarks[$index*2+1]) { - my $url = $bookmarks[$index*2+1]; - my $name = $bookmarks[$index*2]; - $name =~ s/^LON\-CAPA\s+//; - - push(@{$resources},{'url' => $url, 'title' => $name}); +sub get_allmaps { + my ($allmaps) = @_; + return unless (ref($allmaps) eq 'HASH'); + if (($env{'form.recover'}) && + ($env{'request.course.id'}) && + ($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) { + my $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + my $chome = $env{'course.'.$cid.'.home'}; + my $lastchange = + &Apache::lonnet::get_coursechange($cdom,$cnum); + if ($lastchange > $env{'request.course.tied'}) { + my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); + unless ($ferr) { + &Apache::loncommon::update_content_constraints($cdom,$cnum, + $chome,$cid); + } + } + my $navmap = Apache::lonnavmaps::navmap->new(); + if (defined($navmap)) { + foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { + $allmaps->{$res->src()} = 1; + } } } + return 1; } # ---------------------------------------------------------------- Main Handler @@ -205,7 +221,7 @@ sub handler { my $r = shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['acts','mode','readfile','recover','bookmarks']); + ['acts','mode','readfile','recover']); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -215,7 +231,7 @@ sub handler { my $finishimport=''; my $begincondition=''; my $endcondition=''; - if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($env{'form.readfile'})) { $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {'; $endcondition='}'; } @@ -299,8 +315,6 @@ END if ($env{'form.readfile'}) { &readfromfile($r,\@resources); - } elsif ($env{'form.bookmarks'}) { - &readfrombookmarks($r,\@resources); } else { &readfromdb($r,\@resources); } @@ -313,10 +327,7 @@ END } else { $title = 'Sort Imported Resources'; } - if ($env{'form.bookmarks'}) { - $title = 'Import Resources from Bookmarks'; - } - if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($clen > 1) || ($env{'form.readfile'})) { my %lt=&Apache::lonlocal::texthash( 'fin'=> 'Finalize order of resources', 'ci' => 'Continue Import', @@ -342,7 +353,6 @@ END - END @@ -350,10 +360,7 @@ END # --- my $buttontext = $lt{'re'}; - if ($env{'form.bookmarks'}) { - $buttontext = $lt{'ip'} - } - if ($env{'form.recover'} || $env{'form.bookmarks'}) { + if ($env{'form.recover'}) { $r->print(<  @@ -397,9 +404,6 @@ END } else { $errtxt = 'There are no resources to import.'; } - if ($env{'form.bookmarks'}) { - $errtxt = 'There are no resources in your bookmarks to import.'; - } $r->print('

'.&mt($errtxt).'

'); } } else { @@ -420,10 +424,10 @@ END foreach my $resource (@resources) { $ctr++; my $iconname=&Apache::loncommon::icon($resource->{'url'}); - if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($clen > 1) || ($env{'form.readfile'})) { $r->print(&Apache::loncommon::start_data_table_row() .""); - if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($env{'form.readfile'})) { $r->print(&checkbox($ctr-1)); } else { $r->print(&movers($clen,$ctr)); @@ -431,9 +435,9 @@ END } $r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'}, $resource->{'id'})); - if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($clen > 1) || ($env{'form.readfile'})) { $r->print(""); - unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + unless (($env{'form.readfile'})) { $r->print("". &select_box($clen,$ctr). ""); @@ -441,13 +445,20 @@ END $r->print(""); $r->print(""); $r->print(""); - $r->print($resource->{'title'}.$resource->{'notes'}."\n"); + if (($env{'form.recover'}) && + ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) { + my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'}); + $r->print($title); + } else { + $r->print($resource->{'title'}); + } + $r->print($resource->{'notes'}."\n"); $r->print($resource->{'url'}."" .&Apache::loncommon::end_data_table_row() ."\n"); } } - if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + if (($clen > 1) || ($env{'form.readfile'})) { if ($clen > 0) { $r->print(&Apache::loncommon::end_data_table()); }