[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /publisher lonpublisher.pm
raeburn
raeburn at source.lon-capa.org
Fri Jun 4 11:09:36 EDT 2021
raeburn Fri Jun 4 15:09:36 2021 EDT
Modified files: (Branch: version_2_11_X)
/loncom/publisher lonpublisher.pm
Log:
- For 2.11
Backport 1.298, 1.299
-------------- next part --------------
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.295 loncom/publisher/lonpublisher.pm:1.295.2.1
--- loncom/publisher/lonpublisher.pm:1.295 Tue Mar 22 16:41:10 2016
+++ loncom/publisher/lonpublisher.pm Fri Jun 4 15:09:36 2021
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.295 2016/03/22 16:41:10 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.295.2.1 2021/06/04 15:09:36 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -371,7 +371,7 @@
sub checkbox {
my ($name,$text)=@_;
- return "\n<br /><label><input type='checkbox' name='$name' /> ".
+ return "\n<label><input type='checkbox' name='$name' /> ".
&mt($text)."</label>";
}
@@ -428,7 +428,6 @@
'sel' => 'Select',
);
my $output = <<"END";
-<br />
<span class="LC_nobreak">
<label>
<input type="checkbox" name="commonaccess" value="$name" id="$chkid"
@@ -2064,23 +2063,39 @@
.&Apache::lonhtmlcommon::row_title(&mt('Target'))
.'<span class="LC_filename">'.$thisdisresdir.'</span>'
);
+ my %reasons = &Apache::lonlocal::texthash(
+ mod => 'Authoring Space file postdates published file',
+ modmeta => 'Authoring Space metadata file postdates published file',
+ unpub => 'Resource is unpublished',
+ );
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
unless ($env{'form.phase'} eq 'two') {
# ask user what they want
$r->print(&Apache::lonhtmlcommon::row_closure()
- .&Apache::lonhtmlcommon::row_title(&mt('Options'))
- );
+ .&Apache::lonhtmlcommon::row_title(&mt('Options')
+ .&Apache::loncommon::help_open_topic('Publishing_Directory_Options')));
$r->print(&hiddenfield('phase','two').
&hiddenfield('filename',$env{'form.filename'}).
- &checkbox('pubrec','include subdirectories').
- &checkbox('forcerepub','force republication of previously published files').
- &checkbox('obsolete','make file(s) obsolete').
- &checkbox('forceoverride','force directory level metadata over existing').
+ '<fieldset><legend>'.&mt('Recurse').'</legend>'.
+ &checkbox('pubrec','include subdirectories').
+ '</fieldset>'.
+ '<fieldset><legend>'.&mt('Force').'</legend>'.
+ &checkbox('forcerepub','force republication of previously published files').'<br />'.
+ &checkbox('forceoverride','force directory level metadata over existing').
+ '</fieldset>'.
+ '<fieldset><legend>'.&mt('Exclude').'</legend>'.
+ &checkbox('excludeunpub','exclude currently unpublished files').'<br />'.
+ &checkbox('excludemod','exclude modified files').'<br />'.
+ &checkbox('excludemodmeta','exclude files with modified metadata').
+ '</fieldset>'.
+ '<fieldset><legend>'.&mt('Actions').'</legend>'.
+ &checkbox('obsolete','make file(s) obsolete').'<br />'.
&common_access('dist',&mt('apply common copyright/distribution'),
- ['default','domain','custom']).
+ ['default','domain','custom']).'<br />'.
&common_access('source',&mt('apply common source availability'),
- ['closed','open'])
+ ['closed','open']).
+ '</fieldset>'
);
$r->print(&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()
@@ -2091,6 +2106,8 @@
$r->print(&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()
);
+ my %commonaccess;
+ map { $commonaccess{$_} = 1; } &Apache::loncommon::get_env_multiple('form.commonaccess');
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
# actually publish things
opendir(DIR,$fn);
@@ -2109,8 +2126,9 @@
}
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
-# find out publication status and/or exiting metadata
+# find out publication status and/or existing metadata
my $publishthis=0;
+ my $skipthis;
if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,
@@ -2118,22 +2136,72 @@
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) {
# previously published, modified now
- $publishthis=1;
- }
- my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
- my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
- if ( $meta_rmtime<$meta_cmtime ) {
- $publishthis=1;
+ if ($env{'form.excludemod'}) {
+ $skipthis='mod';
+ } else {
+ $publishthis=1;
+ }
}
+ unless ($skipthis) {
+ my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ if ( $meta_rmtime<$meta_cmtime ) {
+ if ($env{'form.excludemodmeta'}) {
+ $skipthis='modmeta';
+ $publishthis=0;
+ } else {
+ $publishthis=1;
+ }
+ } else {
+ unless (&Apache::loncommon::fileembstyle($extension) eq 'prv') {
+ if ($commonaccess{'dist'}) {
+ my ($currdist,$currdistfile,$currsourceavail);
+ my $currdist = &Apache::lonnet::metadata($thisdisresdir.'/'.$filename,'copyright');
+ if ($currdist eq 'custom') {
+ $currdistfile = &Apache::lonnet::metadata($thisdisresdir.'/'.$filename,'customdistributionfile');
+ }
+ if ($env{'form.commondistselect'} eq 'custom') {
+ if ($env{'form.commoncustomrights'} =~ m{^/res/.+\.rights$}) {
+ if ($currdist eq 'custom') {
+ unless ($env{'form.commoncustomrights'} eq $currdistfile) {
+ $publishthis=1;
+ }
+ } else {
+ $publishthis=1;
+ }
+ }
+ } elsif ($env{'form.commondistselect'} =~ /^default|domain|public$/) {
+ unless ($currdist eq $env{'form.commondistselect'}) {
+ $publishthis=1;
+ }
+ }
+ }
+ }
+ }
+ }
} else {
# never published
- $publishthis=1;
+ if ($env{'form.excludeunpub'}) {
+ $skipthis='unpub';
+ } else {
+ $publishthis=1;
+ }
}
if ($publishthis) {
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
} else {
- $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+ my $reason;
+ if ($skipthis) {
+ $reason = $reasons{$skipthis};
+ } else {
+ $reason = &mt('No changes needed to published resource or metadata');
+ }
+ $r->print('<br />'.&mt('Skipping').' '.$filename);
+ if ($reason) {
+ $r->print(' ('.$reason.')');
+ }
+ $r->print('<br />');
}
$r->rflush();
}
More information about the LON-CAPA-cvs
mailing list