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.218 and 1.249.2.3

version 1.218, 2007/01/26 22:16:33	version 1.249.2.3, 2009/11/24 01:01:28
Line 118 use Apache::File;	Line 118 use Apache::File;
use File::Copy;	use File::Copy;
use Apache::Constants qw(:common :http :methods);	use Apache::Constants qw(:common :http :methods);
use HTML::LCParser;	use HTML::LCParser;
	use HTML::Entities;
	use Encode::Encoder;
use Apache::lonxml;	use Apache::lonxml;
use Apache::loncacc;	use Apache::loncacc;
use DBI;	use DBI;
use Apache::lonnet;	use Apache::lonnet;
use Apache::loncommon();	use Apache::loncommon();
	use Apache::lonhtmlcommon;
use Apache::lonmysql;	use Apache::lonmysql;
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::loncfile;	use Apache::loncfile;
Line 143 my $cudom;	Line 146 my $cudom;
my $registered_cleanup;	my $registered_cleanup;
my $modified_urls;	my $modified_urls;

	my $lock;

=pod	=pod

=item B<metaeval>	=item B<metaeval>
Line 183 sub metaeval {	Line 188 sub metaeval {
if ($token->[0] eq 'S') {	if ($token->[0] eq 'S') {
my $entry=$token->[1];	my $entry=$token->[1];
my $unikey=$entry;	my $unikey=$entry;
	next if ($entry =~ m/^(?:parameter\|stores)_/);
if (defined($token->[2]->{'package'})) {	if (defined($token->[2]->{'package'})) {
$unikey.='_package_'.$token->[2]->{'package'};	$unikey.="\0package\0".$token->[2]->{'package'};
}	}
if (defined($token->[2]->{'part'})) {	if (defined($token->[2]->{'part'})) {
$unikey.='_'.$token->[2]->{'part'};	$unikey.="\0".$token->[2]->{'part'};
}	}
if (defined($token->[2]->{'id'})) {	if (defined($token->[2]->{'id'})) {
$unikey.='_'.$token->[2]->{'id'};	$unikey.="\0".$token->[2]->{'id'};
}	}
if (defined($token->[2]->{'name'})) {	if (defined($token->[2]->{'name'})) {
$unikey.='_'.$token->[2]->{'name'};	$unikey.="\0".$token->[2]->{'name'};
}	}
foreach (@{$token->[3]}) {	foreach (@{$token->[3]}) {
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};	$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
Line 260 sub metaread {	Line 266 sub metaread {
my ($logfile,$fn,$prefix)=@_;	my ($logfile,$fn,$prefix)=@_;
unless (-e $fn) {	unless (-e $fn) {
print($logfile 'No file '.$fn."\n");	print($logfile 'No file '.$fn."\n");
return '<br /><b>'.&mt('No file').':</b> <tt>'.	return '<div><b>'
&Apache::loncfile::display($fn).'</tt>';	.&mt('No file: [_1]'
	,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
}	}
print($logfile 'Processing '.$fn."\n");	print($logfile 'Processing '.$fn."\n");
my $metastring;	my $metastring;
Line 270 sub metaread {	Line 277 sub metaread {
$metastring=join('',<$metafh>);	$metastring=join('',<$metafh>);
}	}
&metaeval($metastring,$prefix);	&metaeval($metastring,$prefix);
return '<br /><b>'.&mt('Processed file').':</b> <tt>'.	return '<div><b>'
&Apache::loncfile::display($fn).'</tt>';	.&mt('Processed file: [_1]'
	,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
}	}

#########################################	#########################################
Line 322 string which presents the form field (fo	Line 330 string which presents the form field (fo
#########################################	#########################################
#########################################	#########################################
sub textfield {	sub textfield {
my ($title,$name,$value)=@_;	my ($title,$name,$value,$noline)=@_;
$value=~s/^\s+//gs;	$value=~s/^\s+//gs;
$value=~s/\s+$//gs;	$value=~s/\s+$//gs;
$value=~s/\s+/ /gs;	$value=~s/\s+/ /gs;
$title=&mt($title);	$title=&mt($title);
$env{'form.'.$name}=$value;	$env{'form.'.$name}=$value;
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".	return "\n".&Apache::lonhtmlcommon::row_title($title)
"</b></font></p><br />".	.'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';	.&Apache::lonhtmlcommon::row_closure($noline);
}	}

sub text_with_browse_field {	sub text_with_browse_field {
my ($title,$name,$value,$restriction)=@_;	my ($title,$name,$value,$restriction,$noline)=@_;
$value=~s/^\s+//gs;	$value=~s/^\s+//gs;
$value=~s/\s+$//gs;	$value=~s/\s+$//gs;
$value=~s/\s+/ /gs;	$value=~s/\s+/ /gs;
$title=&mt($title);	$title=&mt($title);
$env{'form.'.$name}=$value;	$env{'form.'.$name}=$value;
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".	return "\n".&Apache::lonhtmlcommon::row_title($title)
"</b></font></p><br />".	.'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'.	.'<br />'
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a> '.	.'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>';	.&mt('Select')
	.'</a> '
	.'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'
	.&mt('Search')
	.'</a>'
	.&Apache::lonhtmlcommon::row_closure($noline);
}	}

sub hiddenfield {	sub hiddenfield {
Line 369 sub selectbox {	Line 381 sub selectbox {
} else {	} else {
$env{'form.'.$name}=$idlist[0];	$env{'form.'.$name}=$idlist[0];
}	}
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".	my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
'</b></font></p><br /><select name="'.$name.'">';	.'<select name="'.$name.'">';
foreach (@idlist) {	foreach (@idlist) {
$selout.='<option value=\''.$_.'\'';	$selout.='<option value=\''.$_.'\'';
if ($_ eq $value) {	if ($_ eq $value) {
Line 378 sub selectbox {	Line 390 sub selectbox {
}	}
else {$selout.='>'.&{$functionref}($_).'</option>';}	else {$selout.='>'.&{$functionref}($_).'</option>';}
}	}
return $selout.'</select>';	$selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
	return $selout;
}	}

sub select_level_form {	sub select_level_form {
Line 408 sub urlfixup {	Line 421 sub urlfixup {
if ($url =~ /^mailto:/i) { return $url; }	if ($url =~ /^mailto:/i) { return $url; }
#internal document links need no fixing	#internal document links need no fixing
if ($url =~ /^\#/) { return $url; }	if ($url =~ /^\#/) { return $url; }
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);	my ($host)=($url=~m{(?:(?:http\|https\|ftp)://)*([^/]+)});
foreach (values %Apache::lonnet::hostname) {	my @lonids = &Apache::lonnet::machine_ids($host);
if ($_ eq $host) {	if (@lonids) {
$url=~s/^http\:\/\///;	$url=~s{^(?:http\|https\|ftp)://}{};
$url=~s/^$host//;	$url=~s/^\Q$host\E//;
}
}	}
if ($url=~/^http\:\/\//) { return $url; }	if ($url=~m{^(?:http\|https\|ftp)://}) { return $url; }
$url=~s/\~$cuname/res\/$cudom\/$cuname/;	$url=~s{\Q~$cuname\E}{res/$cudom/$cuname};
return $url;	return $url;
}	}

Line 467 sub set_allow {	Line 479 sub set_allow {
}	}
if (($newurl !~ /^javascript:/i) &&	if (($newurl !~ /^javascript:/i) &&
($newurl !~ /^mailto:/i) &&	($newurl !~ /^mailto:/i) &&
($newurl !~ /^http:/i) &&	($newurl !~ /^(?:http\|https\|ftp):/i) &&
($newurl !~ /^\#/)) {	($newurl !~ /^\#/)) {
$$allow{&absoluteurl($newurl,$target)}=1;	$$allow{&absoluteurl($newurl,$target)}=1;
}	}
Line 494 sub get_subscribed_hosts {	Line 506 sub get_subscribed_hosts {
$target=~/(.*)\/([^\/]+)$/;	$target=~/(.*)\/([^\/]+)$/;
my $srcf=$2;	my $srcf=$2;
opendir(DIR,$1);	opendir(DIR,$1);
	# cycle through listed files, subscriptions used to exist
	# as "filename.lonid"
while ($filename=readdir(DIR)) {	while ($filename=readdir(DIR)) {
if ($filename=~/\Q$srcf\E\.($match_lonid)$/) {	if ($filename=~/\Q$srcf\E\.($match_lonid)$/) {
my $subhost=$1;	my $subhost=$1;
if (($subhost ne 'meta' && $subhost ne 'subscription' &&	if (($subhost ne 'meta'
$subhost ne 'tmp') &&	&& $subhost ne 'subscription'
	&& $subhost ne 'meta.subscription'
	&& $subhost ne 'tmp') &&
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {	($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
push(@subscribed,$subhost);	push(@subscribed,$subhost);
}	}
Line 650 sub fix_ids_and_indices {	Line 666 sub fix_ids_and_indices {
join(', ',@duplicatedids));	join(', ',@duplicatedids));
if ($duplicateids) {	if ($duplicateids) {
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>';	my $outstring='<span class="LC_error">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</span>';
return ($outstring,1);	return ($outstring,1);
}	}
if ($needsfixup) {	if ($needsfixup) {
Line 659 sub fix_ids_and_indices {	Line 675 sub fix_ids_and_indices {
"Max Index: $maxindex (min 10)\n";	"Max Index: $maxindex (min 10)\n";
}	}
my $outstring='';	my $outstring='';
	my $responsecounter=1;
my @parser;	my @parser;
$parser[0]=HTML::LCParser->new(\$content);	$parser[0]=HTML::LCParser->new(\$content);
$parser[-1]->xml_mode(1);	$parser[-1]->xml_mode(1);
Line 674 sub fix_ids_and_indices {	Line 691 sub fix_ids_and_indices {
next;	next;
}	}
if ($lctag eq 'base') { next; }	if ($lctag eq 'base') { next; }
	if (($lctag eq 'part') \|\| ($lctag eq 'problem')) {
	$responsecounter=0;
	}
	if ($lctag=~/response$/) { $responsecounter++; }
	if ($lctag eq 'import') { $responsecounter++; }
my %parms=%{$token->[2]};	my %parms=%{$token->[2]};
$counter=$addid{$tag};	$counter=$addid{$tag};
if (!$counter) { $counter=$addid{$lctag}; }	if (!$counter) { $counter=$addid{$lctag}; }
Line 769 sub fix_ids_and_indices {	Line 791 sub fix_ids_and_indices {
}	}
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }	if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
$outstring.='<'.$tag.$newparmstring.$endtag.'>';	$outstring.='<'.$tag.$newparmstring.$endtag.'>';
if ($lctag eq 'm' \|\| $lctag eq 'script'	if ($lctag eq 'm' \|\| $lctag eq 'script' \|\| $lctag eq 'answer'
\|\| $lctag eq 'display' \|\| $lctag eq 'tex') {	\|\| $lctag eq 'display' \|\| $lctag eq 'tex') {
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);	$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
}	}
Line 778 sub fix_ids_and_indices {	Line 800 sub fix_ids_and_indices {
unless ($token->[1] eq 'allow') {	unless ($token->[1] eq 'allow') {
$outstring.='</'.$token->[1].'>';	$outstring.='</'.$token->[1].'>';
}	}
}	}
	if ((($token->[1] eq 'part') \|\| ($token->[1] eq 'problem'))
	&& (!$responsecounter)) {
	my $outstring='<span class="LC_error">'.&mt('Found [_1] without responses. This resource cannot be published.',$token->[1]).'</span>';
	return ($outstring,1);
	}
} else {	} else {
$outstring.=$token->[1];	$outstring.=$token->[1];
}	}
Line 821 sub store_metadata {	Line 848 sub store_metadata {
# Determine if the table exists	# Determine if the table exists
my $status = &Apache::lonmysql::check_table('metadata');	my $status = &Apache::lonmysql::check_table('metadata');
if (! defined($status)) {	if (! defined($status)) {
$error='<font color="red">WARNING: Cannot connect to '.	$error='<span class="LC_error">'
'database!</font>';	.&mt('WARNING: Cannot connect to database!')
	.'</span>';
&Apache::lonnet::logthis($error);	&Apache::lonnet::logthis($error);
return ($error,undef);	return ($error,undef);
}	}
if ($status == 0) {	if ($status == 0) {
# It would be nice to actually create the table....	# It would be nice to actually create the table....
$error ='<font color="red">WARNING: The metadata table does not '.	$error ='<span class="LC_error">'
'exist in the LON-CAPA database.</font>';	.&mt('WARNING: The metadata table does not exist in the LON-CAPA database!')
	.'</span>';
&Apache::lonnet::logthis($error);	&Apache::lonnet::logthis($error);
return ($error,undef);	return ($error,undef);
}	}
my $dbh = &Apache::lonmysql::get_dbh();	my $dbh = &Apache::lonmysql::get_dbh();
if (($metadata{'obsolete'}) \|\| ($metadata{'copyright'} eq 'priv') \|\|	if (($metadata{'obsolete'}) \|\| ($metadata{'copyright'} eq 'priv')) {
($metadata{'copyright'} eq 'custom')) {
# remove this entry	# remove this entry
$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,	my $delitem = 'url = '.$dbh->quote($metadata{'url'});
$metadata{'url'});	$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);

} else {	} else {
$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,	$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
\%metadata);	\%metadata);
}	}
if (defined($status) && $status ne '') {	if (defined($status) && $status ne '') {
$error='<font color="red">Error occured storing new values in '.	$error='<span class="LC_error">'
'metadata table in LON-CAPA database</font>';	.&mt('Error occurred saving new values in metadata table in LON-CAPA database!')
	.'</span>';
&Apache::lonnet::logthis($error);	&Apache::lonnet::logthis($error);
&Apache::lonnet::logthis($status);	&Apache::lonnet::logthis($status);
return ($error,undef);	return ($error,undef);
Line 865 sub checkonthis {	Line 895 sub checkonthis {
'return_only_error_and_warning_counts' => 1));	'return_only_error_and_warning_counts' => 1));
my ($errorcount,$warningcount)=split(':',$result);	my ($errorcount,$warningcount)=split(':',$result);
if (($errorcount) \|\| ($warningcount)) {	if (($errorcount) \|\| ($warningcount)) {
$r->print('<br /><tt>'.$uri.'</tt>: ');	$r->print('<h3>'.&mt('Warnings and Errors').'</h3>');
if ($errorcount) {	$r->print('<tt>'.$uri.'</tt>:');
$r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.	$r->print('<ul>');
$errorcount.' '.	if ($warningcount) {
&mt('error(s)').'</b></font> ');	$r->print('<li><div class="LC_warning">'
}	.&mt('[quant,_1,warning]',$warningcount)
if ($warningcount) {	.'</div></li>');
$r->print('<font color="blue">'.	}
$warningcount.' '.	if ($errorcount) {
&mt('warning(s)').'</font>');	$r->print('<li><div class="LC_error">'
}	.&mt('[quant,_1,error]',$errorcount)
	.' <img src="/adm/lonMisc/bomb.gif" />'
	.'</div></li>');
	}
	$r->print('</ul>');
} else {	} else {
#$r->print('<font color="green">'.&mt('ok').'</font>');	#$r->print('<font color="green">'.&mt('ok').'</font>');
}	}
Line 914 backup copies, performs any automatic pr	Line 948 backup copies, performs any automatic pr
especially for rat and ssi files),	especially for rat and ssi files),

Returns a 2 element array, the first is the string to be shown to the	Returns a 2 element array, the first is the string to be shown to the
user, the second is an error code, either 1 (an error occured) or 0	user, the second is an error code, either 1 (an error occurred) or 0
(no error occurred)	(no error occurred)

I<Additional documentation needed.>	I<Additional documentation needed.>
Line 933 sub publish {	Line 967 sub publish {
my %allow=();	my %allow=();

unless ($logfile=Apache::File->new('>>'.$source.'.log')) {	unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);	return ('<span class="LC_error">'.&mt('No write permission to user directory, FAIL').'</span>',1);
}	}
print $logfile	print $logfile
"\n\n================= Publish ".localtime()." Phase One ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";	"\n\n================= Publish ".localtime()." Phase One ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
Line 947 sub publish {	Line 981 sub publish {
print $logfile "Copied original file to ".$copyfile."\n";	print $logfile "Copied original file to ".$copyfile."\n";
} else {	} else {
print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";	print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1);	return ("<span class=\"LC_error\">".&mt("Failed to write backup copy, [_1], FAIL",$1)."</span>",1);
}	}
# ------------------------------------------------------------- IDs and indices	# ------------------------------------------------------------- IDs and indices

Line 957 sub publish {	Line 991 sub publish {
if ($error) { return ($outstring,$error); }	if ($error) { return ($outstring,$error); }
# ------------------------------------------------------------ Construct Allows	# ------------------------------------------------------------ Construct Allows

$scrout.='<h3>'.&mt('Dependencies').'</h3>';	my $outdep=''; # Collect dependencies output data
my $allowstr='';	my $allowstr='';
foreach (sort(keys(%allow))) {	foreach my $thisdep (sort(keys(%allow))) {
my $thisdep=$_;
if ($thisdep !~ /[^\s]/) { next; }	if ($thisdep !~ /[^\s]/) { next; }
	if ($thisdep =~/\$/) {
	$outdep.='<div class="LC_warning">'
	.&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'
	.&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt><allow></tt>')
	."</div>\n";
	}
unless ($style eq 'rat') {	unless ($style eq 'rat') {
$allowstr.="\n".'<allow src="'.$thisdep.'" />';	$allowstr.="\n".'<allow src="'.$thisdep.'" />';
}	}
$scrout.='<br />';	$outdep.='<div>';
if ($thisdep!~/\*/ && $thisdep!~m\|^/adm/\|) {	if ($thisdep!~/[\*\$]/ && $thisdep!~m\|^/adm/\|) {
$scrout.='<a href="'.$thisdep.'">';	$outdep.='<a href="'.$thisdep.'">';
}	}
$scrout.='<tt>'.$thisdep.'</tt>';	$outdep.='<tt>'.$thisdep.'</tt>';
if ($thisdep!~/\*/ && $thisdep!~m\|^/adm/\|) {	if ($thisdep!~/[\*\$]/ && $thisdep!~m\|^/adm/\|) {
$scrout.='</a>';	$outdep.='</a>';
if (	if (
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.	&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
$thisdep.'.meta') eq '-1') {	$thisdep.'.meta') eq '-1') {
$scrout.= ' - <font color="red">'.&mt('Currently not available').	$outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
'</font>';	'</span>';
} else {	} else {
my %temphash=(&Apache::lonnet::declutter($target).'___'.	my %temphash=(&Apache::lonnet::declutter($target).'___'.
&Apache::lonnet::declutter($thisdep).'___usage'	&Apache::lonnet::declutter($thisdep).'___usage'
Line 988 sub publish {	Line 1027 sub publish {
}	}
}	}
}	}
	$outdep.='</div><br />';
	}

	if ($outdep) {
	$scrout.='<h3>'.&mt('Dependencies').'</h3>'
	.$outdep
}	}
$outstring=~s/\n(\<\/[^\>]+\>[^<])$/$allowstr\n$1\n/s;	$outstring=~s/\n(\<\/[^\>]+\>[^<])$/$allowstr\n$1\n/s;

Line 997 sub publish {	Line 1042 sub publish {
my $org;	my $org;
unless ($org=Apache::File->new('>'.$source)) {	unless ($org=Apache::File->new('>'.$source)) {
print $logfile "No write permit to $source\n";	print $logfile "No write permit to $source\n";
return ('<font color="red">'.&mt('No write permission to').	return ('<span class="LC_error">'.&mt('No write permission to').
' '.$source.	' '.$source.
', '.&mt('FAIL').'</font>',1);	', '.&mt('FAIL').'</span>',1);
}	}
print($org $outstring);	print($org $outstring);
}	}
Line 1018 sub publish {	Line 1063 sub publish {

unless ($batch) {	unless ($batch) {
$scrout.='<h3>'.&mt('Metadata Information').' ' .	$scrout.='<h3>'.&mt('Metadata Information').' ' .
Apache::loncommon::help_open_topic("Metadata_Description")	&Apache::loncommon::help_open_topic("Metadata_Description")
. '</h3>';	. '</h3>';
}	}

Line 1095 sub publish {	Line 1140 sub publish {
if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {	if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {
unless ($_=~/\.\w+$/) {	unless ($_=~/\.\w+$/) {
unless ($oldparmstores{$_}) {	unless ($oldparmstores{$_}) {
print $logfile 'New: '.$_."\n";	my $disp_key = $_;
$chparms.=$_.' ';	$disp_key =~ tr/\0/_/;
	print $logfile ('New: '.$disp_key."\n");
	$chparms .= $disp_key.' ';
}	}
}	}
}	}
}	}
if ($chparms) {	if ($chparms) {
$scrout.='<p><b>'.&mt('New parameters or stored values').	$scrout.='<p><b>'.&mt('New parameters or saved values').
':</b> '.$chparms.'</p>';	':</b> '.$chparms.'</p>';
}	}

Line 1111 sub publish {	Line 1158 sub publish {
if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {	if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {
unless (($metadatafields{$_.'.name'}) \|\|	unless (($metadatafields{$_.'.name'}) \|\|
($metadatafields{$_.'.package'}) \|\| ($_=~/\.\w+$/)) {	($metadatafields{$_.'.package'}) \|\| ($_=~/\.\w+$/)) {
print $logfile 'Obsolete: '.$_."\n";	my $disp_key = $_;
$chparms.=$_.' ';	$disp_key =~ tr/\0/_/;
	print $logfile ('Obsolete: '.$disp_key."\n");
	$chparms.=$disp_key.' ';
}	}
}	}
}	}
if ($chparms) {	if ($chparms) {
$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.
$chparms.'</p><h1><font color="red">'.&mt('Warning!').	$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').
'</font></h1><p><font color="red" size="+1">'.	'</span></h1><p><span class="LC_warning">'.
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />';	&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
	}
	if ($metadatafields{'copyright'} eq 'priv') {
	$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
	'</span></h1><p><span class="LC_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.').'</span></p><hr />';
}	}

# ------------------------------------------------------- Now have all metadata	# ------------------------------------------------------- Now have all metadata
Line 1132 sub publish {	Line 1186 sub publish {
$textonly=~s/\<script[^\<]+\<\/script\>//g;	$textonly=~s/\<script[^\<]+\<\/script\>//g;
$textonly=~s/\<m\>[^\<]+\<\/m\>//g;	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
$textonly=~s/\<[^\>]*\>//g;	$textonly=~s/\<[^\>]*\>//g;
$textonly=~tr/A-Z/a-z/;
$textonly=~s/[\$\&][a-z]\w*//g;
$textonly=~s/[^a-z\s]//g;

foreach ($textonly=~m/(\w+)/g) {
unless ($nokey{$_}) {
$keywords{$_}=1;
}
}
}

	#this is a work simplification for german authors for present
	$textonly=HTML::Entities::decode($textonly); #decode HTML-character
	$textonly=Encode::Encoder::encode('utf8', $textonly); #encode to perl internal unicode
	$textonly=~tr/A-ZÜÄÖ/a-züäö/; #add lowercase rule for german "Umlaute"
	$textonly=~s/[\$\&][a-z]\w*//g;
	$textonly=~s/[^a-z^ü^ä^ö^ß\s]//g; #dont delete german "Umlaute"

	foreach ($textonly=~m/[^\s]+/g) { #match all but whitespaces
	unless ($nokey{$_}) {
	$keywords{$_}=1;
	}
	}


	}

foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {	foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
$addkey=~s/\s+/ /g;	$addkey=~s/\s+/ /g;
Line 1160 sub publish {	Line 1219 sub publish {
# $env{'from.'..} so that it can be used by the phase two handler in	# $env{'from.'..} so that it can be used by the phase two handler in
# batch mode	# batch mode

my $intr_scrout.=	my $intr_scrout.='<br />'
'<form name="pubform" action="/adm/publish" method="post">'.	.'<form name="pubform" action="/adm/publish" method="post">';
'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'.	unless ($env{'form.makeobsolete'}) {
	$intr_scrout.='<p class="LC_warning">'
	.&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
	.'</p>'
	.'<p><input type="submit" value="'
	.&mt('Finalize Publication')
	.'" /></p>';
	}
	$intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
	$intr_scrout.=
&hiddenfield('phase','two').	&hiddenfield('phase','two').
&hiddenfield('filename',$env{'form.filename'}).	&hiddenfield('filename',$env{'form.filename'}).
&hiddenfield('allmeta',&escape($allmeta)).	&hiddenfield('allmeta',&escape($allmeta)).
Line 1174 sub publish {	Line 1242 sub publish {
&textfield('Subject','subject',$metadatafields{'subject'});	&textfield('Subject','subject',$metadatafields{'subject'});
# --------------------------------------------------- Scan content for keywords	# --------------------------------------------------- Scan content for keywords

my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");	my $keywords_help = &Apache::loncommon::help_open_topic("Publishing_Keywords");
my $KEYWORDS=&mt('Keywords');
my $CheckAll=&mt('check all');
my $UncheckAll=&mt('uncheck all');
my $keywordout=<<"END";	my $keywordout=<<"END";
<script>	<script>
function checkAll(field) {	function checkAll(field) {
Line 1190 function uncheckAll(field) {	Line 1255 function uncheckAll(field) {
field[i].checked = false ;	field[i].checked = false ;
}	}
</script>	</script>
<p><font color="#800000" face="helvetica"><b>$KEYWORDS:</b></font>
$keywords_help</b>
<input type="button" value="$CheckAll" onclick="javascript:checkAll(document.pubform.keywords)" />
<input type="button" value="$UncheckAll" onclick="javascript:uncheckAll(document.pubform.keywords)" />
</p>
<br />
END	END
$keywordout.='<table border="2"><tr>';	$keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords'))
	.$keywords_help
	.'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
	.'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
	.'</p><br />'
	.&Apache::loncommon::start_data_table();
	my $cols_per_row = 10;
my $colcount=0;	my $colcount=0;
	my $wordcount=0;
	my $numkeywords = scalar(keys(%keywords));

foreach (sort keys %keywords) {	foreach my $word (sort(keys(%keywords))) {
$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"';	if ($colcount == 0) {
if ($metadatafields{'keywords'}) {	$keywordout .= &Apache::loncommon::start_data_table_row();
if ($metadatafields{'keywords'}=~/\Q$_\E/) {	}
$keywordout.=' checked="on"';	$colcount++;
$env{'form.keywords'}.=$_.',';	$wordcount++;
}	if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) {
} elsif (&Apache::loncommon::keyword($_)) {	my $colspan = 1+$cols_per_row-$colcount;
$keywordout.=' checked="on"';	$keywordout .= '<td colspan="'.$colspan.'">';
$env{'form.keywords'}.=$_.',';	} else {
}	$keywordout .= '<td>';
$keywordout.=' />'.$_.'</label></td>';	}
if ($colcount>10) {	$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
$keywordout.="</tr><tr>\n";	if ($metadatafields{'keywords'}) {
$colcount=0;	if ($metadatafields{'keywords'}=~/\Q$word\E/) {
}	$keywordout.=' checked="on"';
$colcount++;	$env{'form.keywords'}.=$word.',';
	}
	} elsif (&Apache::loncommon::keyword($word)) {
	$keywordout.=' checked="on"';
	$env{'form.keywords'}.=$word.',';
	}
	$keywordout.=' />'.$word.'</label></td>';
	if ($colcount == $cols_per_row) {
	$keywordout.=&Apache::loncommon::end_data_table_row();
	$colcount=0;
	}
	}
	if ($colcount > 0) {
	$keywordout .= &Apache::loncommon::end_data_table_row();
}	}

$env{'form.keywords'}=~s/\,$//;	$env{'form.keywords'}=~s/\,$//;

$keywordout.='</tr></table>';	$keywordout.=&Apache::loncommon::end_data_table_row()
	.&Apache::loncommon::end_data_table()
	.&Apache::lonhtmlcommon::row_closure();

$intr_scrout.=$keywordout;	$intr_scrout.=$keywordout;

Line 1228 END	Line 1311 END

$intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});	$intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});

$intr_scrout.=	$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Abstract'))
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".	.'<textarea cols="80" rows="5" name="abstract">'
"</b></font></p><br />".	.$metadatafields{'abstract'}
'<textarea cols="80" rows="5" name="abstract">'.	.'</textarea>'
$metadatafields{'abstract'}.'</textarea></p>';	.&Apache::lonhtmlcommon::row_closure();

$source=~/\.(\w+)$/;	$source=~/\.(\w+)$/;

	$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Grade Levels'))
	.&mt('Lowest Grade Level:').' '
	.&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel')
	# .&Apache::lonhtmlcommon::row_closure();
	# $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Highest Grade Level'))
	.' '.&mt('Highest Grade Level:').' '
	.&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel')
	.&Apache::lonhtmlcommon::row_closure();

$intr_scrout.=	$intr_scrout.=&textfield('Standards','standards',$metadatafields{'standards'});
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
&mt('Lowest Grade Level').':'.
"</b></font></p><br />".
&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
&mt('Highest Grade Level').':'.
"</b></font></p><br />".
&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
&textfield('Standards','standards',$metadatafields{'standards'});




$intr_scrout.=&hiddenfield('mime',$1);	$intr_scrout.=&hiddenfield('mime',$1);

Line 1272 END	Line 1351 END

$intr_scrout.=&hiddenfield('lastrevisiondate',time);	$intr_scrout.=&hiddenfield('lastrevisiondate',time);

	my $pubowner_last;
	if ($style eq 'prv') {
	$pubowner_last = 1;
	}
$intr_scrout.=&textfield('Publisher/Owner','owner',	$intr_scrout.=&textfield('Publisher/Owner','owner',
$metadatafields{'owner'});	$metadatafields{'owner'},$pubowner_last);

# ---------------------------------------------- Retrofix for unused copyright	# ---------------------------------------------- Retrofix for unused copyright
if ($metadatafields{'copyright'} eq 'free') {	if ($metadatafields{'copyright'} eq 'free') {
$metadatafields{'copyright'}='default';	$metadatafields{'copyright'}='default';
$metadatafields{'sourceavail'}='open';	$metadatafields{'sourceavail'}='open';
}	}
	if ($metadatafields{'copyright'} eq 'priv') {
	$metadatafields{'copyright'}='domain';
	}
# ------------------------------------------------ Dial in reasonable defaults	# ------------------------------------------------ Dial in reasonable defaults
my $defaultoption=$metadatafields{'copyright'};	my $defaultoption=$metadatafields{'copyright'};
unless ($defaultoption) { $defaultoption='default'; }	unless ($defaultoption) { $defaultoption='default'; }
Line 1297 END	Line 1382 END
$intr_scrout.=&selectbox('Copyright/Distribution','copyright',	$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
$defaultoption,	$defaultoption,
\&Apache::loncommon::copyrightdescription,	\&Apache::loncommon::copyrightdescription,
(grep !/^public$/,(&Apache::loncommon::copyrightids)));	(grep !/^(public\|priv)$/,(&Apache::loncommon::copyrightids)));
} else {	} else {
$intr_scrout.=&selectbox('Copyright/Distribution','copyright',	$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
$defaultoption,	$defaultoption,
\&Apache::loncommon::copyrightdescription,	\&Apache::loncommon::copyrightdescription,
(&Apache::loncommon::copyrightids));	(grep !/^priv$/,(&Apache::loncommon::copyrightids)));
}	}
my $copyright_help =	my $copyright_help =
Apache::loncommon::help_open_topic('Publishing_Copyright');	&Apache::loncommon::help_open_topic('Publishing_Copyright');
$intr_scrout =~ s/Distribution:/'Distribution: ' . $copyright_help/ge;	my $replace=&mt('Copyright/Distribution:');
$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help;	$intr_scrout =~ s/$replace/$replace.' '.$copyright_help/ge;

	$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights');
$intr_scrout.=&selectbox('Source Distribution','sourceavail',	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
$defaultsourceoption,	$defaultsourceoption,
\&Apache::loncommon::source_copyrightdescription,	\&Apache::loncommon::source_copyrightdescription,
(&Apache::loncommon::source_copyrightids));	(&Apache::loncommon::source_copyrightids));
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');	# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
my $uctitle=&mt('Obsolete');	my $uctitle=&mt('Obsolete');
$intr_scrout.=	my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';
"\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".	$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
'</b></font> <input type="checkbox" name="obsolete" ';	.'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'
if ($metadatafields{'obsolete'}) {	.&Apache::lonhtmlcommon::row_closure(1);
$intr_scrout.=' checked="1" ';	$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
}
$intr_scrout.='/ ></label></p>'.
&text_with_browse_field('Suggested Replacement for Obsolete File',
'obsoletereplacement',	'obsoletereplacement',
$metadatafields{'obsoletereplacement'});	$metadatafields{'obsoletereplacement'},'',1);
} else {	} else {
$intr_scrout.=&hiddenfield('copyright','private');	$intr_scrout.=&hiddenfield('copyright','private');
}	}
Line 1349 END	Line 1433 END
&hiddenfield('obsolete',1).	&hiddenfield('obsolete',1).
&text_with_browse_field('Suggested Replacement for Obsolete File',	&text_with_browse_field('Suggested Replacement for Obsolete File',
'obsoletereplacement',	'obsoletereplacement',
$metadatafields{'obsoletereplacement'});	$metadatafields{'obsoletereplacement'},'',1);
}	}
if (!$batch) {	if (!$batch) {
$scrout.=$intr_scrout.'<p><input type="submit" value="'.	$scrout.=$intr_scrout
&mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>';	.&Apache::lonhtmlcommon::end_pick_box()
	.'<p><input type="submit" value="'
	.&mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication')
	.'" /></p>'
	.'</form>';
}	}
return($scrout,0);	return($scrout,0);
}	}
Line 1406 sub phasetwo {	Line 1494 sub phasetwo {
#	#
unless ($env{'form.obsolete'}) {	unless ($env{'form.obsolete'}) {
if ($target=~/(\_\_\_\|\&\&\&\|\:\:\:)/) {	if ($target=~/(\_\_\_\|\&\&\&\|\:\:\:)/) {
$r->print(	$r->print('<span class="LC_error">'.
'<font color="red">'.&mt('Unsupported character combination').	&mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>").
' "<tt>'.$1.'</tt>" '.&mt('in filename, FAIL').'</font>');	'</span>');
return 0;	return 0;
}	}
unless ($target=~/\.(\w+)$/) {	unless ($target=~/\.(\w+)$/) {
$r->print('<font color="red">'.&mt('No valid extension found in filename, FAIL').'</font>');	$r->print('<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>');
return 0;	return 0;
}	}
if ($target=~/\.(\d+)\.(\w+)$/) {	if ($target=~/\.(\d+)\.(\w+)$/) {
$r->print('<font color="red">'.&mt('Cannot publish versioned resource, FAIL').'</font>');	$r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
return 0;	return 0;
}	}
}	}
Line 1428 sub phasetwo {	Line 1516 sub phasetwo {
my $logfile;	my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {	unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
$r->print(	$r->print(
'<font color="red">'.	'<span class="LC_error">'.
&mt('No write permission to user directory, FAIL').'</font>');	&mt('No write permission to user directory, FAIL').'</span>');
return 0;	return 0;
}	}

	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>');
	}

print $logfile	print $logfile
"\n================= Publish ".localtime()." Phase Two ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";	"\n================= Publish ".localtime()." Phase Two ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";

Line 1486 sub phasetwo {	Line 1579 sub phasetwo {
my $file=$metadatafields{'customdistributionfile'};	my $file=$metadatafields{'customdistributionfile'};
unless ($file=~/\.rights$/) {	unless ($file=~/\.rights$/) {
$r->print(	$r->print(
'<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').	'<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL').
'</font>');	'</span>');
return 0;	return 0;
}	}
}	}
Line 1496 sub phasetwo {	Line 1589 sub phasetwo {
my $mfh;	my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {	unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
$r->print(	$r->print(
'<font color="red">'.&mt('Could not write metadata, FAIL').	'<span class="LC_error">'.&mt('Could not write metadata, FAIL').
'</font>');	'</span>');
return 0;	return 0;
}	}
foreach (sort keys %metadatafields) {	foreach (sort keys %metadatafields) {
Line 1547 sub phasetwo {	Line 1640 sub phasetwo {
my $srcf=$2;	my $srcf=$2;
my $srct=$3;	my $srct=$3;
my $srcd=$1;	my $srcd=$1;
unless ($srcd=~/^\/home\/httpd\/html\/res/) {	my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
	unless ($srcd=~/^\Q$docroot\E\/res/) {
print $logfile "\nPANIC: Target dir is ".$srcd;	print $logfile "\nPANIC: Target dir is ".$srcd;
$r->print(	$r->print(
"<font color=\"red\">Invalid target directory, FAIL</font>");	"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
return 0;	return 0;
}	}
opendir(DIR,$srcd);	opendir(DIR,$srcd);
Line 1559 sub phasetwo {	Line 1653 sub phasetwo {
unlink($srcd.'/'.$filename);	unlink($srcd.'/'.$filename);
unlink($srcd.'/'.$filename.'.meta');	unlink($srcd.'/'.$filename.'.meta');
} else {	} else {
if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {	if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
$maxversion=($1>$maxversion)?$1:$maxversion;	$maxversion=($1>$maxversion)?$1:$maxversion;
}	}
}	}
Line 1576 sub phasetwo {	Line 1670 sub phasetwo {
$r->print('<p>'.&mt('Copied old target file').'</p>');	$r->print('<p>'.&mt('Copied old target file').'</p>');
} else {	} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";	print $logfile "Unable to write ".$copyfile.':'.$!."\n";
$r->print("<font color=\"red\">".&mt('Failed to copy old target').	$r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
", $!, ".&mt('FAIL')."</font>");	", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}

Line 1592 sub phasetwo {	Line 1686 sub phasetwo {
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(	$r->print(
"<font color=\"red\">".	"<span class=\"LC_error\">".
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>");	&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}
}	}
Line 1625 sub phasetwo {	Line 1719 sub phasetwo {
$r->print('<p>'.&mt('Copied source file').'</p>');	$r->print('<p>'.&mt('Copied source file').'</p>');
} else {	} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
$r->print("<font color=\"red\">".	$r->print("<span class=\"LC_error\">".
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>");	&mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}

Line 1640 sub phasetwo {	Line 1734 sub phasetwo {
} else {	} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
$r->print(	$r->print(
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>");	"<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}
$r->rflush;	$r->rflush;
Line 1648 sub phasetwo {	Line 1742 sub phasetwo {
# ------------------------------------------------------------- Trigger updates	# ------------------------------------------------------------- Trigger updates
push(@{$modified_urls},[$target,$source]);	push(@{$modified_urls},[$target,$source]);
unless ($registered_cleanup) {	unless ($registered_cleanup) {
$r->register_cleanup(\&notify);	my $handlers = $r->get_handlers('PerlCleanupHandler');
	$r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
$registered_cleanup=1;	$registered_cleanup=1;
}	}

Line 1672 sub phasetwo {	Line 1767 sub phasetwo {
$r->print(	$r->print(
'<hr /><a href="'.$thisdistarget.'"><font size="+2">'.	'<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
&mt('View Published Version').'</font></a>'.	&mt('View Published Version').'</font></a>'.
'<p><a href="'.$thissrc.'"><font size=+2>'.	'<p><a href="'.$thissrc.'"><font size="+2">'.
&mt('Back to Source').'</font></a></p>'.	&mt('Back to Source').'</font></a></p>'.
'<p><a href="'.$thissrcdir.	'<p><a href="'.$thissrcdir.
'"><font size="+2">'.	'"><font size="+2">'.
Line 1717 sub notify {	Line 1812 sub notify {
print $logfile "\n============ Done ============\n";	print $logfile "\n============ Done ============\n";
$logfile->close();	$logfile->close();
}	}
	if ($lock) { &Apache::lonnet::remove_lock($lock); }
return OK;	return OK;
}	}

Line 1786 sub publishdirectory {	Line 1882 sub publishdirectory {
&checkbox('obsolete','make file(s) obsolete').	&checkbox('obsolete','make file(s) obsolete').
&checkbox('forceoverride','force directory level catalog information over existing').	&checkbox('forceoverride','force directory level catalog information over existing').
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');	'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
	$lock=0;
} else {	} else {
	unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
# actually publish things	# actually publish things
opendir(DIR,$fn);	opendir(DIR,$fn);
my @files=sort(readdir(DIR));	my @files=sort(readdir(DIR));
Line 1873 sub defaultmetapublish {	Line 1971 sub defaultmetapublish {
if (copy($fn,$copyfile)) {	if (copy($fn,$copyfile)) {
$r->print('<p>'.&mt('Copied source file').'</p>');	$r->print('<p>'.&mt('Copied source file').'</p>');
} else {	} else {
return "<font color=\"red\">".	return "<span class=\"LC_error\">".
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";	&mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>";
}	}

# --------------------------------------------------- Send update notifications	# --------------------------------------------------- Send update notifications
Line 2072 sub handler {	Line 2170 sub handler {
my $thistype=$1;	my $thistype=$1;
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
if ($thistype eq 'page') { $thisembstyle = 'rat'; }	if ($thistype eq 'page') { $thisembstyle = 'rat'; }
$r->print('<h2>'.&mt('Publishing').' '.
&Apache::loncommon::filedescription($thistype).' <tt>');

	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');

	$r->print('<h3>'.&mt('Resource Details').'</h3>');

	$r->print(&Apache::lonhtmlcommon::start_pick_box());

	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Type'))
	.&Apache::loncommon::filedescription($thistype)
	.&Apache::lonhtmlcommon::row_closure()
	);

	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Link to Resource'))
	.'<tt>'
	);
$r->print(<<ENDCAPTION);	$r->print(<<ENDCAPTION);
<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>	<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
$thisdisfn</a>	$thisdisfn</a>
ENDCAPTION	ENDCAPTION
$r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'.	$r->print('</tt>'
$thisdistarget.'</tt><br />');	.&Apache::lonhtmlcommon::row_closure()
	);

	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
	.'<tt>'.$thisdistarget.'</tt>'
	);
if (($cuname ne $env{'user.name'})\|\|($cudom ne $env{'user.domain'})) {	if (($cuname ne $env{'user.name'})\|\|($cudom ne $env{'user.domain'})) {
$r->print('<h3><font color="red">'.&mt('Co-Author').': '.	$r->print(&Apache::lonhtmlcommon::row_closure()
$cuname.&mt(' at ').$cudom.'</font></h3>');	.&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
	.'<span class="LC_warning">'
	.&mt('[_1] at [_2]',$cuname,$cudom)
	.'</span>'
	);
}	}

if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {	if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
	$r->print(&Apache::lonhtmlcommon::row_closure()
	.&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
$r->print(<<ENDDIFF);	$r->print(<<ENDDIFF);
<br />
<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>	<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
ENDDIFF	ENDDIFF
$r->print(&mt('Diffs with Current Version').'</a><br />');	$r->print(&mt('Diffs with Current Version').'</a>');
}	}

	$r->print(&Apache::lonhtmlcommon::row_closure(1)
	.&Apache::lonhtmlcommon::end_pick_box()
	);

# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.	# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.

Line 2106 ENDDIFF	Line 2229 ENDDIFF
unless ($errorcount) {	unless ($errorcount) {
my ($outstring,$error)=	my ($outstring,$error)=
&publish($thisfn,$thistarget,$thisembstyle);	&publish($thisfn,$thistarget,$thisembstyle);
$r->print('<hr />'.$outstring);	$r->print($outstring);
} else {	} else {
$r->print('<h3>'.	$r->print('<h3 class="LC_error">'.
&mt('The document contains errors and cannot be published.').	&mt('The document contains errors and cannot be published.').
'</h3>');	'</h3>');
}	}

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

Removed from v.1.218
changed lines
	Added in v.1.249.2.3