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.244 and 1.265

version 1.244, 2008/08/01 18:11:19	version 1.265, 2009/12/03 17:23:00
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;
Line 264 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 274 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><br />';	.&mt('Processed file: [_1]'
	,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
}	}

#########################################	#########################################
Line 380 sub selectbox {	Line 384 sub selectbox {
my $selout="\n".&Apache::lonhtmlcommon::row_title($title)	my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
.'<select name="'.$name.'">';	.'<select name="'.$name.'">';
foreach (@idlist) {	foreach (@idlist) {
$selout.='<option value=\''.$_.'\'';	$selout.='<option value="'.$_.'"';
if ($_ eq $value) {	if ($_ eq $value) {
$selout.=' selected>'.&{$functionref}($_).'</option>';	$selout.=' selected="selected"';
}	}
else {$selout.='>'.&{$functionref}($_).'</option>';}	$selout.='>'.&{$functionref}($_).'</option>';
}	}
$selout.='</select>'.&Apache::lonhtmlcommon::row_closure();	$selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
return $selout;	return $selout;
Line 691 sub fix_ids_and_indices {	Line 695 sub fix_ids_and_indices {
$responsecounter=0;	$responsecounter=0;
}	}
if ($lctag=~/response$/) { $responsecounter++; }	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 843 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='<span class="LC_error">WARNING: Cannot connect to '.	$error='<span class="LC_error">'
'database!</span>';	.&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 ='<span class="LC_error">WARNING: The metadata table does not '.	$error ='<span class="LC_error">'
'exist in the LON-CAPA database.</span>';	.&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);
}	}
Line 866 sub store_metadata {	Line 873 sub store_metadata {
\%metadata);	\%metadata);
}	}
if (defined($status) && $status ne '') {	if (defined($status) && $status ne '') {
$error='<span class="LC_error">Error occured saving new values in '.	$error='<span class="LC_error">'
'metadata table in LON-CAPA database</span>';	.&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 940 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 983 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 my $thisdep (sort(keys(%allow))) {	foreach my $thisdep (sort(keys(%allow))) {
if ($thisdep !~ /[^\s]/) { next; }	if ($thisdep !~ /[^\s]/) { next; }
if ($thisdep =~/\$/) {	if ($thisdep =~/\$/) {
$scrout.='<br /><span class="LC_warning">'	$outdep.='<div class="LC_warning">'
.&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'	.&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>')	.&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt><allow></tt>')
.'</span><br />';	."</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.= ' - <span class="LC_error">'.&mt('Currently not available').	$outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
'</span>';	'</span>';
} else {	} else {
my %temphash=(&Apache::lonnet::declutter($target).'___'.	my %temphash=(&Apache::lonnet::declutter($target).'___'.
Line 1019 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 1048 sub publish {	Line 1062 sub publish {
my %oldparmstores=();	my %oldparmstores=();

unless ($batch) {	unless ($batch) {
$scrout.='<h3>'.&mt('Metadata Information').' ' .	$scrout.='<h3>'.&mt('Metadata').' ' .
&Apache::loncommon::help_open_topic("Metadata_Description")	&Apache::loncommon::help_open_topic("Metadata_Description")
. '</h3>';	. '</h3>';
}	}
Line 1152 sub publish {	Line 1166 sub publish {
}	}
}	}
if ($chparms) {	if ($chparms) {
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '
$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').	.$chparms.'</p>'
'</span></h1><p><span class="LC_warning">'.	.'<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';	.&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.')
	.'</p><hr />';
}	}
if ($metadatafields{'copyright'} eq 'priv') {	if ($metadatafields{'copyright'} eq 'priv') {
$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').	$scrout.='<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
'</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.')
&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 />';	.'</p><hr />';
}	}

# ------------------------------------------------------- Now have all metadata	# ------------------------------------------------------- Now have all metadata
Line 1172 sub publish {	Line 1187 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 1203 sub publish {	Line 1223 sub publish {
my $intr_scrout.='<br />'	my $intr_scrout.='<br />'
.'<form name="pubform" action="/adm/publish" method="post">';	.'<form name="pubform" action="/adm/publish" method="post">';
unless ($env{'form.makeobsolete'}) {	unless ($env{'form.makeobsolete'}) {
$intr_scrout.='<p>'	$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.')	.&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
.'</p>'	.'</p>'
.'<p><input type="submit" value="'	.'<p><input type="submit" value="'
Line 1242 END	Line 1262 END
.'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'	.'<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)" />'	.'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
.'</p><br />'	.'</p><br />'
.&Apache::loncommon::start_data_table()	.&Apache::loncommon::start_data_table();
.&Apache::loncommon::start_data_table_row();	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))) {
$colcount++;	if ($colcount == 0) {
$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"';	$keywordout .= &Apache::loncommon::start_data_table_row();
if ($metadatafields{'keywords'}) {	}
if ($metadatafields{'keywords'}=~/\Q$_\E/) {	$colcount++;
$keywordout.=' checked="on"';	$wordcount++;
$env{'form.keywords'}.=$_.',';	if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) {
}	my $colspan = 1+$cols_per_row-$colcount;
} elsif (&Apache::loncommon::keyword($_)) {	$keywordout .= '<td colspan="'.$colspan.'">';
$keywordout.=' checked="on"';	} else {
$env{'form.keywords'}.=$_.',';	$keywordout .= '<td>';
}	}
$keywordout.=' />'.$_.'</label></td>';	$keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
if ($colcount>=10) {	if ($metadatafields{'keywords'}) {
$keywordout.=&Apache::loncommon::end_data_table_row()	if ($metadatafields{'keywords'}=~/\Q$word\E/) {
.&Apache::loncommon::start_data_table_row();	$keywordout.=' checked="checked"';
$colcount=0;	$env{'form.keywords'}.=$word.',';
}	}
}	} elsif (&Apache::loncommon::keyword($word)) {
# Proper end of started table row:	$keywordout.=' checked="checked"';
if ($colcount != 0) { # has still to be improved: if amount of keywords mod 10 == 0, then do not start another table row	$env{'form.keywords'}.=$word.',';
while ($colcount<10) {	}
$keywordout.='<td> </td>';	$keywordout.=' />'.$word.'</label></td>';
$colcount++;	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/\,$//;

Line 1376 END	Line 1402 END
(&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');
my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';	my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':'';
$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)	$intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
.'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'	.'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />'
.&Apache::lonhtmlcommon::row_closure(1);	.&Apache::lonhtmlcommon::row_closure(1);
$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',	$intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
'obsoletereplacement',	'obsoletereplacement',
Line 1479 sub phasetwo {	Line 1505 sub phasetwo {
return 0;	return 0;
}	}
if ($target=~/\.(\d+)\.(\w+)$/) {	if ($target=~/\.(\d+)\.(\w+)$/) {
$r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');	$r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>');
return 0;	return 0;
}	}
}	}
Line 1615 sub phasetwo {	Line 1641 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(
"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");	"<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
Line 1627 sub phasetwo {	Line 1654 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;
}	}
}	}
}	}
closedir(DIR);	closedir(DIR);
$maxversion++;	$maxversion++;
$r->print('<p>Creating old version '.$maxversion.'</p>');	$r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>');
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('<p>'.&mt('Copied old target file').'</p>');	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file')));
} else {	} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";	print $logfile "Unable to write ".$copyfile.':'.$!."\n";
$r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1));
", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}

