--- loncom/publisher/lonpublisher.pm 2011/10/22 21:25:37 1.269
+++ loncom/publisher/lonpublisher.pm 2013/07/15 16:13:31 1.283
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.269 2011/10/22 21:25:37 www Exp $
+# $Id: lonpublisher.pm,v 1.283 2013/07/15 16:13:31 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,10 +66,10 @@ invocation by F:
=head1 OVERVIEW
-Authors can only write-access the C~authorname/> space. They can
-copy resources into the resource area through the publication step,
-and move them back through a recover step. Authors do not have direct
-write-access to their resource space.
+Authors can only write-access the C space.
+They can copy resources into the resource area through the
+publication step, and move them back through a recover step.
+Authors do not have direct write-access to their resource space.
During the publication step, several events will be
triggered. Metadata is gathered, where a wizard manages default
@@ -121,7 +121,6 @@ use HTML::LCParser;
use HTML::Entities;
use Encode::Encoder;
use Apache::lonxml;
-use Apache::loncacc;
use DBI;
use Apache::lonnet;
use Apache::loncommon();
@@ -266,9 +265,9 @@ sub metaread {
my ($logfile,$fn,$prefix)=@_;
unless (-e $fn) {
print($logfile 'No file '.$fn."\n");
- return ''
- .&mt('No file: [_1]'
- ,' '.&Apache::loncfile::display($fn).'
');
+ return ''
+ .&mt('No file: [_1]',&Apache::loncfile::display($fn))
+ .'
';
}
print($logfile 'Processing '.$fn."\n");
my $metastring;
@@ -277,9 +276,9 @@ sub metaread {
$metastring=join('',<$metafh>);
}
&metaeval($metastring,$prefix);
- return ''
- .&mt('Processed file: [_1]'
- ,' '.&Apache::loncfile::display($fn).'
');
+ return ''
+ .&mt('Processed file: [_1]',&Apache::loncfile::display($fn))
+ .'
';
}
#########################################
@@ -1017,6 +1016,11 @@ sub publish {
$outdep.= ' - '.&mt('Currently not available').
'';
} else {
+#
+# Store the fact that the dependency has been used by the target file
+# Unfortunately, usage is erroneously named sequsage in lonmeta.pm
+# The translation happens in lonmetadata.pm
+#
my %temphash=(&Apache::lonnet::declutter($target).'___'.
&Apache::lonnet::declutter($thisdep).'___usage'
=> time);
@@ -1223,14 +1227,12 @@ sub publish {
my $intr_scrout.='
'
.'
';
}
$intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
$intr_scrout.=
@@ -1767,9 +1769,8 @@ sub phasetwo {
# ------------------------------------------------ Provide link to new resource
unless ($batch) {
- my $thissrc=$source;
- $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
+ my $thissrc=&Apache::loncfile::url($source);
my $thissrcdir=$thissrc;
$thissrcdir=~s/\/[^\/]+$/\//;
@@ -1839,8 +1840,6 @@ sub batchpublish {
my %oldenv=%env;
$srcfile=~s/\/+/\//g;
$targetfile=~s/\/+/\//g;
- my $thisdisfn=$srcfile;
- $thisdisfn=~s/\/home\/korte\/public_html\///;
$srcfile=~s/\/+/\//g;
my $docroot=$r->dir_config('lonDocRoot');
@@ -1857,8 +1856,7 @@ sub batchpublish {
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
$r->print(''
- .&mt('Publishing [_1]'
- ,''.$thisdisfn.'')
+ .&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))
.'
'
);
@@ -1884,15 +1882,15 @@ sub publishdirectory {
my ($r,$fn,$thisdisfn)=@_;
$fn=~s/\/+/\//g;
$thisdisfn=~s/\/+/\//g;
- my $resdir=
- $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
- $thisdisfn;
+ my $thisdisresdir=$thisdisfn;
+ $thisdisresdir=~s/^\/priv\//\/res\//;
+ my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
$r->print(&Apache::lonhtmlcommon::start_pick_box()
.&Apache::lonhtmlcommon::row_title(&mt('Directory'))
.''.$thisdisfn.''
.&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Target'))
- .''.$resdir.''
+ .''.$thisdisresdir.''
);
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -1901,7 +1899,7 @@ sub publishdirectory {
$r->print(&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Options'))
);
- $r->print('