version 1.195, 2005/05/20 18:28:22
|
version 1.201, 2005/08/09 20:00:06
|
Line 355 sub hiddenfield {
|
Line 355 sub hiddenfield {
|
|
|
sub checkbox { |
sub checkbox { |
my ($name,$text)=@_; |
my ($name,$text)=@_; |
return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text); |
return "\n<br /><label><input type='checkbox' name='$name' /> ". |
|
&mt($text)."</label>"; |
} |
} |
|
|
sub selectbox { |
sub selectbox { |
Line 1309 END
|
Line 1310 END
|
$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.= |
$intr_scrout.= |
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
"\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
'</b></font> <input type="checkbox" name="obsolete" '; |
'</b></font> <input type="checkbox" name="obsolete" '; |
if ($metadatafields{'obsolete'}) { |
if ($metadatafields{'obsolete'}) { |
$intr_scrout.=' checked="1" '; |
$intr_scrout.=' checked="1" '; |
} |
} |
$intr_scrout.='/ ></p>'. |
$intr_scrout.='/ ></label></p>'. |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
$metadatafields{'obsoletereplacement'}); |
$metadatafields{'obsoletereplacement'}); |
Line 1383 Returns:
|
Line 1384 Returns:
|
|
|
=over 4 |
=over 4 |
|
|
=item Scalar string |
=item integer |
|
|
String contains status (errors and warnings) and information associated with |
0: fail |
the server's attempts at publication. |
1: success |
|
|
=cut |
=cut |
|
|
Line 1398 sub phasetwo {
|
Line 1399 sub phasetwo {
|
my ($r,$source,$target,$style,$distarget,$batch)=@_; |
my ($r,$source,$target,$style,$distarget,$batch)=@_; |
$source=~s/\/+/\//g; |
$source=~s/\/+/\//g; |
$target=~s/\/+/\//g; |
$target=~s/\/+/\//g; |
|
# |
if ($target=~/\_\_\_/) { |
# Unless trying to get rid of something, check name validity |
$r->print( |
# |
'<font color="red">'.&mt('Unsupported character combination'). |
unless ($env{'form.obsolete'}) { |
' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>'); |
if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) { |
return 0; |
$r->print( |
|
'<font color="red">'.&mt('Unsupported character combination'). |
|
' "<tt>'.$1.'</tt>" '.&mt('in filename, FAIL').'</font>'); |
|
return 0; |
|
} |
|
unless ($target=~/\.(\w+)$/) { |
|
$r->print('<font color="red">'.&mt('No valid extension found in filename, FAIL').'</font>'); |
|
return 0; |
|
} |
|
if ($target=~/\.(\d+)\.(\w+)$/) { |
|
$r->print('<font color="red">'.&mt('Cannot publish versioned resource, FAIL').'</font>'); |
|
return 0; |
|
} |
} |
} |
|
|
|
# |
|
# End name check |
|
# |
$distarget=~s/\/+/\//g; |
$distarget=~s/\/+/\//g; |
my $logfile; |
my $logfile; |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
Line 1465 sub phasetwo {
|
Line 1482 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$/) { |
return |
$r->print( |
'<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL'). |
'<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL'). |
'</font>'; |
'</font>'); |
|
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')) { |
return |
$r->print( |
'<font color="red">'.&mt('Could not write metadata, FAIL'). |
'<font color="red">'.&mt('Could not write metadata, FAIL'). |
'</font>'; |
'</font>'); |
|
return 0; |
} |
} |
foreach (sort keys %metadatafields) { |
foreach (sort keys %metadatafields) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
Line 1527 sub phasetwo {
|
Line 1546 sub phasetwo {
|
my $srcd=$1; |
my $srcd=$1; |
unless ($srcd=~/^\/home\/httpd\/html\/res/) { |
unless ($srcd=~/^\/home\/httpd\/html\/res/) { |
print $logfile "\nPANIC: Target dir is ".$srcd; |
print $logfile "\nPANIC: Target dir is ".$srcd; |
return "<font color=\"red\">Invalid target directory, FAIL</font>"; |
$r->print( |
|
"<font color=\"red\">Invalid target directory, FAIL</font>"); |
|
return 0; |
} |
} |
opendir(DIR,$srcd); |
opendir(DIR,$srcd); |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
Line 1552 sub phasetwo {
|
Line 1573 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"; |
return "<font color=\"red\">".&mt('Failed to copy old target'). |
$r->print("<font color=\"red\">".&mt('Failed to copy old target'). |
", $!, ".&mt('FAIL')."</font>"; |
", $!, ".&mt('FAIL')."</font>"); |
|
return 0; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1566 sub phasetwo {
|
Line 1588 sub phasetwo {
|
} 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') { |
return |
$r->print( |
"<font color=\"red\">". |
"<font color=\"red\">". |
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>"; |
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>"); |
|
return 0; |
} |
} |
} |
} |
|
|
Line 1599 sub phasetwo {
|
Line 1622 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"; |
return "<font color=\"red\">". |
$r->print("<font color=\"red\">". |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>"; |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>"); |
|
return 0; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1612 sub phasetwo {
|
Line 1636 sub phasetwo {
|
$r->print('<p>'.&mt('Copied metadata').'</p>'); |
$r->print('<p>'.&mt('Copied metadata').'</p>'); |
} else { |
} else { |
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n"; |
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n"; |
return |
$r->print( |
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>"; |
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>"); |
|
return 0; |
} |
} |
$r->rflush; |
$r->rflush; |
|
|
Line 1623 sub phasetwo {
|
Line 1648 sub phasetwo {
|
$r->register_cleanup(\¬ify); |
$r->register_cleanup(\¬ify); |
$registered_cleanup=1; |
$registered_cleanup=1; |
} |
} |
|
|
|
# ---------------------------------------------------------- Clear local caches |
|
my $thisdistarget=$target; |
|
$thisdistarget=~s/^\Q$docroot\E//; |
|
&Apache::lonnet::devalidate_cache_new('resversion',$target); |
|
&Apache::lonnet::devalidate_cache_new('meta', |
|
&Apache::lonnet::declutter($thisdistarget)); |
|
|
# ------------------------------------------------ Provide link to new resource |
# ------------------------------------------------ Provide link to new resource |
unless ($batch) { |
unless ($batch) { |
my $thisdistarget=$target; |
|
$thisdistarget=~s/^\Q$docroot\E//; |
|
|
|
my $thissrc=$source; |
my $thissrc=$source; |
$thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/; |
$thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/; |
Line 1645 sub phasetwo {
|
Line 1676 sub phasetwo {
|
&mt('Back to Source Directory').'</font></a></p>'); |
&mt('Back to Source Directory').'</font></a></p>'); |
} |
} |
$logfile->close(); |
$logfile->close(); |
return '<p><font color="green">'.&mt('Done').'</font></p>'; |
$r->print('<p><font color="green">'.&mt('Done').'</font></p>'); |
|
return 1; |
} |
} |
|
|
# =============================================================== Notifications |
# =============================================================== Notifications |
Line 2036 sub handler {
|
Line 2068 sub handler {
|
$thisfn=~/\.(\w+)$/; |
$thisfn=~/\.(\w+)$/; |
my $thistype=$1; |
my $thistype=$1; |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype); |
|
if ($thistype eq 'page') { $thisembstyle = 'rat'; } |
$r->print('<h2>'.&mt('Publishing').' '. |
$r->print('<h2>'.&mt('Publishing').' '. |
&Apache::loncommon::filedescription($thistype).' <tt>'); |
&Apache::loncommon::filedescription($thistype).' <tt>'); |
|
|
Line 2077 ENDDIFF
|
Line 2110 ENDDIFF
|
'</h3>'); |
'</h3>'); |
} |
} |
} else { |
} else { |
$r->print('<hr />'. |
&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); |
&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); |
$r->print('<hr />'); |
} |
} |
} |
} |
$r->print('</body></html>'); |
$r->print('</body></html>'); |