Line 1655 sub phasetwo {	Line 1681 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('<p>'.&mt('Copied old metadata').'</p>')	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata')));
} 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(	$r->print(&Apache::lonhtmlcommon::confirm_success(
"<span class=\"LC_error\">".	&mt('Failed to write old metadata copy').", $!",1));
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
return 0;	return 0;
}	}
}	}
Line 1683 sub phasetwo {	Line 1708 sub phasetwo {
$path.="/$parts[$count]";	$path.="/$parts[$count]";
if ((-e $path)!=1) {	if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;	print $logfile "\nCreating directory ".$path;
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
mkdir($path,0777);	mkdir($path,0777);
	$r->print('<p>'
	.&mt('Created directory [_1]'
	,'<span class="LC_filename">'.$parts[$count].'</span>')
	.'</p>'
	);
}	}
}	}

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('<p>'.&mt('Copied source file').'</p>');	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied source file')));
} else {	} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
$r->print("<span class=\"LC_error\">".	$r->print(&Apache::lonhtmlcommon::confirm_success(
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");	&mt('Failed to copy source').", $!",1));
return 0;	return 0;
}	}

	# ---------------------------------------------- Delete local tmp-preview files
	unlink($copyfile.'.tmp');
# --------------------------------------------------------------- Copy Metadata	# --------------------------------------------------------------- Copy Metadata

$copyfile=$copyfile.'.meta';	$copyfile=$copyfile.'.meta';

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('<p>'.&mt('Copied metadata').'</p>');	$r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata')));
} else {	} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";	print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
$r->print(	$r->print(&Apache::lonhtmlcommon::confirm_success(
"<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");	&mt('Failed to write metadata copy').", $!",1));
return 0;	return 0;
}	}
$r->rflush;	$r->rflush;
Line 1716 sub phasetwo {	Line 1747 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 1727 sub phasetwo {	Line 1759 sub phasetwo {
&Apache::lonnet::devalidate_cache_new('meta',	&Apache::lonnet::devalidate_cache_new('meta',
&Apache::lonnet::declutter($thisdistarget));	&Apache::lonnet::declutter($thisdistarget));

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

# ------------------------------------------------ Provide link to new resource	# ------------------------------------------------ Provide link to new resource
unless ($batch) {	unless ($batch) {

my $thissrc=$source;	my $thissrc=$source;
$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};	$thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};

my $thissrcdir=$thissrc;	my $thissrcdir=$thissrc;
$thissrcdir=~s/\/[^\/]+$/\//;	$thissrcdir=~s/\/[^\/]+$/\//;

	$r->print(&Apache::loncommon::head_subbox(
$r->print(	&Apache::lonhtmlcommon::start_funclist().
'<hr /><a href="'.$thisdistarget.'"><font size="+2">'.	&Apache::lonhtmlcommon::add_item_funclist(
&mt('View Published Version').'</font></a>'.	'<a href="'.$thisdistarget.'">'.
'<p><a href="'.$thissrc.'"><font size="+2">'.	&mt('View Published Version').
&mt('Back to Source').'</font></a></p>'.	'</a>').
'<p><a href="'.$thissrcdir.	&Apache::lonhtmlcommon::add_item_funclist(
'"><font size="+2">'.	'<a href="'.$thissrc.'">'.
&mt('Back to Source Directory').'</font></a></p>');	&mt('Back to Source').
	'</a>').
	&Apache::lonhtmlcommon::add_item_funclist(
	'<a href="'.$thissrcdir.'">'.
	&mt('Back to Source Directory').
	'</a>').
	&Apache::lonhtmlcommon::end_funclist())
	);
}	}
$logfile->close();
$r->print('<p><font color="green">'.&mt('Done').'</font></p>');
return 1;	return 1;
}	}

