--- loncom/publisher/lonpubdir.pm 2019/08/13 19:27:43 1.160.2.5 +++ loncom/publisher/lonpubdir.pm 2015/01/19 15:36:11 1.163 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Authoring Space Directory Lister # -# $Id: lonpubdir.pm,v 1.160.2.5 2019/08/13 19:27:43 raeburn Exp $ +# $Id: lonpubdir.pm,v 1.163 2015/01/19 15:36:11 goltermann Exp $ # # Copyright Michigan State University Board of Trustees # @@ -80,21 +80,14 @@ sub handler { } } $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); - my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; - my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname, - "$londocroot/priv/$udom/$uname"); # expressed in kB - my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom, - 'author'); # expressed in MB - - # Put out the start of page. - &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); + &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. if (!-d $fn) { if (-e $fn) { @@ -115,8 +108,8 @@ sub handler { return OK; } - # Put out actions for directory, browse/upload + new file page. - &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota); + &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; @@ -199,7 +192,15 @@ sub handler { .$columns{$key}{text}.$arrows[$idx].'' : ''.$columns{$key}{text}.''); } - $r->print(&Apache::loncommon::start_data_table() + +my $result = ""; + $r->print($result); + + $r->print('
'.&Apache::loncommon::start_data_table() + .'' .&Apache::loncommon::start_data_table_header_row() . $output .&Apache::loncommon::end_data_table_header_row() ); @@ -306,10 +307,23 @@ sub handler { } } - $r->print( &Apache::loncommon::end_data_table() - .&Apache::loncommon::end_page() ); - - return OK; + $r->print(&Apache::loncommon::end_data_table() + .'
' + .&Apache::loncommon::end_page() + ); + return OK; } @@ -318,17 +332,14 @@ sub handler { # - The HTML header # - The H1/H3 stuff which includes the directory. # -# startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota); +# startpage($r, $uame, $udom, $thisdisfn); # $r - The apache request object. # $uname - User name. # $udom - Domain name the user is logged in under. # $thisdisfn - Displayable version of the filename. -# $current_disk_usage - User's current disk usage (in kB). -# $disk_quota - Disk quota for user's authoring space (in MB). -# $crstype - Course type, if this is for "course author" sub startpage { - my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_; + my ($r, $uname, $udom, $thisdisfn) = @_; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -350,12 +361,11 @@ sub startpage { 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 = 1024 * $disk_quota; # convert from MB to kB + $disk_quota = 1000 * $disk_quota; # convert from MB to kB $r->print(&Apache::loncommon::head_subbox( '
' - .&Apache::lonhtmlcommon::display_usage($current_disk_usage, - $disk_quota,'authoring') + .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota) .'
' .&Apache::loncommon::CSTR_pageheader())); @@ -473,7 +483,7 @@ ENDPUBDIRSCRIPT } sub dircontrols { - my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_; + my ($r,$uname,$udom,$thisdisfn) = @_; my %lt=&Apache::lonlocal::texthash( cnpd => 'Cannot publish directory', cnrd => 'Cannot retrieve directory', @@ -504,15 +514,15 @@ sub dircontrols { go => 'Go', prnt => 'Print contents of directory', crea => 'Create a new directory or LON-CAPA document', + qs => 'Quick Search', + cs => 'Case Sensitive', + re => 'Regular Expression', acti => 'Actions for current directory', updc => 'Upload a new document', pick => 'Please select an action to perform using the new filename', ); my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript - # Calculate free space in bytes. - # $disk_quota is in MB and $current_disk_usage is in kB - my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage); - $r->print(<printf(<
@@ -537,13 +547,12 @@ sub dircontrols {
-
+
$lt{'updc'} - - +
@@ -578,27 +587,27 @@ sub dircontrols {    -
+
Quickactions: - - + + - + - - + + + + + %s +
+ + +
END @@ -961,6 +982,134 @@ sub check_for_versions { return $versions; } +sub prepareJsonTranslations { + my $json = + '{"translations":{'. + '"edit":"'.&mt('Edit').'",'. + '"editxml":"'.&mt('EditXML').'",'. + '"editmeta":"'.&mt('Edit Metadata').'",'. + '"obsolete":"'.&mt('Obsolete').'",'. + '"modified":"'.&mt('Modified').'",'. + '"published":"'.&mt('Published').'",'. + '"unpublished":"'.&mt('Unpublished').'",'. + '"diff":"'.&mt('Diff').'",'. + '"retrieve":"'.&mt('Retrieve').'",'. + '"directory":"'.&mt('Directory').'",'. + '"results":"'.&mt('Show results for keyword:').'"'. + '}}'; +} + +# gathers all files in the working directory except the ones that are already on screen +sub prepareJsonData { + my ($uname, $udom, $pathToSkip) = @_; + my $path = "/home/httpd/html/priv/$udom/$uname/"; + + # maximum number of entries, to limit workload and required storage space + my $entries = 100; + my $firstfile = 1; + my $firstdir = 1; + + my $json = '{"resources":['; + $json .= &prepareJsonData_rec($path, \$entries, \$firstfile, \$firstdir, $pathToSkip); + $json .= ']}'; + + # if the json string is invalid the whole search breaks. + # so we want to make sure that the string is valid in any case. + $json =~ s/,\s*,/,/g; + $json =~ s/\}\s*\{/\},\{/g; + $json =~ s/\}\s*,\s*\]/\}\]/g; + return $json; +} + +# recursive part of json file gathering +sub prepareJsonData_rec { + my ($path, $entries, $firstfile, $firstdir, $pathToSkip) = @_; + my $json; + my $skipThisFolder = $path =~ m/$pathToSkip\/$/?1:0; + + my @dirs; + my @resources; + my @ignored = qw(bak log meta save . ..); + +# Phase 1: Gathering + opendir(DIR,$path); + my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); + foreach my $filename (@files) { + next if ($filename eq '.DS_Store'); + + # gather all resources + if ($filename !~ /\./) { + # its a folder + push(@dirs, $filename); + } else { + # only push files we dont want to ignore + next if ($skipThisFolder); + + $filename =~ /\.(\w+?)$/; + unless (grep /$1/, @ignored) { + push(@resources, $filename); + } + } + } + closedir(DIR); + # nothing to do here if both lists are empty + return unless ( @dirs || @resources ); + +# Phase 2: Working + $$firstfile = 1; + + foreach (@dirs) { + $json .= '{"name":"'.$_.'",'. + '"path":"'.$path.$_.'",'. + '"title":"",'. + '"status":"",'. + '"cmtime":""},'; + } + + foreach (@resources) { + last if ($$entries < 1); + my $title = &getTitleString($path.$_); + + my $privpath = $path.$_; + my $respath = $privpath; + $respath =~ s/httpd\/html\/priv\//httpd\/html\/res\//; + + my $cmtime = (stat($privpath))[9]; + my $rmtime = (stat($respath))[9]; + + unless ($$firstfile) { $json .= ','; } else { $$firstfile = 0; } + + my $status = 'unpublished'; + + # if a resource is published, the published version (/html/res/filepath) gets its own modification time + # this is newer or equal then the version in your authoring space (/html/priv/filepath) + if ($rmtime >= $cmtime) { + # obsolete + if (&Apache::lonnet::metadata($respath, 'obsolete')) { + $status = 'obsolete'; + }else{ + $status = 'published'; + } + } else { + $status = 'modified'; + } + + $json .= '{"name":"'.$_.'",'. + '"path":"'.$path.'",'. + '"title":"'.$title.'",'. + '"status":"'.$status.'",'. + '"cmtime":"'.&Apache::lonlocal::locallocaltime($cmtime).'"}'; + $$entries--; + } + + foreach(@dirs) { + next if ($$entries < 1); + $json .= ','; + $json .= &prepareJsonData_rec + ($path.$_.'/', $entries, $firstfile, $firstdir, $pathToSkip); + } + return $json; +} 1; __END__