--- loncom/publisher/lonpublisher.pm 2008/08/14 13:39:02 1.245
+++ loncom/publisher/lonpublisher.pm 2021/06/03 13:59:44 1.298
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.245 2008/08/14 13:39:02 onken Exp $
+# $Id: lonpublisher.pm,v 1.298 2021/06/03 13:59:44 raeburn 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
@@ -102,8 +102,6 @@ to publication space.
Many of the undocumented subroutines implement various magical
parsing shortcuts.
-=over 4
-
=cut
######################################################################
@@ -121,7 +119,6 @@ use HTML::LCParser;
use HTML::Entities;
use Encode::Encoder;
use Apache::lonxml;
-use Apache::loncacc;
use DBI;
use Apache::lonnet;
use Apache::loncommon();
@@ -131,13 +128,9 @@ use Apache::lonlocal;
use Apache::loncfile;
use LONCAPA::lonmetadata;
use Apache::lonmsg;
-use vars qw(%metadatafields %metadatakeys);
+use vars qw(%metadatafields %metadatakeys %addid $readit);
use LONCAPA qw(:DEFAULT :match);
-
-my %addid;
-my %nokey;
-
my $docroot;
my $cuname;
@@ -150,6 +143,8 @@ my $lock;
=pod
+=over 4
+
=item B
Evaluates a string that contains metadata. This subroutine
@@ -201,12 +196,12 @@ sub metaeval {
if (defined($token->[2]->{'name'})) {
$unikey.="\0".$token->[2]->{'name'};
}
- foreach (@{$token->[3]}) {
- $metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
+ foreach my $item (@{$token->[3]}) {
+ $metadatafields{$unikey.'.'.$item}=$token->[2]->{$item};
if ($metadatakeys{$unikey}) {
- $metadatakeys{$unikey}.=','.$_;
+ $metadatakeys{$unikey}.=','.$item;
} else {
- $metadatakeys{$unikey}=$_;
+ $metadatakeys{$unikey}=$item;
}
}
my $newentry=$parser->get_text('/'.$entry);
@@ -266,8 +261,9 @@ sub metaread {
my ($logfile,$fn,$prefix)=@_;
unless (-e $fn) {
print($logfile 'No file '.$fn."\n");
- return ' '.&mt('No file').':'.
- &Apache::loncfile::display($fn).'';
+ return '
';
}
#########################################
@@ -292,8 +289,8 @@ sub coursedependencies {
my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
$aauthor,$regexp);
my %courses=();
- foreach (keys %evaldata) {
- if ($_=~/^([a-zA-Z0-9]+_[a-zA-Z0-9]+)___.+___course$/) {
+ foreach my $item (keys(%evaldata)) {
+ if ($item=~/^([a-zA-Z0-9]+_[a-zA-Z0-9]+)___.+___course$/) {
$courses{$1}=1;
}
}
@@ -317,8 +314,12 @@ string which presents the form field (fo
=item B
+=item B
+
=item B
+=item B
+
=item B
=back
@@ -381,12 +382,12 @@ sub selectbox {
}
my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
.''.&Apache::lonhtmlcommon::row_closure();
return $selout;
@@ -398,6 +399,59 @@ sub select_level_form {
if (!defined($value)) { $env{'form.'.$name}=0; }
return &Apache::loncommon::select_level_form($value,$name);
}
+
+sub common_access {
+ my ($name,$text,$options)=@_;
+ return unless (ref($options) eq 'ARRAY');
+ my $formname = 'pubdirpref';
+ my $chkname = 'common'.$name;
+ my $chkid = 'LC_'.$chkname;
+ my $divid = $chkid.'div';
+ my $customdivid = 'LC_customfile';
+ my $selname = $chkname.'select';
+ my $selid = $chkid.'select';
+ my $selonchange;
+ if ($name eq 'dist') {
+ $selonchange = ' onchange="showHideCustom(this,'."'$customdivid'".');"';
+ }
+ my %lt = &Apache::lonlocal::texthash(
+ 'default' => 'System wide - can be used for any courses system wide',
+ 'domain' => 'Domain only - use limited to courses in the domai',
+ 'custom' => 'Customized right of use ...',
+ 'public' => 'Public - no authentication or authorization required for use',
+ 'closed' => 'Closed - XML source is closed to everyone',
+ 'open' => 'Open - XML source is open to people who want to use it',
+ 'sel' => 'Select',
+ );
+ my $output = <<"END";
+
+
+
+
'.
- &mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'
';
+ $scrout.='
'.&mt('Warning!').' '
+ .&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.')
+ .'
';
}
# ------------------------------------------------------- Now have all metadata
@@ -1183,7 +1343,7 @@ sub publish {
$textonly=~s/[^a-z^ü^ä^ö^ß\s]//g; #dont delete german "Umlaute"
foreach ($textonly=~m/[^\s]+/g) { #match all but whitespaces
- unless ($nokey{$_}) {
+ unless ($nokeyref->{$_}) {
$keywords{$_}=1;
}
}
@@ -1210,19 +1370,19 @@ sub publish {
my $intr_scrout.=' '
.'');
+ &checkbox('forceoverride','force directory level metadata over existing').
+ &checkbox('excludeunpub','exclude currently unpublished files').
+ &common_access('dist',&mt('apply common copyright/distribution'),
+ ['default','domain','custom']).
+ &common_access('source',&mt('apply common source availability'),
+ ['closed','open'])
+ );
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .' '
+ );
$lock=0;
} else {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ );
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
# actually publish things
opendir(DIR,$fn);
@@ -1878,11 +2306,11 @@ sub publishdirectory {
if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {
if (($filename!~/^\./) && ($env{'form.pubrec'})) {
- &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+ &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename,$nokeyref);
}
} 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;
if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,
@@ -1900,11 +2328,13 @@ sub publishdirectory {
}
} else {
# never published
- $publishthis=1;
+ unless ($env{'form.excludeunpub'}) {
+ $publishthis=1;
+ }
}
if ($publishthis) {
- &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+ &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename,$nokeyref);
} else {
$r->print(' '.&mt('Skipping').' '.$filename.' ');
}
@@ -1920,18 +2350,17 @@ sub publishdirectory {
sub defaultmetapublish {
my ($r,$fn,$cuname,$cudom)=@_;
- $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
unless (-e $fn) {
return HTTP_NOT_FOUND;
}
my $target=$fn;
- $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
+ $target=~s/^\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/priv\//\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/res\//;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+ $r->print(&Apache::loncommon::start_page('Metadata Publication'));
# ---------------------------------------------------------------- Write Source
my $copyfile=$target;
@@ -1943,8 +2372,12 @@ sub defaultmetapublish {
for ($count=5;$count<$#parts;$count++) {
$path.="/$parts[$count]";
if ((-e $path)!=1) {
- $r->print('