Line 1814 sub batchpublish {	Line 1854 sub batchpublish {

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

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

# phase one takes	# phase one takes
# my ($source,$target,$style,$batch)=@_;	# my ($source,$target,$style,$batch)=@_;
Line 1841 sub publishdirectory {	Line 1885 sub publishdirectory {
my $resdir=	my $resdir=
$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
$thisdisfn;	$thisdisfn;
$r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.	$r->print(&Apache::lonhtmlcommon::start_pick_box()
&mt('Target').': <tt>'.$resdir.'</tt><br />');	.&Apache::lonhtmlcommon::row_title(&mt('Directory'))
	.'<span class="LC_filename">'.$thisdisfn.'</span>'
	.&Apache::lonhtmlcommon::row_closure()
	.&Apache::lonhtmlcommon::row_title(&mt('Target'))
	.'<span class="LC_filename">'.$resdir.'</span>'
	);

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()
	.&Apache::lonhtmlcommon::row_title(&mt('Options'))
	);
$r->print('<form name="pubdirpref" method="post">'.	$r->print('<form name="pubdirpref" method="post">'.
&hiddenfield('phase','two').	&hiddenfield('phase','two').
&hiddenfield('filename',$env{'form.filename'}).	&hiddenfield('filename',$env{'form.filename'}).
&checkbox('pubrec','include subdirectories').	&checkbox('pubrec','include subdirectories').
&checkbox('forcerepub','force republication of previously published files').	&checkbox('forcerepub','force republication of previously published files').
&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 metadata over existing').
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');	'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
	$r->print(&Apache::lonhtmlcommon::row_closure(1)
	.&Apache::lonhtmlcommon::end_pick_box()
	);
$lock=0;	$lock=0;
} else {	} else {
	$r->print(&Apache::lonhtmlcommon::row_closure(1)
	.&Apache::lonhtmlcommon::end_pick_box()
	);
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 1924 sub defaultmetapublish {	Line 1982 sub defaultmetapublish {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

$r->print(&Apache::loncommon::start_page('Catalog Information Publication'));	$r->print(&Apache::loncommon::start_page('Metadata Publication'));

# ---------------------------------------------------------------- Write Source	# ---------------------------------------------------------------- Write Source
my $copyfile=$target;	my $copyfile=$target;
Line 1936 sub defaultmetapublish {	Line 1994 sub defaultmetapublish {
for ($count=5;$count<$#parts;$count++) {	for ($count=5;$count<$#parts;$count++) {
$path.="/$parts[$count]";	$path.="/$parts[$count]";
if ((-e $path)!=1) {	if ((-e $path)!=1) {
$r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
mkdir($path,0777);	mkdir($path,0777);
	$r->print('<p>'
	.&mt('Created directory [_1]'
	,'<span class="LC_filename">'.$parts[$count].'</span>')
	.'</p>'
	);
}	}
}	}

Line 1959 sub defaultmetapublish {	Line 2021 sub defaultmetapublish {
# ------------------------------------------------------------------- Link back	# ------------------------------------------------------------------- Link back
my $link=$fn;	my $link=$fn;
$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;	$link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
$r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');	$r->print("<a href='$link'>".&mt('Back to Metadata').'</a>');
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}
Line 2110 sub handler {	Line 2172 sub handler {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$r->send_http_header;

	# Breadcrumbs
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'Construction Space',
	'href' => &Apache::loncommon::authorspace(),
	});
	&Apache::lonhtmlcommon::add_breadcrumb({
	'text' => 'Resource Publication',
	'href' => '',
	});

my $js='<script type="text/javascript">'.	my $js='<script type="text/javascript">'.
&Apache::loncommon::browser_and_searcher_javascript().	&Apache::loncommon::browser_and_searcher_javascript().
'</script>';	'</script>';
$r->print(&Apache::loncommon::start_page('Resource Publication',$js));	$r->print(&Apache::loncommon::start_page('Resource Publication',$js)
	.&Apache::lonhtmlcommon::breadcrumbs()
	.&Apache::loncommon::head_subbox(
	&Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
	);


my $thisfn=$fn;	my $thisfn=$fn;
Line 2144 sub handler {	Line 2221 sub handler {
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 [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');	$r->print('<h2>'
	.&mt('Publishing [_1]'
	,'<span class="LC_filename">'.$thisdisfn.'</span>')
	.'</h2>'
	);

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

Line 2169 ENDCAPTION	Line 2250 ENDCAPTION
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
.'<tt>'.$thisdistarget.'</tt>'	.'<tt>'.$thisdistarget.'</tt>'
);	);
# SB - ToDo:
if (($cuname ne $env{'user.name'})\|\|($cudom ne $env{'user.domain'})) {	if (($cuname ne $env{'user.name'})\|\|($cudom ne $env{'user.domain'})) {
# $r->print(&Apache::lonhtmlcommon::row_title('<span class="LC_warning">'.&mt('Co-Author').'</span>')
$r->print(&Apache::lonhtmlcommon::row_closure()	$r->print(&Apache::lonhtmlcommon::row_closure()
.&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))	.&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
.'<span class="LC_warning">'	.'<span class="LC_warning">'
.&mt('[_1] at [_2]',$cuname,$cudom)	.&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')'
.'</span>'	.'</span>'
);	);
}	}
Line 2204 ENDDIFF	Line 2283 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 class="LC_error">'.	$r->print('<h3 class="LC_error">'.
&mt('The document contains errors and cannot be published.').	&mt('The document contains errors and cannot be published.').
Line 2212 ENDDIFF	Line 2291 ENDDIFF
}	}
} else {	} else {
&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget);	&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget);
$r->print('<hr />');
}	}
}	}
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());

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

Removed from v.1.244
changed lines
	Added in v.1.265