loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.295.2.1.2.1 and 1.296

version 1.295.2.1.2.1, 2023/01/23 02:24:50	version 1.296, 2016/06/19 01:08:01
Line 128 use Apache::lonlocal;	Line 128 use Apache::lonlocal;
use Apache::loncfile;	use Apache::loncfile;
use LONCAPA::lonmetadata;	use LONCAPA::lonmetadata;
use Apache::lonmsg;	use Apache::lonmsg;
use vars qw(%metadatafields %metadatakeys);	use vars qw(%metadatafields %metadatakeys %addid $readit);
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);


my %addid;
my %nokey;

my $docroot;	my $docroot;

my $cuname;	my $cuname;
Line 371 sub hiddenfield {	Line 367 sub hiddenfield {

sub checkbox {	sub checkbox {
my ($name,$text)=@_;	my ($name,$text)=@_;
return "\n<label><input type='checkbox' name='$name' /> ".	return "\n<br /><label><input type='checkbox' name='$name' /> ".
&mt($text)."</label>";	&mt($text)."</label>";
}	}

Line 428 sub common_access {	Line 424 sub common_access {
'sel' => 'Select',	'sel' => 'Select',
);	);
my $output = <<"END";	my $output = <<"END";
	<br />
<span class="LC_nobreak">	<span class="LC_nobreak">
<label>	<label>
<input type="checkbox" name="commonaccess" value="$name" id="$chkid"	<input type="checkbox" name="commonaccess" value="$name" id="$chkid"
Line 1106 I<Additional documentation needed.>	Line 1103 I<Additional documentation needed.>
#########################################	#########################################
sub publish {	sub publish {

my ($source,$target,$style,$batch)=@_;	my ($source,$target,$style,$batch,$nokeyref)=@_;
my $logfile;	my $logfile;
my $scrout='';	my $scrout='';
my $allmeta='';	my $allmeta='';
Line 1346 sub publish {	Line 1343 sub publish {
$textonly=~s/[^a-z^ü^ä^ö^ß\s]//g; #dont delete german "Umlaute"	$textonly=~s/[^a-z^ü^ä^ö^ß\s]//g; #dont delete german "Umlaute"

foreach ($textonly=~m/[^\s]+/g) { #match all but whitespaces	foreach ($textonly=~m/[^\s]+/g) { #match all but whitespaces
unless ($nokey{$_}) {	unless ($nokeyref->{$_}) {
$keywords{$_}=1;	$keywords{$_}=1;
}	}
}	}
Line 1597 END	Line 1594 END
return($scrout,0);	return($scrout,0);
}	}

	sub getnokey {
	my ($includedir) = @_;
	my $nokey={};
	my $fh=Apache::File->new($includedir.'/un_keyword.tab');
	while (<$fh>) {
	my $word=$_;
	chomp($word);
	$nokey->{$word}=1;
	}
	return $nokey;
	}

#########################################	#########################################
#########################################	#########################################

Line 1619 Parameters:	Line 1628 Parameters:

=item I<$distarget>	=item I<$distarget>

	=item I<$batch>

	=item I<$usebuffer>

=back	=back

Returns:	Returns:

=over 4	=over 4

=item integer	=item integer or array

	if $userbuffer arg is true, and if caller wants an array
	then the array ($output,$rtncode) will be returned, otherwise
	just the $rtncode will be returned. $rtncode is an integer:

0: fail	0: fail
1: success	1: success
Line 1639 Returns:	Line 1656 Returns:
#########################################	#########################################
sub phasetwo {	sub phasetwo {

my ($r,$source,$target,$style,$distarget,$batch)=@_;	my ($r,$source,$target,$style,$distarget,$batch,$usebuffer)=@_;
$source=~s/\/+/\//g;	$source=~s/\/+/\//g;
$target=~s/\/+/\//g;	$target=~s/\/+/\//g;
#	#
# Unless trying to get rid of something, check name validity	# Unless trying to get rid of something, check name validity
#	#
	my $output;
unless ($env{'form.obsolete'}) {	unless ($env{'form.obsolete'}) {
if ($target=~/(\_\_\_\|\&\&\&\|\:\:\:)/) {	if ($target=~/(\_\_\_\|\&\&\&\|\:\:\:)/) {
$r->print('<span class="LC_error">'.	$output = '<span class="LC_error">'.
&mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>").	&mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>").
'</span>');	'</span>';
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
unless ($target=~/\.(\w+)$/) {	unless ($target=~/\.(\w+)$/) {
$r->print('<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>');	$output = '<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>';
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
if ($target=~/\.(\d+)\.(\w+)$/) {	if ($target=~/\.(\d+)\.(\w+)$/) {
$r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>');	$output = '<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>';
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
}	}

Line 1668 sub phasetwo {	Line 1713 sub phasetwo {
$distarget=~s/\/+/\//g;	$distarget=~s/\/+/\//g;
my $logfile;	my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {	unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
$r->print(	$output = '<span class="LC_error">'.
'<span class="LC_error">'.	&mt('No write permission to user directory, FAIL').'</span>';
&mt('No write permission to user directory, FAIL').'</span>');	if ($usebuffer) {
return 0;	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	return 0;
	}
}	}

if ($source =~ /\.rights$/) {	if ($source =~ /\.rights$/) {
$r->print('<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>');	$output = '<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
}	}

print $logfile	print $logfile
Line 1757 sub phasetwo {	Line 1813 sub phasetwo {
if ($metadatafields{'copyright'} eq 'custom') {	if ($metadatafields{'copyright'} eq 'custom') {
my $file=$metadatafields{'customdistributionfile'};	my $file=$metadatafields{'customdistributionfile'};
unless ($file=~/\.rights$/) {	unless ($file=~/\.rights$/) {
$r->print(	$output .= '<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL').
'<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL').	'</span>';
'</span>');	if ($usebuffer) {
return 0;	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
}	}
{	{
print $logfile "\nWrite metadata file for ".$source;	print $logfile "\nWrite metadata file for ".$source;
my $mfh;	my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {	unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
$r->print(	$output .= '<span class="LC_error">'.&mt('Could not write metadata, FAIL').
'<span class="LC_error">'.&mt('Could not write metadata, FAIL').	'</span>';
'</span>');	if ($usebuffer) {
return 0;	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
foreach my $field (sort(keys(%metadatafields))) {	foreach my $field (sort(keys(%metadatafields))) {
unless ($field=~/\./) {	unless ($field=~/\./) {
Line 1789 sub phasetwo {	Line 1861 sub phasetwo {
.'</'.$tag.'>';	.'</'.$tag.'>';
}	}
}	}
$r->print('<p>'.&mt('Wrote Metadata').'</p>');
	$output .= '<p>'.&mt('Wrote Metadata').'</p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
print $logfile "\nWrote metadata";	print $logfile "\nWrote metadata";
}	}

Line 1800 sub phasetwo {	Line 1877 sub phasetwo {

my ($error,$success) = &store_metadata(%metadatafields);	my ($error,$success) = &store_metadata(%metadatafields);
if ($success) {	if ($success) {
$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');	$output .= '<p>'.&mt('Synchronized SQL metadata database').'</p>';
print $logfile "\nSynchronized SQL metadata database";	print $logfile "\nSynchronized SQL metadata database";
} else {	} else {
$r->print($error);	$output .= $error;
print $logfile "\n".$error;	print $logfile "\n".$error;
}	}
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
# --------------------------------------------- Delete author resource messages	# --------------------------------------------- Delete author resource messages
my $delresult=&Apache::lonmsg::del_url_author_res_msg($target);	my $delresult=&Apache::lonmsg::del_url_author_res_msg($target);
$r->print('<p>'.&mt('Removing error messages:').' '.$delresult.'</p>');	$output .= '<p>'.&mt('Removing error messages:').' '.$delresult.'</p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
print $logfile "\nRemoving error messages: $delresult";	print $logfile "\nRemoving error messages: $delresult";
# ----------------------------------------------------------- Copy old versions	# ----------------------------------------------------------- Copy old versions

Line 1822 sub phasetwo {	Line 1907 sub phasetwo {
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
unless ($srcd=~/^\Q$docroot\E\/res/) {	unless ($srcd=~/^\Q$docroot\E\/res/) {
print $logfile "\nPANIC: Target dir is ".$srcd;	print $logfile "\nPANIC: Target dir is ".$srcd;
$r->print(	$output .=
"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");	"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>";
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
opendir(DIR,$srcd);	opendir(DIR,$srcd);
while ($filename=readdir(DIR)) {	while ($filename=readdir(DIR)) {
Line 1839 sub phasetwo {	Line 1933 sub phasetwo {
}	}
closedir(DIR);	closedir(DIR);
$maxversion++;	$maxversion++;
$r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>');	$output .= '<p>'.&mt('Creating old version [_1]',$maxversion).'</p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
print $logfile "\nCreating old version ".$maxversion."\n";	print $logfile "\nCreating old version ".$maxversion."\n";

my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;	my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;

if (copy($target,$copyfile)) {	if (copy($target,$copyfile)) {
print $logfile "Copied old target to ".$copyfile."\n";	print $logfile "Copied old target to ".$copyfile."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file')));	$output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file'));
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
} else {	} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";	print $logfile "Unable to write ".$copyfile.':'.$!."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1));	$output .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1);
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}

# --------------------------------------------------------------- Copy Metadata	# --------------------------------------------------------------- Copy Metadata
Line 1859 sub phasetwo {	Line 1970 sub phasetwo {

if (copy($target.'.meta',$copyfile)) {	if (copy($target.'.meta',$copyfile)) {
print $logfile "Copied old target metadata to ".$copyfile."\n";	print $logfile "Copied old target metadata to ".$copyfile."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata')));	$output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata'));
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
} else {	} else {
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";	print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
if (-e $target.'.meta') {	if (-e $target.'.meta') {
$r->print(&Apache::lonhtmlcommon::confirm_success(	$output .= &Apache::lonhtmlcommon::confirm_success(
&mt('Failed to write old metadata copy').", $!",1));	&mt('Failed to write old metadata copy').", $!",1);
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}
}	}


} else {	} else {
$r->print('<p>'.&mt('Initial version').'</p>');	$output .= '<p>'.&mt('Initial version').'</p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
print $logfile "\nInitial version";	print $logfile "\nInitial version";
}	}

Line 1887 sub phasetwo {	Line 2013 sub phasetwo {
if ((-e $path)!=1) {	if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;	print $logfile "\nCreating directory ".$path;
mkdir($path,0777);	mkdir($path,0777);
$r->print('<p>'	$output .= '<p>'
.&mt('Created directory [_1]'	.&mt('Created directory [_1]'
,'<span class="LC_filename">'.$parts[$count].'</span>')	,'<span class="LC_filename">'.$parts[$count].'</span>')
.'</p>'	.'</p>';
);	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
}	}
}	}

if (copy($source,$copyfile)) {	if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";	print $logfile "\nCopied original source to ".$copyfile."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied source file')));	$output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied source file'));
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
} else {	} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(	$output .= &Apache::lonhtmlcommon::confirm_success(
&mt('Failed to copy source').", $!",1));	&mt('Failed to copy source').", $!",1);
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
}	}

# ---------------------------------------------- Delete local tmp-preview files	# ---------------------------------------------- Delete local tmp-preview files
Line 1913 sub phasetwo {	Line 2055 sub phasetwo {

if (copy($source.'.meta',$copyfile)) {	if (copy($source.'.meta',$copyfile)) {
print $logfile "\nCopied original metadata to ".$copyfile."\n";	print $logfile "\nCopied original metadata to ".$copyfile."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata')));	$output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata'));
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
} else {	} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
$r->print(&Apache::lonhtmlcommon::confirm_success(	$output .= &Apache::lonhtmlcommon::confirm_success(
&mt('Failed to write metadata copy').", $!",1));	&mt('Failed to write metadata copy').", $!",1);
return 0;	if ($usebuffer) {
	if (wantarray) {
	return ($output,0);
	} else {
	return 0;
	}
	} else {
	$r->print($output);
	return 0;
	}
	}
	unless ($usebuffer) {
	$r->rflush;
}	}
$r->rflush;

# ------------------------------------------------------------- Trigger updates	# ------------------------------------------------------------- Trigger updates
push(@{$modified_urls},[$target,$source]);	push(@{$modified_urls},[$target,$source]);
Line 1939 sub phasetwo {	Line 2096 sub phasetwo {

# ------------------------------------------------------------- Everything done	# ------------------------------------------------------------- Everything done
$logfile->close();	$logfile->close();
$r->print('<p class="LC_success">'.&mt('Done').'</p>');	$output .= '<p class="LC_success">'.&mt('Done').'</p>';
	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}

# ------------------------------------------------ Provide link to new resource	# ------------------------------------------------ Provide link to new resource
unless ($batch) {	unless ($batch) {
Line 1948 sub phasetwo {	Line 2109 sub phasetwo {
my $thissrcdir=$thissrc;	my $thissrcdir=$thissrc;
$thissrcdir=~s/\/[^\/]+$/\//;	$thissrcdir=~s/\/[^\/]+$/\//;

$r->print(	$output .=
&Apache::lonhtmlcommon::actionbox([	&Apache::lonhtmlcommon::actionbox([
'<a href="'.$thisdistarget.'">'.	'<a href="'.$thisdistarget.'">'.
&mt('View Published Version').	&mt('View Published Version').
Line 1958 sub phasetwo {	Line 2119 sub phasetwo {
'</a>',	'</a>',
'<a href="'.$thissrcdir.'">'.	'<a href="'.$thissrcdir.'">'.
&mt('Back to Source Directory').	&mt('Back to Source Directory').
'</a>'])	'</a>']);
);	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}
	}

	if ($usebuffer) {
	if (wantarray) {
	return ($output,1);
	} else {
	return 1;
	}
	} else {
	if (wantarray) {
	return ('',1);
	} else {
	return 1;
	}
}	}
return 1;
}	}

# =============================================================== Notifications	# =============================================================== Notifications
Line 2005 sub notify {	Line 2182 sub notify {
#########################################	#########################################

sub batchpublish {	sub batchpublish {
my ($r,$srcfile,$targetfile)=@_;	my ($r,$srcfile,$targetfile,$nokeyref,$usebuffer)=@_;
#publication pollutes %env with form.* values	#publication pollutes %env with form.* values
my %oldenv=%env;	my %oldenv=%env;
$srcfile=~s/\/+/\//g;	$srcfile=~s/\/+/\//g;
$targetfile=~s/\/+/\//g;	$targetfile=~s/\/+/\//g;
$srcfile=~s/\/+/\//g;

my $docroot=$r->dir_config('lonDocRoot');	my $docroot=$r->dir_config('lonDocRoot');
my $thisdistarget=$targetfile;	my $thisdistarget=$targetfile;
Line 2025 sub batchpublish {	Line 2201 sub batchpublish {

my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);

$r->print('<h2>'	my $output = '<h2>'
.&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))	.&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))
.'</h2>'	.'</h2>';
);	unless ($usebuffer) {
	$r->print($output);
	$output = '';
	}

# phase one takes	# phase one takes
# my ($source,$target,$style,$batch)=@_;	# my ($source,$target,$style,$batch)=@_;
my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1);	my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1,$nokeyref);
$r->print('<p>'.$outstring.'</p>');
	if ($usebuffer) {
	$output .= '<p>'.$outstring.'</p>';
	} else {
	$r->print('<p>'.$outstring.'</p>');
	}
# phase two takes	# phase two takes
# my ($source,$target,$style,$distarget,batch)=@_;	# my ($source,$target,$style,$distarget,batch)=@_;
# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...	# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...
if (!$error) {	if (!$error) {
$r->print('<p>');	if ($usebuffer) {
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);	my ($result,$error) = &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1,$usebuffer);
$r->print('</p>');	$output .= '<p>'.$result.'</p>';
	} else {
	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
	}
}	}
%env=%oldenv;	%env=%oldenv;
return '';	if ($usebuffer) {
	return $output;
	} else {
	return '';
	}
}	}

#########################################	#########################################

sub publishdirectory {	sub publishdirectory {
my ($r,$fn,$thisdisfn)=@_;	my ($r,$fn,$thisdisfn,$nokeyref)=@_;
$fn=~s/\/+/\//g;	$fn=~s/\/+/\//g;
$thisdisfn=~s/\/+/\//g;	$thisdisfn=~s/\/+/\//g;
my $thisdisresdir=$thisdisfn;	my $thisdisresdir=$thisdisfn;
Line 2063 sub publishdirectory {	Line 2254 sub publishdirectory {
.&Apache::lonhtmlcommon::row_title(&mt('Target'))	.&Apache::lonhtmlcommon::row_title(&mt('Target'))
.'<span class="LC_filename">'.$thisdisresdir.'</span>'	.'<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.	my $dirptr=16384; # Mask indicating a directory in stat.cmode.
unless ($env{'form.phase'} eq 'two') {	unless ($env{'form.phase'} eq 'two') {
# ask user what they want	# ask user what they want
$r->print(&Apache::lonhtmlcommon::row_closure()	$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').	$r->print(&hiddenfield('phase','two').
&hiddenfield('filename',$env{'form.filename'}).	&hiddenfield('filename',$env{'form.filename'}).
'<fieldset><legend>'.&mt('Recurse').'</legend>'.	&checkbox('pubrec','include subdirectories').
&checkbox('pubrec','include subdirectories').	&checkbox('forcerepub','force republication of previously published files').
'</fieldset>'.	&checkbox('obsolete','make file(s) obsolete').
'<fieldset><legend>'.&mt('Force').'</legend>'.	&checkbox('forceoverride','force directory level metadata over existing').
&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'),	&common_access('dist',&mt('apply common copyright/distribution'),
['default','domain','public','custom']).'<br />'.	['default','domain','custom']).
&common_access('source',&mt('apply common source availability'),	&common_access('source',&mt('apply common source availability'),
['closed','open']).	['closed','open'])
'</fieldset>'
);	);
$r->print(&Apache::lonhtmlcommon::row_closure(1)	$r->print(&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()	.&Apache::lonhtmlcommon::end_pick_box()
Line 2106 sub publishdirectory {	Line 2281 sub publishdirectory {
$r->print(&Apache::lonhtmlcommon::row_closure(1)	$r->print(&Apache::lonhtmlcommon::row_closure(1)
.&Apache::lonhtmlcommon::end_pick_box()	.&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)); }	unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
# actually publish things	# actually publish things
opendir(DIR,$fn);	opendir(DIR,$fn);
Line 2122 sub publishdirectory {	Line 2295 sub publishdirectory {
if ($filename=~/\.(\w+)$/) { $extension=$1; }	if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {	if ($cmode&$dirptr) {
if (($filename!~/^\./) && ($env{'form.pubrec'})) {	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') &&	} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {	($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
# find out publication status and/or existing metadata	# find out publication status and/or exiting metadata
my $publishthis=0;	my $publishthis=0;
my $skipthis;
if (-e $resdir.'/'.$filename) {	if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,	my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,	$ruid,$rgid,$rrdev,$rsize,
Line 2136 sub publishdirectory {	Line 2308 sub publishdirectory {
$rblksize,$rblocks)=stat($resdir.'/'.$filename);	$rblksize,$rblocks)=stat($resdir.'/'.$filename);
if (($rmtime<$cmtime) \|\| ($env{'form.forcerepub'})) {	if (($rmtime<$cmtime) \|\| ($env{'form.forcerepub'})) {
# previously published, modified now	# previously published, modified now
if ($env{'form.excludemod'}) {	$publishthis=1;
$skipthis='mod';	}
} else {	my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
$publishthis=1;	my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
}	if ( $meta_rmtime<$meta_cmtime ) {
	$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 {	} else {
# never published	# never published
if ($env{'form.excludeunpub'}) {	$publishthis=1;
$skipthis='unpub';
} else {
$publishthis=1;
}
}	}

if ($publishthis) {	if ($publishthis) {
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);	&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename,$nokeyref);
} else {	} else {
my $reason;	$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
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();	$r->rflush();
}	}
Line 2361 sub handler {	Line 2483 sub handler {
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

# -------------------------------- File is there and owned, init lookup tables.	# --------------------------------- File is there and owned, start page output

%addid=();

{
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
while (<$fh>=~/(\w+)\s+(\w+)/) {
$addid{$1}=$2;
}
}

%nokey=();

{
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
while (<$fh>) {
my $word=$_;
chomp($word);
$nokey{$word}=1;
}
}

# ---------------------------------------------------------- Start page output.

&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;
Line 2458 END	Line 2558 END
my $thistarget=$fn;	my $thistarget=$fn;
$thistarget=~s/^\/priv\//\/res\//;	$thistarget=~s/^\/priv\//\/res\//;
my $thisdistarget=&HTML::Entities::encode($thistarget,'<>&"');	my $thisdistarget=&HTML::Entities::encode($thistarget,'<>&"');
	my $nokeyref = &getnokey($r->dir_config('lonIncludes'));

if ($fn=~/\/$/) {	if ($fn=~/\/$/) {
# -------------------------------------------------------- This is a directory	# -------------------------------------------------------- This is a directory
&publishdirectory($r,$docroot.$fn,$thisdisfn);	&publishdirectory($r,$docroot.$fn,$thisdisfn,$nokeyref);
$r->print(	$r->print(
'<br /><br />'.	'<br /><br />'.
&Apache::lonhtmlcommon::actionbox([	&Apache::lonhtmlcommon::actionbox([
Line 2534 ENDDIFF	Line 2635 ENDDIFF
}	}
unless ($errorcount) {	unless ($errorcount) {
my ($outstring,$error)=	my ($outstring,$error)=
&publish($docroot.$fn,$docroot.$thistarget,$thisembstyle);	&publish($docroot.$fn,$docroot.$thistarget,$thisembstyle,undef,$nokeyref);
$r->print($outstring);	$r->print($outstring);
} else {	} else {
$r->print('<h3 class="LC_error">'.	$r->print('<h3 class="LC_error">'.
Line 2542 ENDDIFF	Line 2643 ENDDIFF
'</h3>');	'</h3>');
}	}
} else {	} else {
&phasetwo($r,$docroot.$fn,$docroot.$thistarget,$thisembstyle,$thisdistarget);	my ($output,$error) = &phasetwo($r,$docroot.$fn,$docroot.$thistarget,
	$thisembstyle,$thisdistarget);
	$r->print($output);
}	}
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
Line 2550 ENDDIFF	Line 2653 ENDDIFF
return OK;	return OK;
}	}

	BEGIN {

	# ----------------------------------- Read addid.tab
	unless ($readit) {
	%addid=();

	{
	my $tabdir = $Apache::lonnet::perlvar{'lonTabDir'};
	my $fh=Apache::File->new($tabdir.'/addid.tab');
	while (<$fh>=~/(\w+)\s+(\w+)/) {
	$addid{$1}=$2;
	}
	}
	}
	$readit=1;
	}


1;	1;
__END__	__END__

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.295.2.1.2.1
changed lines
	Added in v.1.296