--- loncom/publisher/lonpubdir.pm 2003/05/16 20:47:08 1.31 +++ loncom/publisher/lonpubdir.pm 2004/12/07 22:35:34 1.70 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# (Publication Handler +# Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.31 2003/05/16 20:47:08 albertel Exp $ +# $Id: lonpubdir.pm,v 1.70 2004/12/07 22:35:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,19 +25,6 @@ # # http://www.lon-capa.org/ # -# -# (TeX Content Handler -# -# YEAR=2000 -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# YEAR=2001 -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer -# 12/28 Gerd Kortemeyer -# ### package Apache::lonpubdir; @@ -48,6 +35,11 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonlocal; +use Apache::lonmsg; +use Apache::lonmenu; +use Apache::lonnet; sub handler { @@ -69,13 +61,13 @@ sub handler { $fn,$r->dir_config('lonDefDomain')); unless (($uname) && ($udom)) { $r->log_reason($uname.' at '.$udom. - ' trying to publish file '.$ENV{'form.filename'}. + ' trying to list directory '.$ENV{'form.filename'}. ' ('.$fn.') - not authorized', $r->filename); return HTTP_NOT_ACCEPTABLE; } - # Remove trailing / from direcgtory name. + # Remove trailing / from directory name. $fn=~s/\/$//; @@ -96,21 +88,34 @@ sub handler { my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory. my $linkdir='/priv/'.$uname.$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. - - # Start off the diretory table. + if ($ENV{'environment.remote'} eq 'off') { + &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. - $r->print(''. - ''. - ''); + my $numdir = 0; + my $numres = 0; + + # Start off the directory table. + $r->print('

Directory Contents:

