version 1.168, 2004/05/21 20:01:15
|
version 1.192, 2005/04/07 06:56:27
|
Line 121 use HTML::LCParser;
|
Line 121 use HTML::LCParser;
|
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::lonmysql; |
use Apache::lonmysql; |
use Apache::lonlocal; |
use Apache::lonlocal; |
Line 138 my $docroot;
|
Line 138 my $docroot;
|
my $cuname; |
my $cuname; |
my $cudom; |
my $cudom; |
|
|
|
my $registered_cleanup; |
|
my $modified_urls; |
|
|
=pod |
=pod |
|
|
=item B<metaeval> |
=item B<metaeval> |
Line 199 sub metaeval {
|
Line 202 sub metaeval {
|
} |
} |
} |
} |
my $newentry=$parser->get_text('/'.$entry); |
my $newentry=$parser->get_text('/'.$entry); |
if ($entry eq 'customdistributionfile') { |
if (($entry eq 'customdistributionfile') || |
|
($entry eq 'sourcerights')) { |
$newentry=~s/^\s*//; |
$newentry=~s/^\s*//; |
if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; } |
if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; } |
} |
} |
Line 322 sub textfield {
|
Line 326 sub textfield {
|
$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<p><font color=\"#800000\" face=\"helvetica\"><b>$title:". |
"</b></font></p><br />". |
"</b></font></p><br />". |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'; |
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'; |
} |
} |
|
|
|
sub text_with_browse_field { |
|
my ($title,$name,$value,$restriction)=@_; |
|
$value=~s/^\s+//gs; |
|
$value=~s/\s+$//gs; |
|
$value=~s/\s+/ /gs; |
|
$title=&mt($title); |
|
$env{'form.'.$name}=$value; |
|
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:". |
|
"</b></font></p><br />". |
|
'<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'. |
|
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a> '. |
|
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>'; |
|
|
|
} |
|
|
sub hiddenfield { |
sub hiddenfield { |
my ($name,$value)=@_; |
my ($name,$value)=@_; |
$ENV{'form.'.$name}=$value; |
$env{'form.'.$name}=$value; |
return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />'; |
return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />'; |
} |
} |
|
|
Line 339 sub selectbox {
|
Line 358 sub selectbox {
|
$title=&mt($title); |
$title=&mt($title); |
$value=(split(/\s*,\s*/,$value))[-1]; |
$value=(split(/\s*,\s*/,$value))[-1]; |
if (defined($value)) { |
if (defined($value)) { |
$ENV{'form.'.$name}=$value; |
$env{'form.'.$name}=$value; |
} 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<p><font color=\"#800000\" face=\"helvetica\"><b>$title:". |
'</b></font></p><br /><select name="'.$name.'">'; |
'</b></font></p><br /><select name="'.$name.'">'; |
Line 357 sub selectbox {
|
Line 376 sub selectbox {
|
|
|
sub select_level_form { |
sub select_level_form { |
my ($value,$name)=@_; |
my ($value,$name)=@_; |
$ENV{'form.'.$name}=$value; |
$env{'form.'.$name}=$value; |
if (!defined($value)) { $ENV{'form.'.$name}=0; } |
if (!defined($value)) { $env{'form.'.$name}=0; } |
return &Apache::loncommon::select_level_form($value,$name); |
return &Apache::loncommon::select_level_form($value,$name); |
} |
} |
######################################### |
######################################### |
Line 471 sub get_subscribed_hosts {
|
Line 490 sub get_subscribed_hosts {
|
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
if ($filename=~/\Q$srcf\E\.(\w+)$/) { |
if ($filename=~/\Q$srcf\E\.(\w+)$/) { |
my $subhost=$1; |
my $subhost=$1; |
if (($subhost ne 'meta' && $subhost ne 'subscription') && |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
|
$subhost ne 'tmp') && |
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) { |
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) { |
push(@subscribed,$subhost); |
push(@subscribed,$subhost); |
} |
} |
Line 528 sub get_max_ids_indices {
|
Line 548 sub get_max_ids_indices {
|
my $counter; |
my $counter; |
if ($counter=$addid{$token->[1]}) { |
if ($counter=$addid{$token->[1]}) { |
if ($counter eq 'id') { |
if ($counter eq 'id') { |
if (defined($token->[2]->{'id'})) { |
if (defined($token->[2]->{'id'}) && |
|
$token->[2]->{'id'} !~ /^\s*$/) { |
$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid; |
$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid; |
if (exists($allids{$token->[2]->{'id'}})) { |
if (exists($allids{$token->[2]->{'id'}})) { |
$duplicateids=1; |
$duplicateids=1; |
Line 540 sub get_max_ids_indices {
|
Line 561 sub get_max_ids_indices {
|
$needsfixup=1; |
$needsfixup=1; |
} |
} |
} else { |
} else { |
if (defined($token->[2]->{'index'})) { |
if (defined($token->[2]->{'index'}) && |
|
$token->[2]->{'index'} !~ /^\s*$/) { |
$maxindex=($token->[2]->{'index'}>$maxindex)?$token->[2]->{'index'}:$maxindex; |
$maxindex=($token->[2]->{'index'}>$maxindex)?$token->[2]->{'index'}:$maxindex; |
} else { |
} else { |
$needsfixup=1; |
$needsfixup=1; |
Line 582 sub get_all_text_unbalanced {
|
Line 604 sub get_all_text_unbalanced {
|
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} |
} |
if ($result =~ /(.*)\Q$tag\E(.*)/s) { |
if ($result =~ /\Q$tag\E/s) { |
|
($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is; |
#&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2); |
#&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2); |
#&Apache::lonnet::logthis('Result is :'.$1); |
#&Apache::lonnet::logthis('Result is :'.$1); |
$result=$1; |
$redo=$tag.$redo; |
my $redo=$tag.$2; |
|
push (@$pars,HTML::LCParser->new(\$redo)); |
push (@$pars,HTML::LCParser->new(\$redo)); |
$$pars[-1]->xml_mode('1'); |
$$pars[-1]->xml_mode('1'); |
last; |
last; |
Line 654 sub fix_ids_and_indices {
|
Line 676 sub fix_ids_and_indices {
|
if (!$counter) { $counter=$addid{$lctag}; } |
if (!$counter) { $counter=$addid{$lctag}; } |
if ($counter) { |
if ($counter) { |
if ($counter eq 'id') { |
if ($counter eq 'id') { |
unless (defined($parms{'id'})) { |
unless (defined($parms{'id'}) && |
|
$parms{'id'}!~/^\s*$/) { |
$maxid++; |
$maxid++; |
$parms{'id'}=$maxid; |
$parms{'id'}=$maxid; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
} |
} |
} elsif ($counter eq 'index') { |
} elsif ($counter eq 'index') { |
unless (defined($parms{'index'})) { |
unless (defined($parms{'index'}) && |
|
$parms{'index'}!~/^\s*$/) { |
$maxindex++; |
$maxindex++; |
$parms{'index'}=$maxindex; |
$parms{'index'}=$maxindex; |
print $logfile 'Index: '.$tag.':'.$maxindex."\n"; |
print $logfile 'Index: '.$tag.':'.$maxindex."\n"; |
Line 801 sub store_metadata {
|
Line 825 sub store_metadata {
|
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
return ($error,undef); |
return ($error,undef); |
} |
} |
|
my $dbh = &Apache::lonmysql::get_dbh(); |
if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') || |
if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') || |
($metadata{'copyright'} eq 'custom')) { |
($metadata{'copyright'} eq 'custom')) { |
# remove this entry |
# remove this entry |
$status=&Apache::lonmysql::remove_from_table |
$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef, |
('metadata','url',$metadata{'url'}); |
$metadata{'url'}); |
} else { |
} else { |
# store new data |
$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef, |
# adjust some values to metadatadatabase (e.g., "usage" is a reserved word) |
\%metadata); |
$metadata{'creationdate'}= |
|
&Apache::lonmysql::sqltime($metadata{'creationdate'}); |
|
$metadata{'lastrevisiondate'}= |
|
&Apache::lonmysql::sqltime($metadata{'lastrevisiondate'}); |
|
$metadata{'sequsage'}=$metadata{'usage'}; |
|
$metadata{'sequsage_list'}=$metadata{'usage_list'}; |
|
my %newmetadata=(); |
|
# see if we have old entries |
|
my @oldmeta=&Apache::lonmysql::get_rows('metadata', |
|
"url LIKE BINARY '". |
|
$metadata{'url'}."'"); |
|
if ($#oldmeta==0) { |
|
# yes, there is one old entry, transfer to newmetadata |
|
%newmetadata=&LONCAPA::lonmetadata::metadata_col_to_hash(@{$oldmeta[0]}); |
|
# remove old entry |
|
$status=&Apache::lonmysql::remove_from_table |
|
('metadata','url',$metadata{'url'}); |
|
} elsif ($#oldmeta>0) { |
|
# more than one entry fit - how did that happen? |
|
$error='<font color="red">Error occured retrieving old values in '. |
|
'metadata table in LON-CAPA database: '.$#oldmeta. |
|
' matches</font>'; |
|
&Apache::lonnet::logthis($error); |
|
return ($error,undef); |
|
} |
|
# store new data on top of it |
|
foreach (keys %metadata) { |
|
$newmetadata{$_}=$metadata{$_}; |
|
} |
|
$status = &Apache::lonmysql::store_row('metadata',\%newmetadata); |
|
} |
} |
if (! defined($status)) { |
if (defined($status) && $status ne '') { |
$error='<font color="red">Error occured storing new values in '. |
$error='<font color="red">Error occured storing new values in '. |
'metadata table in LON-CAPA database</font>'; |
'metadata table in LON-CAPA database</font>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
|
&Apache::lonnet::logthis($status); |
return ($error,undef); |
return ($error,undef); |
} |
} |
return (undef,$status); |
return (undef,$status); |
} |
} |
|
|
|
|
|
# ========================================== Parse file for errors and warnings |
|
|
|
sub checkonthis { |
|
my ($r,$source)=@_; |
|
my $uri=&Apache::lonnet::hreflocation($source); |
|
$uri=~s/\/$//; |
|
my $result=&Apache::lonnet::ssi_body($uri, |
|
('grade_target'=>'web', |
|
'return_only_error_and_warning_counts' => 1)); |
|
my ($errorcount,$warningcount)=split(':',$result); |
|
if (($errorcount) || ($warningcount)) { |
|
$r->print('<br /><tt>'.$uri.'</tt>: '); |
|
if ($errorcount) { |
|
$r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. |
|
$errorcount.' '. |
|
&mt('error(s)').'</b></font> '); |
|
} |
|
if ($warningcount) { |
|
$r->print('<font color="blue">'. |
|
$warningcount.' '. |
|
&mt('warning(s)').'</font>'); |
|
} |
|
} else { |
|
#$r->print('<font color="green">'.&mt('ok').'</font>'); |
|
} |
|
$r->rflush(); |
|
return ($warningcount,$errorcount); |
|
} |
|
|
# ============================================== Parse file itself for metadata |
# ============================================== Parse file itself for metadata |
# |
# |
# parses a file with target meta, sets global %metadatafields %metadatakeys |
# parses a file with target meta, sets global %metadatafields %metadatakeys |
Line 903 sub publish {
|
Line 928 sub publish {
|
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1); |
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',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"; |
|
|
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) { |
# ------------------------------------------------------- This needs processing |
# ------------------------------------------------------- This needs processing |
Line 956 sub publish {
|
Line 981 sub publish {
|
} |
} |
} |
} |
} |
} |
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s; |
$outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s; |
|
|
# ------------------------------------------------------------- Write modified. |
# ------------------------------------------------------------- Write modified. |
|
|
Line 991 sub publish {
|
Line 1016 sub publish {
|
|
|
# ------------------------------------------------ First, check out environment |
# ------------------------------------------------ First, check out environment |
unless (-e $source.'.meta') { |
unless (-e $source.'.meta') { |
$metadatafields{'author'}=$ENV{'environment.firstname'}.' '. |
$metadatafields{'author'}=$env{'environment.firstname'}.' '. |
$ENV{'environment.middlename'}.' '. |
$env{'environment.middlename'}.' '. |
$ENV{'environment.lastname'}.' '. |
$env{'environment.lastname'}.' '. |
$ENV{'environment.generation'}; |
$env{'environment.generation'}; |
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+/ /g; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'author'}=~s/\s+$//; |
$metadatafields{'owner'}=$cuname.'@'.$cudom; |
$metadatafields{'owner'}=$cuname.'@'.$cudom; |
Line 1015 sub publish {
|
Line 1040 sub publish {
|
$scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix); |
$scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix); |
$prefix=~s|^\.\./||; |
$prefix=~s|^\.\./||; |
} |
} |
|
|
# ----------------------------------------------------------- Parse file itself |
# ----------------------------------------------------------- Parse file itself |
# read %metadatafields from file itself |
# read %metadatafields from file itself |
|
|
Line 1115 sub publish {
|
Line 1141 sub publish {
|
# interactive mode html goes into $intr_scrout |
# interactive mode html goes into $intr_scrout |
# batch mode throws away this HTML |
# batch mode throws away this HTML |
# additionally all of the field functions have a by product of setting |
# additionally all of the field functions have a by product of setting |
# $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.= |
'<form name="pubform" action="/adm/publish" method="post">'. |
'<form name="pubform" action="/adm/publish" method="post">'. |
'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'. |
'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'. |
&hiddenfield('phase','two'). |
&hiddenfield('phase','two'). |
&hiddenfield('filename',$ENV{'form.filename'}). |
&hiddenfield('filename',$env{'form.filename'}). |
&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)). |
&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)). |
&hiddenfield('dependencies',join(',',keys %allow)). |
&hiddenfield('dependencies',join(',',keys %allow)). |
&textfield('Title','title',$metadatafields{'title'}). |
&textfield('Title','title',$metadatafields{'title'}). |
Line 1158 END
|
Line 1184 END
|
my $colcount=0; |
my $colcount=0; |
|
|
foreach (sort keys %keywords) { |
foreach (sort keys %keywords) { |
$keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"'; |
$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"'; |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}) { |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
if ($metadatafields{'keywords'}=~/\Q$_\E/) { |
$keywordout.=' checked="on"'; |
$keywordout.=' checked="on"'; |
$ENV{'form.keywords'}.=$_.','; |
$env{'form.keywords'}.=$_.','; |
} |
} |
} elsif (&Apache::loncommon::keyword($_)) { |
} elsif (&Apache::loncommon::keyword($_)) { |
$keywordout.=' checked="on"'; |
$keywordout.=' checked="on"'; |
$ENV{'form.keywords'}.=$_.','; |
$env{'form.keywords'}.=$_.','; |
} |
} |
$keywordout.=' />'.$_.'</td>'; |
$keywordout.=' />'.$_.'</label></td>'; |
if ($colcount>10) { |
if ($colcount>10) { |
$keywordout.="</tr><tr>\n"; |
$keywordout.="</tr><tr>\n"; |
$colcount=0; |
$colcount=0; |
} |
} |
$colcount++; |
$colcount++; |
} |
} |
$ENV{'form.keywords'}=~s/\,$//; |
$env{'form.keywords'}=~s/\,$//; |
|
|
$keywordout.='</tr></table>'; |
$keywordout.='</tr></table>'; |
|
|
Line 1233 END
|
Line 1259 END
|
$intr_scrout.=&textfield('Publisher/Owner','owner', |
$intr_scrout.=&textfield('Publisher/Owner','owner', |
$metadatafields{'owner'}); |
$metadatafields{'owner'}); |
|
|
# -------------------------------------------------- Correct copyright for rat. |
# ---------------------------------------------- Retrofix for unused copyright |
|
if ($metadatafields{'copyright'} eq 'free') { |
|
$metadatafields{'copyright'}='default'; |
|
$metadatafields{'sourceavail'}='open'; |
|
} |
|
# ------------------------------------------------ Dial in reasonable defaults |
my $defaultoption=$metadatafields{'copyright'}; |
my $defaultoption=$metadatafields{'copyright'}; |
unless ($defaultoption) { $defaultoption='default'; } |
unless ($defaultoption) { $defaultoption='default'; } |
|
my $defaultsourceoption=$metadatafields{'sourceavail'}; |
|
unless ($defaultsourceoption) { $defaultsourceoption='closed'; } |
unless ($style eq 'prv') { |
unless ($style eq 'prv') { |
|
# -------------------------------------------------- Correct copyright for rat. |
if ($style eq 'rat') { |
if ($style eq 'rat') { |
|
# -------------------------------------- Retrofix for non-applicable copyright |
if ($metadatafields{'copyright'} eq 'public') { |
if ($metadatafields{'copyright'} eq 'public') { |
delete $metadatafields{'copyright'}; |
delete $metadatafields{'copyright'}; |
$defaultoption='default'; |
$defaultoption='default'; |
Line 1246 END
|
Line 1281 END
|
$defaultoption, |
$defaultoption, |
\&Apache::loncommon::copyrightdescription, |
\&Apache::loncommon::copyrightdescription, |
(grep !/^public$/,(&Apache::loncommon::copyrightids))); |
(grep !/^public$/,(&Apache::loncommon::copyrightids))); |
} else { |
|
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
|
$defaultoption, |
|
\&Apache::loncommon::copyrightdescription, |
|
(&Apache::loncommon::copyrightids)); |
|
} |
|
|
|
my $copyright_help = |
|
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
|
$intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge; |
|
$intr_scrout.=&textfield('Custom Distribution File','customdistributionfile', |
|
$metadatafields{'customdistributionfile'}). |
|
$copyright_help; |
|
my $uctitle=&mt('Obsolete'); |
|
$intr_scrout.= |
|
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
|
'</b></font> <input type="checkbox" name="obsolete" '; |
|
if ($metadatafields{'obsolete'}) { |
|
$intr_scrout.=' checked="1" '; |
|
} |
|
$intr_scrout.='/ ></p>'. |
|
&textfield('Suggested Replacement for Obsolete File', |
|
'obsoletereplacement', |
|
$metadatafields{'obsoletereplacement'}); |
|
} else { |
} else { |
$intr_scrout.=&hiddenfield('copyright','private'); |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
|
$defaultoption, |
|
\&Apache::loncommon::copyrightdescription, |
|
(&Apache::loncommon::copyrightids)); |
} |
} |
|
my $copyright_help = |
|
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
|
$intr_scrout =~ s/Distribution:/'Distribution: ' . $copyright_help/ge; |
|
$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help; |
|
$intr_scrout.=&selectbox('Source Distribution','sourceavail', |
|
$defaultsourceoption, |
|
\&Apache::loncommon::source_copyrightdescription, |
|
(&Apache::loncommon::source_copyrightids)); |
|
$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
|
my $uctitle=&mt('Obsolete'); |
|
$intr_scrout.= |
|
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
|
'</b></font> <input type="checkbox" name="obsolete" '; |
|
if ($metadatafields{'obsolete'}) { |
|
$intr_scrout.=' checked="1" '; |
|
} |
|
$intr_scrout.='/ ></p>'. |
|
&text_with_browse_field('Suggested Replacement for Obsolete File', |
|
'obsoletereplacement', |
|
$metadatafields{'obsoletereplacement'}); |
|
} else { |
|
$intr_scrout.=&hiddenfield('copyright','private'); |
|
} |
if (!$batch) { |
if (!$batch) { |
$scrout.=$intr_scrout.'<p><input type="submit" value="'. |
$scrout.=$intr_scrout.'<p><input type="submit" value="'. |
&mt('Finalize Publication').'" /></p></form>'; |
&mt('Finalize Publication').'" /></p></form>'; |
Line 1339 sub phasetwo {
|
Line 1376 sub phasetwo {
|
return 0; |
return 0; |
} |
} |
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"; |
|
|
%metadatafields=(); |
%metadatafields=(); |
%metadatakeys=(); |
%metadatakeys=(); |
|
|
&metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'})); |
&metaeval(&Apache::lonnet::unescape($env{'form.allmeta'})); |
|
|
$metadatafields{'title'}=$ENV{'form.title'}; |
$metadatafields{'title'}=$env{'form.title'}; |
$metadatafields{'author'}=$ENV{'form.author'}; |
$metadatafields{'author'}=$env{'form.author'}; |
$metadatafields{'subject'}=$ENV{'form.subject'}; |
$metadatafields{'subject'}=$env{'form.subject'}; |
$metadatafields{'notes'}=$ENV{'form.notes'}; |
$metadatafields{'notes'}=$env{'form.notes'}; |
$metadatafields{'abstract'}=$ENV{'form.abstract'}; |
$metadatafields{'abstract'}=$env{'form.abstract'}; |
$metadatafields{'mime'}=$ENV{'form.mime'}; |
$metadatafields{'mime'}=$env{'form.mime'}; |
$metadatafields{'language'}=$ENV{'form.language'}; |
$metadatafields{'language'}=$env{'form.language'}; |
$metadatafields{'creationdate'}=$ENV{'form.creationdate'}; |
$metadatafields{'creationdate'}=$env{'form.creationdate'}; |
$metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'}; |
$metadatafields{'lastrevisiondate'}=$env{'form.lastrevisiondate'}; |
$metadatafields{'owner'}=$ENV{'form.owner'}; |
$metadatafields{'owner'}=$env{'form.owner'}; |
$metadatafields{'copyright'}=$ENV{'form.copyright'}; |
$metadatafields{'copyright'}=$env{'form.copyright'}; |
$metadatafields{'standards'}=$ENV{'form.standards'}; |
$metadatafields{'standards'}=$env{'form.standards'}; |
$metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'}; |
$metadatafields{'lowestgradelevel'}=$env{'form.lowestgradelevel'}; |
$metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'}; |
$metadatafields{'highestgradelevel'}=$env{'form.highestgradelevel'}; |
$metadatafields{'customdistributionfile'}= |
$metadatafields{'customdistributionfile'}= |
$ENV{'form.customdistributionfile'}; |
$env{'form.customdistributionfile'}; |
$metadatafields{'obsolete'}=$ENV{'form.obsolete'}; |
$metadatafields{'sourceavail'}=$env{'form.sourceavail'}; |
|
$metadatafields{'obsolete'}=$env{'form.obsolete'}; |
$metadatafields{'obsoletereplacement'}= |
$metadatafields{'obsoletereplacement'}= |
$ENV{'form.obsoletereplacement'}; |
$env{'form.obsoletereplacement'}; |
$metadatafields{'dependencies'}=$ENV{'form.dependencies'}; |
$metadatafields{'dependencies'}=$env{'form.dependencies'}; |
$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'. |
$metadatafields{'modifyinguser'}=$env{'user.name'}.'@'. |
$ENV{'user.domain'}; |
$env{'user.domain'}; |
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
$metadatafields{'authorspace'}=$cuname.'@'.$cudom; |
|
|
my $allkeywords=$ENV{'form.addkey'}; |
my $allkeywords=$env{'form.addkey'}; |
if (exists($ENV{'form.keywords'})) { |
if (exists($env{'form.keywords'})) { |
if (ref($ENV{'form.keywords'})) { |
if (ref($env{'form.keywords'})) { |
$allkeywords .= ','.join(',',@{$ENV{'form.keywords'}}); |
$allkeywords .= ','.join(',',@{$env{'form.keywords'}}); |
} else { |
} else { |
$allkeywords .= ','.$ENV{'form.keywords'}; |
$allkeywords .= ','.$env{'form.keywords'}; |
} |
} |
} |
} |
$allkeywords=~s/[\;\,]/\,/; |
|
$allkeywords=~s/[\"\']//g; |
$allkeywords=~s/[\"\']//g; |
|
$allkeywords=~s/\s*[\;\,]\s*/\,/g; |
$allkeywords=~s/\s+/ /g; |
$allkeywords=~s/\s+/ /g; |
$allkeywords=~s/^[ \,]//; |
$allkeywords=~s/^[ \,]//; |
$allkeywords=~s/[ \,]$//; |
$allkeywords=~s/[ \,]$//; |
Line 1540 sub phasetwo {
|
Line 1578 sub phasetwo {
|
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>"; |
"<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>"; |
} |
} |
$r->rflush; |
$r->rflush; |
# --------------------------------------------------- Send update notifications |
|
|
|
my @subscribed=&get_subscribed_hosts($target); |
|
foreach my $subhost (@subscribed) { |
|
$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush; |
|
print $logfile "\nNotifying host ".$subhost.':'; |
|
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); |
|
$r->print($reply.'</p><br />');$r->rflush; |
|
print $logfile $reply; |
|
} |
|
|
|
# ---------------------------------------- Send update notifications, meta only |
|
|
|
my @subscribedmeta=&get_subscribed_hosts("$target.meta"); |
# ------------------------------------------------------------- Trigger updates |
foreach my $subhost (@subscribedmeta) { |
push(@{$modified_urls},[$target,$source]); |
$r->print('<p>'. |
unless ($registered_cleanup) { |
&mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush; |
$r->register_cleanup(\¬ify); |
print $logfile "\nNotifying host for metadata only ".$subhost.':'; |
$registered_cleanup=1; |
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta', |
|
$subhost); |
|
$r->print($reply.'</p><br />');$r->rflush; |
|
print $logfile $reply; |
|
} |
|
|
|
# --------------------------------------------------- Notify subscribed courses |
|
my %courses=&coursedependencies($target); |
|
my $now=time; |
|
foreach (keys %courses) { |
|
$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush; |
|
print $logfile "\nNotifying host ".$_.':'; |
|
my ($cdom,$cname)=split(/\_/,$_); |
|
my $reply=&Apache::lonnet::cput |
|
('versionupdate',{$target => $now},$cdom,$cname); |
|
$r->print($reply.'</p><br />');$r->rflush; |
|
print $logfile $reply; |
|
} |
} |
# ------------------------------------------------ Provide link to new resource |
# ------------------------------------------------ Provide link to new resource |
unless ($batch) { |
unless ($batch) { |
Line 1597 sub phasetwo {
|
Line 1606 sub phasetwo {
|
'"><font size="+2">'. |
'"><font size="+2">'. |
&mt('Back to Source Directory').'</font></a></p>'); |
&mt('Back to Source Directory').'</font></a></p>'); |
} |
} |
|
$logfile->close(); |
return '<p><font color="green">'.&mt('Done').'</font></p>'; |
return '<p><font color="green">'.&mt('Done').'</font></p>'; |
} |
} |
|
|
|
# =============================================================== Notifications |
|
sub notify { |
|
# --------------------------------------------------- Send update notifications |
|
foreach my $targetsource (@{$modified_urls}){ |
|
my ($target,$source)=@{$targetsource}; |
|
my $logfile=Apache::File->new('>>'.$source.'.log'); |
|
print $logfile "\nCleanup phase: Notifications\n"; |
|
my @subscribed=&get_subscribed_hosts($target); |
|
foreach my $subhost (@subscribed) { |
|
print $logfile "\nNotifying host ".$subhost.':'; |
|
my $reply=&Apache::lonnet::critical('update:'.$target,$subhost); |
|
print $logfile $reply; |
|
} |
|
# ---------------------------------------- Send update notifications, meta only |
|
my @subscribedmeta=&get_subscribed_hosts("$target.meta"); |
|
foreach my $subhost (@subscribedmeta) { |
|
print $logfile "\nNotifying host for metadata only ".$subhost.':'; |
|
my $reply=&Apache::lonnet::critical('update:'.$target.'.meta', |
|
$subhost); |
|
print $logfile $reply; |
|
} |
|
# --------------------------------------------------- Notify subscribed courses |
|
my %courses=&coursedependencies($target); |
|
my $now=time; |
|
foreach (keys %courses) { |
|
print $logfile "\nNotifying course ".$_.':'; |
|
my ($cdom,$cname)=split(/\_/,$_); |
|
my $reply=&Apache::lonnet::cput |
|
('versionupdate',{$target => $now},$cdom,$cname); |
|
print $logfile $reply; |
|
} |
|
print $logfile "\n============ Done ============\n"; |
|
$logfile->close(); |
|
} |
|
return OK; |
|
} |
|
|
######################################### |
######################################### |
|
|
sub batchpublish { |
sub batchpublish { |
my ($r,$srcfile,$targetfile)=@_; |
my ($r,$srcfile,$targetfile)=@_; |
#publication pollutes %ENV with form.* values |
#publication pollutes %env with form.* values |
my %oldENV=%ENV; |
my %oldenv=%env; |
$srcfile=~s/\/+/\//g; |
$srcfile=~s/\/+/\//g; |
$targetfile=~s/\/+/\//g; |
$targetfile=~s/\/+/\//g; |
my $thisdisfn=$srcfile; |
my $thisdisfn=$srcfile; |
Line 1633 sub batchpublish {
|
Line 1680 sub batchpublish {
|
$r->print('<p>'.$outstring.'</p>'); |
$r->print('<p>'.$outstring.'</p>'); |
# phase two takes |
# phase two takes |
# my ($source,$target,$style,$distarget,batch)=@_; |
# my ($source,$target,$style,$distarget,batch)=@_; |
# $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},... |
# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},... |
if (!$error) { |
if (!$error) { |
$r->print('<p>'); |
$r->print('<p>'); |
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1); |
&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1); |
$r->print('</p>'); |
$r->print('</p>'); |
} |
} |
%ENV=%oldENV; |
%env=%oldenv; |
return ''; |
return ''; |
} |
} |
|
|
Line 1668 sub publishdirectory {
|
Line 1715 sub publishdirectory {
|
my $extension=''; |
my $extension=''; |
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
if ($cmode&$dirptr) { |
if ($cmode&$dirptr) { |
if (($filename!~/^\./) && ($ENV{'form.pubrec'})) { |
if (($filename!~/^\./) && ($env{'form.pubrec'})) { |
&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
} |
} |
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
Line 1680 sub publishdirectory {
|
Line 1727 sub publishdirectory {
|
$ruid,$rgid,$rrdev,$rsize, |
$ruid,$rgid,$rrdev,$rsize, |
$ratime,$rmtime,$rctime, |
$ratime,$rmtime,$rctime, |
$rblksize,$rblocks)=stat($resdir.'/'.$filename); |
$rblksize,$rblocks)=stat($resdir.'/'.$filename); |
if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) { |
if (($rmtime<$cmtime) || ($env{'form.forcerepub'} eq 'ON')) { |
# previously published, modified now |
# previously published, modified now |
$publishthis=1; |
$publishthis=1; |
} |
} |
Line 1809 sub handler {
|
Line 1856 sub handler {
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['filename']); |
['filename']); |
|
|
|
# -------------------------------------- Flag and buffer for registered cleanup |
|
$registered_cleanup=0; |
|
@{$modified_urls}=(); |
# -------------------------------------------------------------- Check filename |
# -------------------------------------------------------------- Check filename |
|
|
my $fn=&Apache::lonnet::unescape($ENV{'form.filename'}); |
my $fn=&Apache::lonnet::unescape($env{'form.filename'}); |
|
|
($cuname,$cudom)= |
($cuname,$cudom)= |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
Line 1830 sub handler {
|
Line 1880 sub handler {
|
|
|
unless (($cuname) && ($cudom)) { |
unless (($cuname) && ($cudom)) { |
$r->log_reason($cuname.' at '.$cudom. |
$r->log_reason($cuname.' at '.$cudom. |
' trying to publish file '.$ENV{'form.filename'}. |
' trying to publish file '.$env{'form.filename'}. |
' ('.$fn.') - not authorized', |
' ('.$fn.') - not authorized', |
$r->filename); |
$r->filename); |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
Line 1842 sub handler {
|
Line 1892 sub handler {
|
foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; } } |
unless ($allowed) { |
unless ($allowed) { |
$r->log_reason($cuname.' at '.$cudom. |
$r->log_reason($cuname.' at '.$cudom. |
' trying to publish file '.$ENV{'form.filename'}. |
' trying to publish file '.$env{'form.filename'}. |
' ('.$fn.') - not homeserver ('.$home.')', |
' ('.$fn.') - not homeserver ('.$home.')', |
$r->filename); |
$r->filename); |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
Line 1856 sub handler {
|
Line 1906 sub handler {
|
if ($1 ne $cuname) { |
if ($1 ne $cuname) { |
$r->log_reason($cuname.' at '.$cudom. |
$r->log_reason($cuname.' at '.$cudom. |
' trying to publish unowned file '. |
' trying to publish unowned file '. |
$ENV{'form.filename'}.' ('.$fn.')', |
$env{'form.filename'}.' ('.$fn.')', |
$r->filename); |
$r->filename); |
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} else { |
} else { |
Line 1867 sub handler {
|
Line 1917 sub handler {
|
unless (-e $fn) { |
unless (-e $fn) { |
$r->log_reason($cuname.' at '.$cudom. |
$r->log_reason($cuname.' at '.$cudom. |
' trying to publish non-existing file '. |
' trying to publish non-existing file '. |
$ENV{'form.filename'}.' ('.$fn.')', |
$env{'form.filename'}.' ('.$fn.')', |
$r->filename); |
$r->filename); |
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless ($ENV{'form.phase'} eq 'two') { |
unless ($env{'form.phase'} eq 'two') { |
|
|
# -------------------------------- File is there and owned, init lookup tables. |
# -------------------------------- File is there and owned, init lookup tables. |
|
|
Line 1902 sub handler {
|
Line 1952 sub handler {
|
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
$r->print('<html><head><title>LON-CAPA Publishing</title></head>'); |
my $js=&Apache::loncommon::browser_and_searcher_javascript(); |
|
$r->print('<html><head><title>LON-CAPA Publishing</title> |
|
<script type="text/javascript">'.$js.' |
|
</script></head>'); |
$r->print(&Apache::loncommon::bodytag('Resource Publication')); |
$r->print(&Apache::loncommon::bodytag('Resource Publication')); |
|
|
|
|
Line 1943 ENDCAPTION
|
Line 1996 ENDCAPTION
|
$r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'. |
$r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'. |
$thisdistarget.'</tt><br />'); |
$thisdistarget.'</tt><br />'); |
|
|
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('<h3><font color="red">'.&mt('Co-Author').': '. |
$cuname.&mt(' at ').$cudom.'</font></h3>'); |
$cuname.&mt(' at ').$cudom.'</font></h3>'); |
} |
} |
Line 1958 ENDDIFF
|
Line 2011 ENDDIFF
|
|
|
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle. |
|
|
unless ($ENV{'form.phase'} eq 'two') { |
unless ($env{'form.phase'} eq 'two') { |
my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle); |
# ---------------------------------------------------------- Parse for problems |
$r->print('<hr />'.$outstring); |
my ($warningcount,$errorcount); |
|
if ($thisembstyle eq 'ssi') { |
|
($warningcount,$errorcount)=&checkonthis($r,$thisfn); |
|
} |
|
unless ($errorcount) { |
|
my ($outstring,$error)= |
|
&publish($thisfn,$thistarget,$thisembstyle); |
|
$r->print('<hr />'.$outstring); |
|
} else { |
|
$r->print('<h3>'. |
|
&mt('The document contains errors and cannot be published.'). |
|
'</h3>'); |
|
} |
} else { |
} else { |
$r->print('<hr />'. |
$r->print('<hr />'. |
&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); |
&phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); |