--- loncom/publisher/lonpubdir.pm 2011/11/14 00:20:31 1.137 +++ loncom/publisher/lonpubdir.pm 2014/05/20 19:53:59 1.153 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Construction Space Directory Lister +# Authoring Space Directory Lister # -# $Id: lonpubdir.pm,v 1.137 2011/11/14 00:20:31 raeburn Exp $ +# $Id: lonpubdir.pm,v 1.153 2014/05/20 19:53:59 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,7 +33,6 @@ use strict; use Apache::File; use File::Copy; use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::londiff(); @@ -45,84 +44,193 @@ use LONCAPA; sub handler { - my $r=shift; + my $r=shift; - # Validate access to the construction space and get username@domain. + # Validate access to the construction space and get username:domain. - my $uname; - my $udom; - - ($uname,$udom)=&Apache::loncacc::constructaccess($r->uri); - unless (($uname) && ($udom)) { - return HTTP_NOT_ACCEPTABLE; - } + my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); + unless (($uname) && ($udom)) { + return HTTP_NOT_ACCEPTABLE; + } # ----------------------------------------------------------- Start page output - my $fn=$r->filename; - $fn=~s/\/$//; + my $fn=$r->filename; + $fn=~s/\/$//; + my $thisdisfn=$fn; - my $thisdisfn=$fn; - my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root. - $thisdisfn=~s/^\Q$docroot\E\/priv//; - - my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory - my $targetdir='/res'.$thisdisfn; # Publication target directory. - my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space. - - my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); - - &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. - &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory, - # browse/upload + new file page. - &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc. + my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root. + $thisdisfn=~s/^\Q$docroot\E\/priv//; + + my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory + my $targetdir='/res'.$thisdisfn; # Publication target directory. + my $linkdir='/priv'.$thisdisfn; # Full URL name of constr space. + + my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); + + &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. + &dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory, + # browse/upload + new file page. + &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc. - my $numdir = 0; - my $numres = 0; + my $numdir = 0; + my $numres = 0; - # Start off the directory table. - $r->print(&Apache::loncommon::start_data_table() - .&Apache::loncommon::start_data_table_header_row() - .''.&mt('Type').'' - .''.&mt('Actions').'' - .''.&mt('Name').'' - .''.&mt('Title').'' - .''.&mt('Status').'' - .''.&mt('Last Modified').'' - .&Apache::loncommon::end_data_table_header_row() - ); - - my $filename; - my $dirptr=16384; # Mask indicating a directory in stat.cmode. - - opendir(DIR,$fn); - my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); - foreach my $filename (@files) { - my ($cdev,$cino,$cmode,$cnlink, - $cuid,$cgid,$crdev,$csize, - $catime,$cmtime,$cctime, - $cblksize,$cblocks)=stat($fn.'/'.$filename); - - my $extension=''; - if ($filename=~/\.(\w+)$/) { $extension=$1; } - if ($cmode&$dirptr) { - &putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir); - } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { - &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime,\%bombs,\$numres); - } else { - # "hidden" extension and not a directory, so hide it away. - } - } - closedir(DIR); - - $r->print(&Apache::loncommon::end_data_table() - .&Apache::loncommon::end_page() - ); - return OK; + # Retrieving value for "sortby" and "sortorder" from QUERY_STRING + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['sortby','sortorder']); + + # Sort by name as default, not reversed + if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'filename' } + if (! exists($env{'form.sortorder'})) { $env{'form.sortorder'} = '' } + + my $sortby = $env{'form.sortby'}; + my $sortorder = $env{'form.sortorder'}; + + # Start off the directory table. + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row() + .''.&mt('Type') + .' ▼' + .''.&mt('Actions').'' + .''.&mt('Name') + .' ▼' + .''.&mt('Title') + .' ▼' + .''.&mt('Status') + .' ▼' + .''.&mt('Last Modified') + .' ▼' + .''.&mt('Size').' (kB)' + .' ▼' + .&Apache::loncommon::end_data_table_header_row() + ); + + my $dirptr=16384; # Mask indicating a directory in stat.cmode. + + opendir(DIR,$fn); + my $filehash = {}; + my @files= readdir(DIR); + foreach my $filename (@files) { + # Skip .DS_Store and hidden files + my ($extension) = ($filename=~/\.(\w+)$/); + next if (($filename eq '.DS_Store') + || &Apache::loncommon::fileembstyle($extension) eq 'hdn'); + + my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9]; + my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); + # Identify type of file according to icon used + my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); + my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn; + my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename); + + # Store size, title, and status for files but not directories + my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0; + my ($status, $pubstatus, $title, $fulltitle); + if (!($cmode&$dirptr)) { + ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, + $filename, $linkfilename, $cmtime, $meta_same); + ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, + $linkfilename, $meta_same, \%bombs); + } else { + ($status, $pubstatus) = ('',''); + ($fulltitle, $title) = ('',''); + } + + # This hash will allow sorting + $filehash->{ $filename } = { + "cmtime" => $cmtime, + "size" => $size, + "cmode" => $cmode, + "filetype" => $filetype, + "title" => $title, + "fulltitle" => $fulltitle, + "status" => $status, + "pubstatus" => $pubstatus, + "linkfilename" => $linkfilename, + } + } + + my @sorted_files; + # Sorting by something other than "Name". Name is the secondary key. + if ($sortby =~ m{cmtime|size}) { # Numeric fields + # First check if order should be reversed + if ($sortorder eq "rev") { + @sorted_files = sort { + $filehash->{$a}->{$sortby} <=> $filehash->{$b}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } else { + @sorted_files = sort { + $filehash->{$b}->{$sortby} <=> $filehash->{$a}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } + } elsif ($sortby =~ m{filetype|title|status}) { # String fields + if ($sortorder eq "rev") { + @sorted_files = sort { + $filehash->{$b}->{$sortby} cmp $filehash->{$a}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } else { + @sorted_files = sort { + $filehash->{$a}->{$sortby} cmp $filehash->{$b}->{$sortby} + or + uc($a) cmp uc($b) + } (keys(%{$filehash})); + } + + # Sort by "Name" is the default + } else { + if ($sortorder eq "rev") { + @sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash})); + } else { + @sorted_files = sort {uc($a) cmp uc($b)} (keys(%{$filehash})); + } + } + + # Print the sorted resources + foreach my $filename (@sorted_files) { + if ($filehash->{$filename}->{"cmode"}&$dirptr) { # Directories + &putdirectory($r, $thisdisfn, $linkdir, $filename, + $filehash->{$filename}->{"cmtime"}, + $targetdir, \%bombs, \$numdir); + } else { # Files + &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, + $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"}, + $filehash->{$filename}->{"size"}, \$numres, + $filehash->{$filename}->{"linkfilename"}, + $filehash->{$filename}->{"fulltitle"}, + $filehash->{$filename}->{"status"}, + $filehash->{$filename}->{"pubstatus"}); + } + } + + closedir(DIR); + + $r->print( &Apache::loncommon::end_data_table() + .&Apache::loncommon::end_page() ); + + return OK; } -# + + # Output the header of the page. This includes: # - The HTML header # - The H1/H3 stuff which includes the directory. @@ -144,20 +252,28 @@ sub startpage { &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({ - 'text' => 'Construction Space', + 'text' => 'Authoring Space', 'href' => &Apache::loncommon::authorspace($formaction), }); # breadcrumbs (and tools) will be created # in start_page->bodytag->innerregister $env{'request.noversionuri'}=$formaction; - $r->print(&Apache::loncommon::start_page('Construction Space',undef)); + $r->print(&Apache::loncommon::start_page('Authoring Space')); + + my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; + my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname"); + my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB + $disk_quota = 1000 * $disk_quota; # convert from MB to kB $r->print(&Apache::loncommon::head_subbox( - &Apache::loncommon::CSTR_pageheader())); + '
' + .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota) + .'
' + .&Apache::loncommon::CSTR_pageheader())); my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn); - my $doctitle = 'LON-CAPA '.&mt('Construction Space'); + my $doctitle = 'LON-CAPA '.&mt('Authoring Space'); my $newname = &mt('New Name'); my $pubdirscript=(< @@ -458,11 +574,12 @@ sub putdirectory { my $disfilename = $dirname; # Don't display directory itself, and there is no way up from root directory unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) { - my $kaputt=0; + my $kaputt=0; if (ref($bombs) eq 'HASH') { - foreach my $key (keys(%{$bombs})) { - if ($key =~ m{^\Q$targetdir/$disfilename\E/}) { $kaputt=1; last; } - } + foreach my $key (keys(%{$bombs})) { + my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename"); + if (($key) =~ m{^\Q$currentdir\E/}) { $kaputt=1; last; } + } } # # Get the metadata from that directory's default.meta to display titles @@ -507,51 +624,71 @@ sub putdirectory { } $r->print($Apache::lonpublisher::metadatafields{'keywords'}.''. ''.&Apache::lonlocal::locallocaltime($modtime).''. + ''. "\n"); } return OK; } -# -# Put a table row for a file resource. -# -sub putresource { - my ($r, $udom, $uname, $filename, $thisdisfn, - $resdir, $targetdir, $linkdir, - $cmtime,$bombs,$numres) = @_; - &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); + +sub getTitle { + my ($resdir, $targetdir, $filename, $linkfilename, $meta_same, $bombs) = @_; + my $title=''; + my $titleString = &getTitleString($targetdir.'/'.$filename); + if (-e $resdir.'/'.$filename) { + $title = ''.$titleString.''; + if (!$meta_same) { + $title = &mt('Metadata Modified').'
'.$title. + '
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'.meta'.'&versiontwo=priv', + &mt('Metadata Diffs'),600,500); + $title.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'.meta&inhibitmenu=yes&add_modal=yes', + &mt('Retrieve Metadata'),600,500); + } + } + # Allow editing metadata of published and unpublished resources + $title .= "\n".'
' if ($title); + $title .= ''. + ($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}? + ''.&mt('bomb').'': + &mt('Edit Metadata')). + ''; + + return ($title, $titleString); +} + + +sub isMetaSame { + my ($cstr_dir, $resdir, $filename) = @_; + my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; + my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; + return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', + $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) + ? 0 : 1; +} + + +sub getStatus { + my ($resdir, $targetdir, $cstr_dir, $filename, + $linkfilename, $cmtime, $meta_same) = @_; my $pubstatus = 'unpublished'; - my $status=&mt('Unpublished'); - my $css_class='LC_browser_file'; - my $title=' '; - my $publish_button=&mt('Publish'); - my $cstr_dir = $r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.'/'.$thisdisfn.'/'; - my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"'); + my $status = &mt('Unpublished'); if (-e $resdir.'/'.$filename) { - my $same=0; - my ($rdev,$rino,$rmode,$rnlink, - $ruid,$rgid,$rrdev,$rsize, - $ratime,$rmtime,$rctime, - $rblksize,$rblocks)=stat($resdir.'/'.$filename); - if ($rmtime>=$cmtime) { - $same=1; + my $same = 0; + if ((stat($resdir.'/'.$filename))[9] >= $cmtime) { + $same = 1; } else { if (&Apache::londiff::are_different_files($resdir.'/'.$filename, $cstr_dir.'/'.$filename)) { - $same=0; + $same = 0; } else { - $same=1; + $same = 1; } } - my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9]; - my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; - my $meta_same = 1; - if ($meta_rmtime < $meta_cmtime - && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta', - $cstr_dir.'/'.$filename.'.meta')) { - $meta_same = 0; - } - $publish_button=&mt('Re-publish'); my $rights_status = &mt(&getCopyRightString($targetdir.'/'.$filename)).', '; @@ -563,9 +700,6 @@ sub putresource { $rights_status .= $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)}; - $title = ''. - &getTitleString($targetdir.'/'.$filename).''; if ($same) { if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { $pubstatus = 'obsolete'; @@ -584,30 +718,39 @@ sub putresource { $status=&mt('Modified'). '
'. $rights_status; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { - $status.='
'.&mt('Diffs').''; + $status.='
'. + &Apache::loncommon::modal_link( + '/adm/diff?filename='.$linkfilename.'&versiontwo=priv', + &mt('Diffs'),600,500); } } - $title.="\n".'
'. - ($$bombs{$targetdir.'/'.$filename}?''.&mt('bomb').'':&mt('Edit Metadata')).''; - - if (!$meta_same) { - $title = &mt('Metadata Modified').'
'.$title. - '
'.&mt('Metadata Diffs').''; - $title.="\n".'
'.&mt('Retrieve Metadata').''; - } - $status.="\n".'
'.&mt('Retrieve').''; + $status.="\n".'
'. + &Apache::loncommon::modal_link( + '/adm/retrieve?filename='.$linkfilename.'&inhibitmenu=yes&add_modal=yes',&mt('Retrieve'),600,500); } + + return ($status, $pubstatus); +} + + +# +# Put a table row for a file resource. +# +sub putresource { + my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, + $linkdir, $cmtime, $size, $numres, $linkfilename, $title, + $status, $pubstatus) = @_; + &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename); + my $editlink=''; my $editlink2=''; if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { - $editlink='
('.&mt('Edit').')'; + $editlink='
('.&mt('Edit').')'; } if ($filename=~/$LONCAPA::assess_re/) { - $editlink=' ('.&mt('EditXML').')'; - $editlink2='
('.&mt('Edit').')'; + $editlink=' ('.&mt('EditXML').')'; + $editlink2='
('.&mt('Edit').')'; } if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { $editlink.=' ('.&mt('Clean Up').')'; @@ -615,6 +758,7 @@ sub putresource { if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { $editlink=' ('.&mt('Decompress').')'; } + my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish'); my $pub_select = ''; &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); $r->print(&Apache::loncommon::start_data_table_row(). @@ -629,6 +773,7 @@ sub putresource { '  '. # Display publication status ''.$status.''. ''.&Apache::lonlocal::locallocaltime($cmtime).''. + ''.sprintf("%.1f",$size).''. &Apache::loncommon::end_data_table_row() ); return OK; @@ -693,7 +838,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Construction space directory lister +Apache::lonpubdir - Authoring space directory lister =head1 SYNOPSIS @@ -790,4 +935,3 @@ Output the header of the page. This inc =back =cut -