'); + $r->print('
ActionsNameTitleStatusLast Modified
'. + ''. + ''. + ''. + ''. + ''. + ''); my $filename; my $dirptr=16384; # Mask indicating a directory in stat.cmode. opendir(DIR,$fn); - my @files=sort(readdir(DIR)); + my @files=sort {uc($a) cmp uc($b)} (readdir(DIR)); foreach my $filename (@files) { my ($cdev,$cino,$cmode,$cnlink, $cuid,$cgid,$crdev,$csize, @@ -120,10 +125,10 @@ sub handler { my $extension=''; if ($filename=~/\.(\w+)$/) { $extension=$1; } if ($cmode&$dirptr) { - putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime); + putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir); } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { - putresource($r, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime); + putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, + $targetdir, $linkdir, $cmtime,\%bombs,\$numres); } else { # "hidden" extension and not a directory, so hide it away. } @@ -147,7 +152,9 @@ sub getEffectiveUrl { # Replace the ~username of the URL with /home/username/public_html # so that we don't have to worry about ~ expansion internally. # - $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; + $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^\///; + $fn=~s/\~(\w+)/\/home\/$1\/public_html/; # Remove trailing / strings (?) @@ -163,6 +170,7 @@ sub getEffectiveUrl { $fn=~s|^/~(\w+)|/home/$1/public_html|; } } + $fn=~s/\/+/\//g; return $fn; } # @@ -178,49 +186,244 @@ sub getEffectiveUrl { sub startpage { my ($r, $uname, $udom, $thisdisfn) = @_; - - $r->content_type('text/html'); + my $currdir = '/priv/'.$uname.$thisdisfn; + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - + $r->print('LON-CAPA Construction Space'); - - $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1)); + + my $pagetitle; + my $formaction='/priv/'.$uname.$thisdisfn.'/'; + $formaction=~s/\/+/\//g; + $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring'). + 'Construction Space: '. + ''. + &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."
". + &Apache::lonhtmlcommon::select_recent('construct','recent', + 'this.form.action=this.form.recent.value;this.form.submit()'). + ''; + &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction); + if ($ENV{'environment.remote'} eq 'off') { + $ENV{'request.noversionuri'}=$currdir.'/'; + $r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle)); + } else { + $r->print($pagetitle); + } my $pubdirscript=(< +// Store directory location for menu bar to find + +parent.lastknownpriv='/~$uname$thisdisfn/'; + +// Confirmation dialogues + + function currdiract(theform) { + if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') { + document.publishdir.filename.value = theform.filename.value + pubdir(document.publishdir) + } + if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') { + document.publishdir.filename.value = theform.filename.value + pubrecdir(document.publishdir) + } + if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') { + top.location=theform.filename.value+'default.meta' + } + if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) { + document.printdir.postdata.value=theform.filename.value + document.printdir.submit(); + } + } + function pubdir(theform) { if (confirm('Publish complete directory?')) { + forcepub(theform) theform.submit(); } } - function pubrecdir(theform) { + function pubrecdir(theform) { if (confirm('Publish directory and all subdirectories?')) { + forcepub(theform); theform.pubrec.value='1'; theform.submit(); } } + + function forcepub(theform) { + if (confirm('Force publication of unmodified files? - OK=yes; Cancel=No.')) { + theform.forcerepub.value="ON"; + } + } + + function checkUpload(theform) { + if (theform.file == '') { + alert("Please use 'Browse..' to choose a file first, before uploading") + return + } + theform.submit() + } + + function SetPubDir(theform,printForm) { + if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") { + top.location = theform.filename.value + return + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") { + pubdir(theform) + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") { + pubrecdir(theform) + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") { + top.location=theform.filename.value+'default.meta' + } + if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") { + theform.action = '/adm/printout' + theform.postdata.value = theform.filename.value + theform.submit() + } + return + } + function SetResChoice(theform) { + var activity = theform.reschoice.options[theform.reschoice.selectedIndex].value + if ((activity == 'rename') || (activity == 'copy') || (activity == 'move')) { + changename(theform,activity) + } + if (activity == 'publish') { + var pubform = document.pubresource + pubform.filename.value = theform.filename.value + pubform.submit() + } + if (activity == 'delete') { + var delform = document.delresource + delform.filename.value = theform.filename.value + if (confirm("Are you sure you want to delete "+theform.filename.value+"?")) { + delform.submit() + } + } + if (activity == 'obsolete') { + var pubform = document.pubresource + pubform.filename.value = theform.filename.value + alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.") + pubform.submit() + } + if (activity == 'print') { + document.printresource.postdata.value = theform.filename.value + document.printresource.submit() + } + if (activity == 'retrieve') { + document.retrieveres.filename.value = theform.filename.value + document.retrieveres.submit() + } + return + } + function changename(theform,activity) { + var newname=prompt('New Name'); + if (newname == "" || !newname) { + return + } + document.moveresource.newfilename.value = newname + document.moveresource.filename.value = theform.filename.value + document.moveresource.action.value = activity + document.moveresource.submit(); + } ENDPUBDIRSCRIPT + $r->print($pubdirscript); - $r->print('

Construction Space Directory '. - $thisdisfn.'/

'. - ''. - $pubdirscript. - '
'. - ''. - ''. - ''. - ''. -''); - if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('

Co-Author: '.$uname.' at '.$udom. + $r->print('

'.&mt('Co-Author').': '.$uname.' at '.$udom. '

'); } } +sub dircontrols { + my ($r,$uname,$udom,$thisdisfn) = @_; + $r->print(< + + + + + + + + + + +
'.&mt('Type').''.&mt('Actions').''.&mt('Name').''.&mt('Title').''.&mt('Status').''.&mt('Last Modified'). + '
Actions for current directoryUpload a new documentCreate a new directory or LON-CAPA document
+
+ + +
+
+ + + +
+
+ +
+ 		+
+ + + +
+ 		+
+ + +    + +
+
+END +} + +sub resourceactions { + my ($r,$uname,$udom,$thisdisfn) = @_; + $r->print(< + + + + +
+ + +
+
+ + + +
+
+ +
+
+ +
+END +} + # # Get the title string or "[untitled]" if the file has no title metadata: # Without the latter substitution, it's impossible to examine metadata for @@ -235,12 +438,20 @@ sub getTitleString { my $title = &Apache::lonnet::metadata($fullname, 'title'); unless ($title) { - $title = "[untitled]"; + $title = "[".&mt('untitled')."]"; } return $title; } +sub getCopyRightString { + my $fullname = shift; + return &Apache::lonnet::metadata($fullname, 'copyright'); +} +sub getSourceRightString { + my $fullname = shift; + return &Apache::lonnet::metadata($fullname, 'sourceavail'); +} # # Put out a directory table row: # putdirectory(r, base, here, dirname, modtime) @@ -251,77 +462,202 @@ sub getTitleString { # modtime - Encoded modification time. # sub putdirectory { - my ($r, $reqfile, $here, $dirname, $modtime) = @_; - + my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_; # construct the display filename: the directory name unless ..: my $disfilename = $dirname; if ($dirname eq '..') { - $disfilename = 'Parent Directory'; + $disfilename = ''.&mt('Parent Directory').''; } - unless (( ($dirname eq '..') && ($reqfile eq '')) || - ($dirname eq '.')) { + unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { + my $kaputt=0; + foreach (keys %{$bombs}) { + if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; } + } + %Apache::lonpublisher::metadatafields=(); + %Apache::lonpublisher::metadatakeys=(); + my $construct=$here; + $construct=~s:^/priv/(\w+)$:/home/$1/public_html:; + my $dirpath = $here; + $dirpath=~s:^/priv/:/~:; + &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile( + $construct.'/'.$dirname.'/default.meta' + )); + my $actionitem = ''; + if ($dirname eq '..') { + $actionitem = 'Go to ...'; + } else { + $actionitem = + '
'. + ''. + ''. + ''. + ''. + ''. + '
'; + $$numdir ++; + } $r->print(''. - 'Go to ...'. - ''. - $disfilename.''. - ' '. - ' '. - ''.localtime($modtime).''. + ''. + ''.$actionitem.''. + ''. + $disfilename.''. + ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' '. + $Apache::lonpublisher::metadatafields{'subject'}.' '. + $Apache::lonpublisher::metadatafields{'keywords'}.''. + ''.&Apache::lonlocal::locallocaltime($modtime).''. "\n"); - } + } return OK; } # # Put a table row for a file resource. # sub putresource { - my ($r, $uname, $filename, $thisdisfn, + my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, - $cmtime) = @_; - - my $status='Unpublished'; - my $bgcolor='#FFCCCC'; + $cmtime,$bombs,$numres) = @_; + my $pubstatus = 'unpublished'; + my $status=&mt('Unpublished'); + my $bgcolor='#FFAA99'; my $title=' '; + my $publish_button=&mt('Publish'); +# my $action_buttons= +# '
'. +# &mt('Delete').''; if (-e $resdir.'/'.$filename) { my ($rdev,$rino,$rmode,$rnlink, $ruid,$rgid,$rrdev,$rsize, $ratime,$rmtime,$rctime, $rblksize,$rblocks)=stat($resdir.'/'.$filename); + $publish_button=&mt('Re-publish'); if ($rmtime>=$cmtime) { - $status='Published'; - $bgcolor='#CCFFCC'; + $pubstatus = 'published'; + $status=&mt('Published').'
'. + &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. + &mt(&getSourceRightString($targetdir.'/'.$filename)); + $bgcolor='#CCFF88'; + if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) { + $pubstatus = 'obsolete'; + $status=&mt('Obsolete'); + $bgcolor='#AAAAAA'; + } +# } else { +# $action_buttons=''; +# } $title=''. - getTitleString($targetdir.'/'.$filename, 'title').''; + &getTitleString($targetdir.'/'.$filename).''; } else { - $status='Modified'; - $bgcolor='#FFFFCC'; + $pubstatus = 'modified'; + $status=&mt('Modified').'
'. + &mt(&getCopyRightString($targetdir.'/'.$filename)).' '. + &mt(&getSourceRightString($targetdir.'/'.$filename)); + $bgcolor='#FFFF77'; +# $action_buttons=''; $title=''. - getTitleString($targetdir.'/'.$filename,'title').''; + &getTitleString($targetdir.'/'.$filename).''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { - $status.='
Diffs'; + '&versiontwo=priv" target=cat>'.&mt('Diffs').''; } - } + } + $title.='
'. + ($$bombs{$targetdir.'/'.$filename}?'':'Edit Metadata').''; $status.='
Retrieve'; + $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').''; + } + my $editlink=''; + my $editlink2=''; + if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { + $editlink='
('.&mt('Edit').')'; + } + if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { + $editlink=' ('.&mt('EditXML').')'; + $editlink2='
('.&mt('Edit').')'; } + if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { + $editlink=' ('.&mt('Decompress').')'; + } + my $pub_select = ''; + &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres); $r->print(''. - ''.'Publish'. - ''. - ''. - ''. - $filename.''. + ''.($filename=~/[\#\~]$/?' ': + ''). + ''.$pub_select.''. + ''. + ''. + $filename.''.$editlink2.$editlink. ''. ''.$title.''. ''.$status.''. - ''.localtime($cmtime).''. + ''.&Apache::lonlocal::locallocaltime($cmtime).''. "\n"); return OK; } + +sub create_pubselect { + my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_; + $$pub_select = ' +
+ +
'; + $$numres ++; +} + +sub check_for_versions { + my ($r,$fn,$udom,$uname) = @_; + my $versions = 0; + my $docroot=$r->dir_config('lonDocRoot'); + my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn; + my $resdir=$resfn; + $resdir=~s/\/[^\/]+$/\//; + $fn=~/\/([^\/]+)\.(\w+)$/; + my $main=$1; + my $suffix=$2; + opendir(DIR,$resdir); + while (my $filename=readdir(DIR)) { + if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) { + $versions ++; + } + } + return $versions; +} + # # Categorize files in the directory. # For each file in a list of files in a file directory, @@ -353,7 +689,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Publication Handler for Directories +Apache::lonpubdir - Construction space directory lister =head1 SYNOPSIS