--- loncom/interface/groupsort.pm 2007/11/02 21:08:45 1.61 +++ loncom/interface/groupsort.pm 2012/05/02 19:10:13 1.68.6.1 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.61 2007/11/02 21:08:45 albertel Exp $ +# $Id: groupsort.pm,v 1.68.6.1 2012/05/02 19:10:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -86,8 +86,8 @@ sub update_actions_hash { sub readfromdb { my ($r,$resources)=@_; - my $diropendb = - "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db"; + my $diropendb = LONCAPA::tempdir() . + "$env{'user.domain'}_$env{'user.name'}_sel_res.db"; # ----------------------------- diropendb is now the filename of the db to open if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { @@ -191,12 +191,12 @@ sub readfrombookmarks { 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+//; + my $url = $bookmarks[$index*2+1]; + my $name = $bookmarks[$index*2]; + $name =~ s/^LON\-CAPA\s+//; - push(@{$resources},{'url' => $url, 'title' => $name}); - } + push(@{$resources},{'url' => $url, 'title' => $name}); + } } } @@ -206,9 +206,6 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['acts','mode','readfile','recover','bookmarks']); - # color scheme - my $fileclr = '#ffffe6'; - my $titleclr = '#ddffff'; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -303,13 +300,22 @@ END if ($env{'form.readfile'}) { &readfromfile($r,\@resources); } elsif ($env{'form.bookmarks'}) { - &readfrombookmarks($r,\@resources); + &readfrombookmarks($r,\@resources); } else { &readfromdb($r,\@resources); } my $ctr = 0; my $clen = scalar(@resources); + my $title = ''; + if ($env{'form.recover'}) { + $title = 'Recover Removed Resources'; + } else { + $title = 'Sort Imported Resources'; + } + if ($env{'form.bookmarks'}) { + $title = 'Import Resources from Bookmarks'; + } if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { my %lt=&Apache::lonlocal::texthash( 'fin'=> 'Finalize order of resources', @@ -317,15 +323,16 @@ END 'cs' => 'Continue Search', 'fi' => 'Finish Import', 're' => 'Recover Checked', + 'ip' => 'Import Checked', 'ca' => 'Cancel', 'co' => 'Change Order', 'ti' => 'Title', 'pa' => 'Path', 'in' => 'Include' ); - my $title = ($env{'form.recover'}) ? 'Recover Removed Resources' - : 'Sort Imported Resources'; + $r->print(&Apache::loncommon::start_page($title, $js)); + $r->print('

'.&mt($title).'

'); $r->print(<print(&Apache::loncommon::inhibit_menu_check('input')); # --- - - if ($env{'form.recover'}) { + + my $buttontext = $lt{'re'}; + if ($env{'form.bookmarks'}) { + $buttontext = $lt{'ip'} + } + if ($env{'form.recover'} || $env{'form.bookmarks'}) { $r->print(<  END @@ -353,7 +364,8 @@ END my $resurl = &Apache::loncommon::escape_single(&Apache::loncommon::lastresurl()); $r->print(<$lt{'fin'} +

$lt{'fin'}

+
    +
+
END } - $r->print("
"); - $r->print("\n"); - if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { - $r->print("\n"); - } else { - $r->print("\n"); - } - $r->print("\n"); - $r->print("\n"); + + # Only display header if content exists + if ($clen > 0) { + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row()); + if (($env{'form.readfile'})) { + $r->print("\n"); + } else { + $r->print(''."\n"); + } + $r->print(''."\n"); + $r->print(""); + $r->print(&Apache::loncommon::end_data_table_header_row()."\n"); + } else { + my $errtxt = ''; + if ($env{'form.recover'}) { + $errtxt = 'There are no resources to recover.'; + } 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 { $r->print(&Apache::loncommon::start_page(undef,$js, {'only_body' => 1})); +# $r->print('

'.&mt($title).'

'); $r->print(< @@ -389,8 +420,9 @@ END foreach my $resource (@resources) { $ctr++; my $iconname=&Apache::loncommon::icon($resource->{'url'}); - if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { - $r->print(""); unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { - $r->print(""); } - $r->print("\n"); + $r->print("" + .&Apache::loncommon::end_data_table_row() + ."\n"); } } if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { - $r->print("
$lt{'in'}$lt{'co'}$lt{'ti'}$lt{'pa'}
$lt{'in'}'.$lt{'co'}.''.$lt{'ti'}.'$lt{'pa'}
"); + if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { + $r->print(&Apache::loncommon::start_data_table_row() + .""); if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print(&checkbox($ctr-1)); } else { @@ -402,19 +434,24 @@ END if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { $r->print("". + $r->print("". &select_box($clen,$ctr). ""); + $r->print(""); $r->print(""); - $r->print(""); - $r->print($resource->{'title'}.$resource->{'notes'}."\n"); - $r->print($resource->{'url'}."
"); + $r->print($resource->{'title'}.$resource->{'notes'}."\n"); + $r->print($resource->{'url'}."
"); + if ($clen > 0) { + $r->print(&Apache::loncommon::end_data_table()); + } + $r->print(''); } else { $r->print(< @@ -489,3 +526,30 @@ sub checkbox { 1; __END__ + +=pod + +=head1 NAME + +Apache::groupsort.pm + +=head1 SYNOPSIS + +Implements a second phase of importing +multiple resources into the RAT. Allows for +reordering the sequence of resources + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + + +=head1 NOTABLE SUBROUTINES + +=over + +=item + +=back + +=cut +