version 1.261, 2009/07/25 06:55:31
|
version 1.265, 2009/12/03 17:23:00
|
Line 1668 sub phasetwo {
|
Line 1668 sub phasetwo {
|
|
|
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 1682 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 1721 sub phasetwo {
|
Line 1719 sub phasetwo {
|
|
|
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 1747 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(\¬ify); |
my $handlers = $r->get_handlers('PerlCleanupHandler'); |
|
$r->set_handlers('PerlCleanupHandler' => [\¬ify,@{$handlers}]); |
$registered_cleanup=1; |
$registered_cleanup=1; |
} |
} |
|
|
Line 1770 sub phasetwo {
|
Line 1771 sub phasetwo {
|
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()) |
|
); |
} |
} |
return 1; |
return 1; |
} |
} |
Line 2283 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()); |