version 1.194, 2005/05/19 03:22:04
|
version 1.197, 2005/05/30 17:10:44
|
Line 1020 sub publish {
|
Line 1020 sub publish {
|
} |
} |
|
|
# ------------------------------------------------ First, check out environment |
# ------------------------------------------------ First, check out environment |
unless (-e $source.'.meta') { |
if ((!(-e $source.'.meta')) || ($env{'form.forceoverride'})) { |
$metadatafields{'author'}=$env{'environment.firstname'}.' '. |
$metadatafields{'author'}=$env{'environment.firstname'}.' '. |
$env{'environment.middlename'}.' '. |
$env{'environment.middlename'}.' '. |
$env{'environment.lastname'}.' '. |
$env{'environment.lastname'}.' '. |
Line 1070 sub publish {
|
Line 1070 sub publish {
|
delete $metadatafields{$_}; |
delete $metadatafields{$_}; |
} |
} |
} |
} |
|
# ------------------------------------------------------------- Save some stuff |
|
my %savemeta=(); |
|
foreach ('title') { |
|
$savemeta{$_}=$metadatafields{$_}; |
|
} |
# ------------------------------------------ See if anything new in file itself |
# ------------------------------------------ See if anything new in file itself |
|
|
$allmeta=&parseformeta($source,$style); |
$allmeta=&parseformeta($source,$style); |
|
# ----------------------------------------------------------- Restore the stuff |
|
foreach (keys %savemeta) { |
|
$metadatafields{$_}=$savemeta{$_}; |
|
} |
} |
} |
|
|
|
|
Line 1335 END
|
Line 1343 END
|
&hiddenfield('copyright',$metadatafields{'copyright'}). |
&hiddenfield('copyright',$metadatafields{'copyright'}). |
&hiddenfield('sourceavail',$metadatafields{'sourceavail'}). |
&hiddenfield('sourceavail',$metadatafields{'sourceavail'}). |
&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}). |
&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}). |
|
&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'}); |
Line 1374 Returns:
|
Line 1383 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 1389 sub phasetwo {
|
Line 1398 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 1456 sub phasetwo {
|
Line 1481 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 1518 sub phasetwo {
|
Line 1545 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 1543 sub phasetwo {
|
Line 1572 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 1557 sub phasetwo {
|
Line 1587 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 1590 sub phasetwo {
|
Line 1621 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 1603 sub phasetwo {
|
Line 1635 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 1636 sub phasetwo {
|
Line 1669 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 1739 sub publishdirectory {
|
Line 1773 sub publishdirectory {
|
&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('forceobsolete','make file(s) obsolete')); |
&checkbox('forceobsolete','make file(s) obsolete'). |
my %allcopyrights=('keep','Keep current copyright'); |
&checkbox('forceoverride','force directory level catalog information over existing'). |
my %ratcopyrights=%allcopyrights; |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
foreach (&Apache::loncommon::copyrightids) { |
|
$allcopyrights{$_}=&Apache::loncommon::copyrightdescription($_); |
|
unless ($_ eq 'public') { $ratcopyrights{$_}=$allcopyrights{$_}; } |
|
} |
|
$r->print('<br >'.&mt('Copyright for all files:').&Apache::loncommon::select_form('keep','forceallcopy',%allcopyrights)); |
|
$r->print('<br >'.&mt('Copyright for pages/sequences:').&Apache::loncommon::select_form('keep','forceratcopy',%ratcopyrights)); |
|
$r->print(&text_with_browse_field('Custom Distribution File','forcecustomfile')); |
|
$r->print('<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
|
} else { |
} else { |
# actually publish things |
# actually publish things |
opendir(DIR,$fn); |
opendir(DIR,$fn); |
Line 2076 ENDDIFF
|
Line 2102 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>'); |