version 1.192, 2005/04/07 06:56:27
|
version 1.235, 2008/05/17 12:08:45
|
Line 129 use Apache::loncfile;
|
Line 129 use Apache::loncfile;
|
use LONCAPA::lonmetadata; |
use LONCAPA::lonmetadata; |
use Apache::lonmsg; |
use Apache::lonmsg; |
use vars qw(%metadatafields %metadatakeys); |
use vars qw(%metadatafields %metadatakeys); |
|
use LONCAPA qw(:DEFAULT :match); |
|
|
|
|
my %addid; |
my %addid; |
my %nokey; |
my %nokey; |
Line 141 my $cudom;
|
Line 143 my $cudom;
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
|
|
|
my $lock; |
|
|
=pod |
=pod |
|
|
=item B<metaeval> |
=item B<metaeval> |
Line 181 sub metaeval {
|
Line 185 sub metaeval {
|
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $entry=$token->[1]; |
my $entry=$token->[1]; |
my $unikey=$entry; |
my $unikey=$entry; |
|
next if ($entry =~ m/^(?:parameter|stores)_/); |
if (defined($token->[2]->{'package'})) { |
if (defined($token->[2]->{'package'})) { |
$unikey.='_package_'.$token->[2]->{'package'}; |
$unikey.="\0package\0".$token->[2]->{'package'}; |
} |
} |
if (defined($token->[2]->{'part'})) { |
if (defined($token->[2]->{'part'})) { |
$unikey.='_'.$token->[2]->{'part'}; |
$unikey.="\0".$token->[2]->{'part'}; |
} |
} |
if (defined($token->[2]->{'id'})) { |
if (defined($token->[2]->{'id'})) { |
$unikey.='_'.$token->[2]->{'id'}; |
$unikey.="\0".$token->[2]->{'id'}; |
} |
} |
if (defined($token->[2]->{'name'})) { |
if (defined($token->[2]->{'name'})) { |
$unikey.='_'.$token->[2]->{'name'}; |
$unikey.="\0".$token->[2]->{'name'}; |
} |
} |
foreach (@{$token->[3]}) { |
foreach (@{$token->[3]}) { |
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_}; |
$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_}; |
Line 278 sub metaread {
|
Line 283 sub metaread {
|
sub coursedependencies { |
sub coursedependencies { |
my $url=&Apache::lonnet::declutter(shift); |
my $url=&Apache::lonnet::declutter(shift); |
$url=~s/\.meta$//; |
$url=~s/\.meta$//; |
my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//); |
my ($adomain,$aauthor)=($url=~ m{^($match_domain)/($match_username)/}); |
my $regexp=$url; |
my $regexp=quotemeta($url); |
$regexp=~s/(\W)/\\$1/g; |
|
$regexp='___'.$regexp.'___course'; |
$regexp='___'.$regexp.'___course'; |
my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain, |
my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain, |
$aauthor,$regexp); |
$aauthor,$regexp); |
Line 342 sub text_with_browse_field {
|
Line 346 sub text_with_browse_field {
|
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.'" />'. |
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a> '. |
'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'.&mt('Select').'</a> '. |
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>'; |
'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'.&mt('Search').'</a>'; |
|
|
} |
} |
|
|
Line 353 sub hiddenfield {
|
Line 357 sub hiddenfield {
|
return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />'; |
return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />'; |
} |
} |
|
|
|
sub checkbox { |
|
my ($name,$text)=@_; |
|
return "\n<br /><label><input type='checkbox' name='$name' /> ". |
|
&mt($text)."</label>"; |
|
} |
|
|
sub selectbox { |
sub selectbox { |
my ($title,$name,$value,$functionref,@idlist)=@_; |
my ($title,$name,$value,$functionref,@idlist)=@_; |
$title=&mt($title); |
$title=&mt($title); |
Line 401 sub urlfixup {
|
Line 411 sub urlfixup {
|
if ($url =~ /^mailto:/i) { return $url; } |
if ($url =~ /^mailto:/i) { return $url; } |
#internal document links need no fixing |
#internal document links need no fixing |
if ($url =~ /^\#/) { return $url; } |
if ($url =~ /^\#/) { return $url; } |
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); |
my ($host)=($url=~m{(?:(?:http|https|ftp)://)*([^/]+)}); |
foreach (values %Apache::lonnet::hostname) { |
my @lonids = &Apache::lonnet::machine_ids($host); |
if ($_ eq $host) { |
if (@lonids) { |
$url=~s/^http\:\/\///; |
$url=~s{^(?:http|https|ftp)://}{}; |
$url=~s/^$host//; |
$url=~s/^\Q$host\E//; |
} |
|
} |
} |
if ($url=~/^http\:\/\//) { return $url; } |
if ($url=~m{^(?:http|https|ftp)://}) { return $url; } |
$url=~s/\~$cuname/res\/$cudom\/$cuname/; |
$url=~s{\Q~$cuname\E}{res/$cudom/$cuname}; |
return $url; |
return $url; |
} |
} |
|
|
Line 460 sub set_allow {
|
Line 469 sub set_allow {
|
} |
} |
if (($newurl !~ /^javascript:/i) && |
if (($newurl !~ /^javascript:/i) && |
($newurl !~ /^mailto:/i) && |
($newurl !~ /^mailto:/i) && |
($newurl !~ /^http:/i) && |
($newurl !~ /^(?:http|https|ftp):/i) && |
($newurl !~ /^\#/)) { |
($newurl !~ /^\#/)) { |
$$allow{&absoluteurl($newurl,$target)}=1; |
$$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
return $return_url |
return $return_url; |
} |
} |
|
|
######################################### |
######################################### |
Line 487 sub get_subscribed_hosts {
|
Line 496 sub get_subscribed_hosts {
|
$target=~/(.*)\/([^\/]+)$/; |
$target=~/(.*)\/([^\/]+)$/; |
my $srcf=$2; |
my $srcf=$2; |
opendir(DIR,$1); |
opendir(DIR,$1); |
|
# cycle through listed files, subscriptions used to exist |
|
# as "filename.lonid" |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
if ($filename=~/\Q$srcf\E\.(\w+)$/) { |
if ($filename=~/\Q$srcf\E\.($match_lonid)$/) { |
my $subhost=$1; |
my $subhost=$1; |
if (($subhost ne 'meta' && $subhost ne 'subscription' && |
if (($subhost ne 'meta' |
$subhost ne 'tmp') && |
&& $subhost ne 'subscription' |
|
&& $subhost ne 'meta.subscription' |
|
&& $subhost ne 'tmp') && |
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) { |
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) { |
push(@subscribed,$subhost); |
push(@subscribed,$subhost); |
} |
} |
Line 500 sub get_subscribed_hosts {
|
Line 513 sub get_subscribed_hosts {
|
closedir(DIR); |
closedir(DIR); |
my $sh; |
my $sh; |
if ( $sh=Apache::File->new("$target.subscription") ) { |
if ( $sh=Apache::File->new("$target.subscription") ) { |
&Apache::lonnet::logthis("opened $target.subscription"); |
|
while (my $subline=<$sh>) { |
while (my $subline=<$sh>) { |
&Apache::lonnet::logthis("Trying $subline"); |
if ($subline =~ /^($match_lonid):/) { |
if ($subline =~ /(^\w+):/) { |
|
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { |
push(@subscribed,$1); |
push(@subscribed,$1); |
} |
} |
} else { |
|
&Apache::lonnet::logthis("No Match for $subline"); |
|
} |
} |
} |
} |
} else { |
|
&Apache::lonnet::logthis("Unable to open $target.subscription"); |
|
} |
} |
return @subscribed; |
return @subscribed; |
} |
} |
Line 542 sub get_max_ids_indices {
|
Line 549 sub get_max_ids_indices {
|
my %duplicatedids; |
my %duplicatedids; |
|
|
my $parser=HTML::LCParser->new($content); |
my $parser=HTML::LCParser->new($content); |
|
$parser->xml_mode(1); |
my $token; |
my $token; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
Line 648 sub fix_ids_and_indices {
|
Line 656 sub fix_ids_and_indices {
|
join(', ',@duplicatedids)); |
join(', ',@duplicatedids)); |
if ($duplicateids) { |
if ($duplicateids) { |
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n"; |
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n"; |
my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>'; |
my $outstring='<span class="LC_error">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</span>'; |
return ($outstring,1); |
return ($outstring,1); |
} |
} |
if ($needsfixup) { |
if ($needsfixup) { |
Line 671 sub fix_ids_and_indices {
|
Line 679 sub fix_ids_and_indices {
|
$allow{$token->[2]->{'src'}}=1; |
$allow{$token->[2]->{'src'}}=1; |
next; |
next; |
} |
} |
|
if ($lctag eq 'base') { next; } |
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 680 sub fix_ids_and_indices {
|
Line 689 sub fix_ids_and_indices {
|
$parms{'id'}!~/^\s*$/) { |
$parms{'id'}!~/^\s*$/) { |
$maxid++; |
$maxid++; |
$parms{'id'}=$maxid; |
$parms{'id'}=$maxid; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
print $logfile 'ID(new) : '.$tag.':'.$maxid."\n"; |
|
} else { |
|
print $logfile 'ID(kept): '.$tag.':'.$parms{'id'}."\n"; |
} |
} |
} elsif ($counter eq 'index') { |
} elsif ($counter eq 'index') { |
unless (defined($parms{'index'}) && |
unless (defined($parms{'index'}) && |
Line 691 sub fix_ids_and_indices {
|
Line 702 sub fix_ids_and_indices {
|
} |
} |
} |
} |
} |
} |
foreach my $type ('src','href','background','bgimg') { |
unless ($parms{'type'} eq 'zombie') { |
foreach my $key (keys(%parms)) { |
foreach my $type ('src','href','background','bgimg') { |
if ($key =~ /^$type$/i) { |
foreach my $key (keys(%parms)) { |
$parms{$key}=&set_allow(\%allow,$logfile, |
if ($key =~ /^$type$/i) { |
$target,$tag, |
$parms{$key}=&set_allow(\%allow,$logfile, |
$parms{$key}); |
$target,$tag, |
|
$parms{$key}); |
|
} |
} |
} |
} |
} |
} |
} |
Line 707 sub fix_ids_and_indices {
|
Line 720 sub fix_ids_and_indices {
|
($lctag eq 'image')) { |
($lctag eq 'image')) { |
my $next_token=$parser[-1]->get_token(); |
my $next_token=$parser[-1]->get_token(); |
if ($next_token->[0] eq 'T') { |
if ($next_token->[0] eq 'T') { |
|
$next_token->[1] =~ s/[\n\r\f]+//g; |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$next_token->[1]=&set_allow(\%allow,$logfile, |
$target,$tag, |
$target,$tag, |
$next_token->[1]); |
$next_token->[1]); |
Line 761 sub fix_ids_and_indices {
|
Line 775 sub fix_ids_and_indices {
|
} |
} |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
if ($lctag eq 'm' || $lctag eq 'script' |
if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' |
|| $lctag eq 'display' || $lctag eq 'tex') { |
|| $lctag eq 'display' || $lctag eq 'tex') { |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser); |
} |
} |
Line 813 sub store_metadata {
|
Line 827 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='<font color="red">WARNING: Cannot connect to '. |
$error='<span class="LC_error">WARNING: Cannot connect to '. |
'database!</font>'; |
'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 ='<font color="red">WARNING: The metadata table does not '. |
$error ='<span class="LC_error">WARNING: The metadata table does not '. |
'exist in the LON-CAPA database.</font>'; |
'exist in the LON-CAPA database.</span>'; |
&Apache::lonnet::logthis($error); |
&Apache::lonnet::logthis($error); |
return ($error,undef); |
return ($error,undef); |
} |
} |
Line 829 sub store_metadata {
|
Line 843 sub store_metadata {
|
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=&LONCAPA::lonmetadata::delete_metadata($dbh,undef, |
my $delitem = 'url = '.$dbh->quote($metadata{'url'}); |
$metadata{'url'}); |
$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem); |
|
|
} else { |
} else { |
$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef, |
$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef, |
\%metadata); |
\%metadata); |
} |
} |
if (defined($status) && $status ne '') { |
if (defined($status) && $status ne '') { |
$error='<font color="red">Error occured storing new values in '. |
$error='<span class="LC_error">Error occured saving new values in '. |
'metadata table in LON-CAPA database</font>'; |
'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); |
} |
} |
return (undef,$status); |
return (undef,'success'); |
} |
} |
|
|
|
|
Line 859 sub checkonthis {
|
Line 874 sub checkonthis {
|
if (($errorcount) || ($warningcount)) { |
if (($errorcount) || ($warningcount)) { |
$r->print('<br /><tt>'.$uri.'</tt>: '); |
$r->print('<br /><tt>'.$uri.'</tt>: '); |
if ($errorcount) { |
if ($errorcount) { |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'. |
$r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error"><b>'. |
$errorcount.' '. |
$errorcount.' '. |
&mt('error(s)').'</b></font> '); |
&mt('error(s)').'</b></span> '); |
} |
} |
if ($warningcount) { |
if ($warningcount) { |
$r->print('<font color="blue">'. |
$r->print('<font color="blue">'. |
Line 925 sub publish {
|
Line 940 sub publish {
|
my %allow=(); |
my %allow=(); |
|
|
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1); |
return ('<span class="LC_error">'.&mt('No write permission to user directory, FAIL').'</span>',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 939 sub publish {
|
Line 954 sub publish {
|
print $logfile "Copied original file to ".$copyfile."\n"; |
print $logfile "Copied original file to ".$copyfile."\n"; |
} else { |
} else { |
print $logfile "Unable to write backup ".$copyfile.':'.$!."\n"; |
print $logfile "Unable to write backup ".$copyfile.':'.$!."\n"; |
return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1); |
return ("<span class=\"LC_error\">Failed to write backup copy, $!,FAIL</span>",1); |
} |
} |
# ------------------------------------------------------------- IDs and indices |
# ------------------------------------------------------------- IDs and indices |
|
|
Line 951 sub publish {
|
Line 966 sub publish {
|
|
|
$scrout.='<h3>'.&mt('Dependencies').'</h3>'; |
$scrout.='<h3>'.&mt('Dependencies').'</h3>'; |
my $allowstr=''; |
my $allowstr=''; |
foreach (sort(keys(%allow))) { |
foreach my $thisdep (sort(keys(%allow))) { |
my $thisdep=$_; |
|
if ($thisdep !~ /[^\s]/) { next; } |
if ($thisdep !~ /[^\s]/) { next; } |
|
if ($thisdep =~/\$/) { |
|
$scrout.='<br /><span class="LC_warning">' |
|
.&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>') |
|
.'</span><br />'; |
|
} |
unless ($style eq 'rat') { |
unless ($style eq 'rat') { |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
$allowstr.="\n".'<allow src="'.$thisdep.'" />'; |
} |
} |
$scrout.='<br />'; |
$scrout.='<br />'; |
if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='<a href="'.$thisdep.'">'; |
$scrout.='<a href="'.$thisdep.'">'; |
} |
} |
$scrout.='<tt>'.$thisdep.'</tt>'; |
$scrout.='<tt>'.$thisdep.'</tt>'; |
if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) { |
if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) { |
$scrout.='</a>'; |
$scrout.='</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.= ' - <font color="red">'.&mt('Currently not available'). |
$scrout.= ' - <span class="LC_error">'.&mt('Currently not available'). |
'</font>'; |
'</span>'; |
} else { |
} else { |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |
&Apache::lonnet::declutter($thisdep).'___usage' |
&Apache::lonnet::declutter($thisdep).'___usage' |
=> time); |
=> time); |
$thisdep=~/^\/res\/(\w+)\/(\w+)\//; |
$thisdep=~m{^/res/($match_domain)/($match_username)/}; |
if ((defined($1)) && (defined($2))) { |
if ((defined($1)) && (defined($2))) { |
&Apache::lonnet::put('nohist_resevaldata',\%temphash, |
&Apache::lonnet::put('nohist_resevaldata',\%temphash, |
$1,$2); |
$1,$2); |
Line 989 sub publish {
|
Line 1009 sub publish {
|
my $org; |
my $org; |
unless ($org=Apache::File->new('>'.$source)) { |
unless ($org=Apache::File->new('>'.$source)) { |
print $logfile "No write permit to $source\n"; |
print $logfile "No write permit to $source\n"; |
return ('<font color="red">'.&mt('No write permission to'). |
return ('<span class="LC_error">'.&mt('No write permission to'). |
' '.$source. |
' '.$source. |
', '.&mt('FAIL').'</font>',1); |
', '.&mt('FAIL').'</span>',1); |
} |
} |
print($org $outstring); |
print($org $outstring); |
} |
} |
Line 1015 sub publish {
|
Line 1035 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'}.' '. |
$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; |
|
|
# ------------------------------------------------ Check out directory hierachy |
# ------------------------------------------------ Check out directory hierachy |
|
|
Line 1065 sub publish {
|
Line 1085 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 1079 sub publish {
|
Line 1107 sub publish {
|
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless ($_=~/\.\w+$/) { |
unless ($_=~/\.\w+$/) { |
unless ($oldparmstores{$_}) { |
unless ($oldparmstores{$_}) { |
print $logfile 'New: '.$_."\n"; |
my $disp_key = $_; |
$chparms.=$_.' '; |
$disp_key =~ tr/\0/_/; |
|
print $logfile ('New: '.$disp_key."\n"); |
|
$chparms .= $disp_key.' '; |
} |
} |
} |
} |
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>'.&mt('New parameters or stored values'). |
$scrout.='<p><b>'.&mt('New parameters or saved values'). |
':</b> '.$chparms.'</p>'; |
':</b> '.$chparms.'</p>'; |
} |
} |
|
|
Line 1095 sub publish {
|
Line 1125 sub publish {
|
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless (($metadatafields{$_.'.name'}) || |
unless (($metadatafields{$_.'.name'}) || |
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
print $logfile 'Obsolete: '.$_."\n"; |
my $disp_key = $_; |
$chparms.=$_.' '; |
$disp_key =~ tr/\0/_/; |
|
print $logfile ('Obsolete: '.$disp_key."\n"); |
|
$chparms.=$disp_key.' '; |
} |
} |
} |
} |
} |
} |
if ($chparms) { |
if ($chparms) { |
$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '. |
$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '. |
$chparms.'</p><h1><font color="red">'.&mt('Warning!'). |
$chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!'). |
'</font></h1><p><font color="red" size="+1">'. |
'</span></h1><p><span class="LC_warning">'. |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />'; |
&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />'; |
|
} |
|
if ($metadatafields{'copyright'} eq 'priv') { |
|
$scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!'). |
|
'</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.').'</span></p><hr />'; |
} |
} |
|
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |
Line 1146 sub publish {
|
Line 1183 sub publish {
|
|
|
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>'.($env{'form.makeobsolete'}?'':'<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',&escape($allmeta)). |
&hiddenfield('dependencies',join(',',keys %allow)). |
&hiddenfield('dependencies',join(',',keys %allow)); |
|
unless ($env{'form.makeobsolete'}) { |
|
$intr_scrout.= |
&textfield('Title','title',$metadatafields{'title'}). |
&textfield('Title','title',$metadatafields{'title'}). |
&textfield('Author(s)','author',$metadatafields{'author'}). |
&textfield('Author(s)','author',$metadatafields{'author'}). |
&textfield('Subject','subject',$metadatafields{'subject'}); |
&textfield('Subject','subject',$metadatafields{'subject'}); |
|
# --------------------------------------------------- Scan content for keywords |
# --------------------------------------------------- Scan content for keywords |
|
|
|
my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords"); |
my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords"); |
my $KEYWORDS=&mt('Keywords'); |
my $KEYWORDS=&mt('Keywords'); |
Line 1264 END
|
Line 1302 END
|
$metadatafields{'copyright'}='default'; |
$metadatafields{'copyright'}='default'; |
$metadatafields{'sourceavail'}='open'; |
$metadatafields{'sourceavail'}='open'; |
} |
} |
|
if ($metadatafields{'copyright'} eq 'priv') { |
|
$metadatafields{'copyright'}='domain'; |
|
} |
# ------------------------------------------------ Dial in reasonable defaults |
# ------------------------------------------------ Dial in reasonable defaults |
my $defaultoption=$metadatafields{'copyright'}; |
my $defaultoption=$metadatafields{'copyright'}; |
unless ($defaultoption) { $defaultoption='default'; } |
unless ($defaultoption) { $defaultoption='default'; } |
Line 1280 END
|
Line 1321 END
|
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$defaultoption, |
$defaultoption, |
\&Apache::loncommon::copyrightdescription, |
\&Apache::loncommon::copyrightdescription, |
(grep !/^public$/,(&Apache::loncommon::copyrightids))); |
(grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids))); |
} else { |
} else { |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$intr_scrout.=&selectbox('Copyright/Distribution','copyright', |
$defaultoption, |
$defaultoption, |
\&Apache::loncommon::copyrightdescription, |
\&Apache::loncommon::copyrightdescription, |
(&Apache::loncommon::copyrightids)); |
(grep !/^priv$/,(&Apache::loncommon::copyrightids))); |
} |
} |
my $copyright_help = |
my $copyright_help = |
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
Apache::loncommon::help_open_topic('Publishing_Copyright'); |
Line 1295 END
|
Line 1336 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'}); |
} else { |
} else { |
$intr_scrout.=&hiddenfield('copyright','private'); |
$intr_scrout.=&hiddenfield('copyright','private'); |
} |
} |
|
} else { |
|
$intr_scrout.= |
|
&hiddenfield('title',$metadatafields{'title'}). |
|
&hiddenfield('author',$metadatafields{'author'}). |
|
&hiddenfield('subject',$metadatafields{'subject'}). |
|
&hiddenfield('keywords',$metadatafields{'keywords'}). |
|
&hiddenfield('abstract',$metadatafields{'abstract'}). |
|
&hiddenfield('notes',$metadatafields{'notes'}). |
|
&hiddenfield('mime',$metadatafields{'mime'}). |
|
&hiddenfield('creationdate',$metadatafields{'creationdate'}). |
|
&hiddenfield('lastrevisiondate',time). |
|
&hiddenfield('owner',$metadatafields{'owner'}). |
|
&hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}). |
|
&hiddenfield('standards',$metadatafields{'standards'}). |
|
&hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}). |
|
&hiddenfield('language',$metadatafields{'language'}). |
|
&hiddenfield('copyright',$metadatafields{'copyright'}). |
|
&hiddenfield('sourceavail',$metadatafields{'sourceavail'}). |
|
&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}). |
|
&hiddenfield('obsolete',1). |
|
&text_with_browse_field('Suggested Replacement for Obsolete File', |
|
'obsoletereplacement', |
|
$metadatafields{'obsoletereplacement'}); |
|
} |
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($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>'; |
} |
} |
return($scrout,0); |
return($scrout,0); |
} |
} |
Line 1345 Returns:
|
Line 1410 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 1360 sub phasetwo {
|
Line 1425 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('<span class="LC_error">'. |
|
&mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>"). |
|
'</span>'); |
|
return 0; |
|
} |
|
unless ($target=~/\.(\w+)$/) { |
|
$r->print('<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>'); |
|
return 0; |
|
} |
|
if ($target=~/\.(\d+)\.(\w+)$/) { |
|
$r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>'); |
|
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')) { |
$r->print( |
$r->print( |
'<font color="red">'. |
'<span class="LC_error">'. |
&mt('No write permission to user directory, FAIL').'</font>'); |
&mt('No write permission to user directory, FAIL').'</span>'); |
return 0; |
return 0; |
} |
} |
|
|
|
if ($source =~ /\.rights$/) { |
|
$r->print('<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>'); |
|
} |
|
|
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(&unescape($env{'form.allmeta'})); |
|
|
$metadatafields{'title'}=$env{'form.title'}; |
$metadatafields{'title'}=$env{'form.title'}; |
$metadatafields{'author'}=$env{'form.author'}; |
$metadatafields{'author'}=$env{'form.author'}; |
Line 1404 sub phasetwo {
|
Line 1490 sub phasetwo {
|
$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; |
|
$metadatafields{'domain'}=$cudom; |
|
|
my $allkeywords=$env{'form.addkey'}; |
my $allkeywords=$env{'form.addkey'}; |
if (exists($env{'form.keywords'})) { |
if (exists($env{'form.keywords'})) { |
Line 1427 sub phasetwo {
|
Line 1514 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'). |
'<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL'). |
'</font>'; |
'</span>'); |
|
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'). |
'<span class="LC_error">'.&mt('Could not write metadata, FAIL'). |
'</font>'; |
'</span>'); |
|
return 0; |
} |
} |
foreach (sort keys %metadatafields) { |
foreach (sort keys %metadatafields) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
Line 1489 sub phasetwo {
|
Line 1578 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( |
|
"<span class=\"LC_error\">Invalid target directory, FAIL</span>"); |
|
return 0; |
} |
} |
opendir(DIR,$srcd); |
opendir(DIR,$srcd); |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
Line 1514 sub phasetwo {
|
Line 1605 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("<span class=\"LC_error\">".&mt('Failed to copy old target'). |
", $!, ".&mt('FAIL')."</font>"; |
", $!, ".&mt('FAIL')."</span>"); |
|
return 0; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1528 sub phasetwo {
|
Line 1620 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\">". |
"<span class=\"LC_error\">". |
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>"; |
&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>"); |
|
return 0; |
} |
} |
} |
} |
|
|
Line 1561 sub phasetwo {
|
Line 1654 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("<span class=\"LC_error\">". |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>"; |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>"); |
|
return 0; |
} |
} |
|
|
# --------------------------------------------------------------- Copy Metadata |
# --------------------------------------------------------------- Copy Metadata |
Line 1574 sub phasetwo {
|
Line 1668 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>"; |
"<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>"); |
|
return 0; |
} |
} |
$r->rflush; |
$r->rflush; |
|
|
Line 1585 sub phasetwo {
|
Line 1680 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/($match_username)/public_html}{/priv/$1}; |
|
|
my $thissrcdir=$thissrc; |
my $thissrcdir=$thissrc; |
$thissrcdir=~s/\/[^\/]+$/\//; |
$thissrcdir=~s/\/[^\/]+$/\//; |
Line 1607 sub phasetwo {
|
Line 1708 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 1644 sub notify {
|
Line 1746 sub notify {
|
print $logfile "\n============ Done ============\n"; |
print $logfile "\n============ Done ============\n"; |
$logfile->close(); |
$logfile->close(); |
} |
} |
|
if ($lock) { &Apache::lonnet::remove_lock($lock); } |
return OK; |
return OK; |
} |
} |
|
|
Line 1703 sub publishdirectory {
|
Line 1806 sub publishdirectory {
|
&mt('Target').': <tt>'.$resdir.'</tt><br />'); |
&mt('Target').': <tt>'.$resdir.'</tt><br />'); |
|
|
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') { |
opendir(DIR,$fn); |
# ask user what they want |
my @files=sort(readdir(DIR)); |
$r->print('<form name="pubdirpref" method="post">'. |
foreach my $filename (@files) { |
&hiddenfield('phase','two'). |
my ($cdev,$cino,$cmode,$cnlink, |
&hiddenfield('filename',$env{'form.filename'}). |
$cuid,$cgid,$crdev,$csize, |
&checkbox('pubrec','include subdirectories'). |
$catime,$cmtime,$cctime, |
&checkbox('forcerepub','force republication of previously published files'). |
$cblksize,$cblocks)=stat($fn.'/'.$filename); |
&checkbox('obsolete','make file(s) obsolete'). |
|
&checkbox('forceoverride','force directory level catalog information over existing'). |
my $extension=''; |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
$lock=0; |
if ($cmode&$dirptr) { |
} else { |
if (($filename!~/^\./) && ($env{'form.pubrec'})) { |
unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); } |
&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
# actually publish things |
} |
opendir(DIR,$fn); |
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
my @files=sort(readdir(DIR)); |
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) { |
foreach my $filename (@files) { |
|
my ($cdev,$cino,$cmode,$cnlink, |
|
$cuid,$cgid,$crdev,$csize, |
|
$catime,$cmtime,$cctime, |
|
$cblksize,$cblocks)=stat($fn.'/'.$filename); |
|
|
|
my $extension=''; |
|
if ($filename=~/\.(\w+)$/) { $extension=$1; } |
|
if ($cmode&$dirptr) { |
|
if (($filename!~/^\./) && ($env{'form.pubrec'})) { |
|
&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename); |
|
} |
|
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') && |
|
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) { |
# find out publication status and/or exiting metadata |
# find out publication status and/or exiting metadata |
my $publishthis=0; |
my $publishthis=0; |
if (-e $resdir.'/'.$filename) { |
if (-e $resdir.'/'.$filename) { |
my ($rdev,$rino,$rmode,$rnlink, |
my ($rdev,$rino,$rmode,$rnlink, |
$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'} eq 'ON')) { |
if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) { |
# previously published, modified now |
# previously published, modified now |
$publishthis=1; |
$publishthis=1; |
} |
} |
} else { |
my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9]; |
|
my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; |
|
if ( $meta_rmtime<$meta_cmtime ) { |
|
$publishthis=1; |
|
} |
|
} else { |
# never published |
# never published |
$publishthis=1; |
$publishthis=1; |
} |
} |
if ($publishthis) { |
|
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename); |
if ($publishthis) { |
} else { |
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename); |
$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />'); |
} else { |
|
$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />'); |
|
} |
|
$r->rflush(); |
} |
} |
$r->rflush(); |
|
} |
} |
|
closedir(DIR); |
} |
} |
closedir(DIR); |
|
} |
} |
|
|
######################################### |
######################################### |
Line 1762 sub defaultmetapublish {
|
Line 1885 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('<html><head><title>LON-CAPA Publishing</title></head>'); |
$r->print(&Apache::loncommon::start_page('Catalog Information Publication')); |
$r->print(&Apache::loncommon::bodytag('Catalog Information Publication')); |
|
|
|
# ---------------------------------------------------------------- Write Source |
# ---------------------------------------------------------------- Write Source |
my $copyfile=$target; |
my $copyfile=$target; |
Line 1783 sub defaultmetapublish {
|
Line 1905 sub defaultmetapublish {
|
if (copy($fn,$copyfile)) { |
if (copy($fn,$copyfile)) { |
$r->print('<p>'.&mt('Copied source file').'</p>'); |
$r->print('<p>'.&mt('Copied source file').'</p>'); |
} else { |
} else { |
return "<font color=\"red\">". |
return "<span class=\"LC_error\">". |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>"; |
&mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>"; |
} |
} |
|
|
# --------------------------------------------------- Send update notifications |
# --------------------------------------------------- Send update notifications |
Line 1799 sub defaultmetapublish {
|
Line 1921 sub defaultmetapublish {
|
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 Catalog Information').'</a>'); |
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
return OK; |
return OK; |
} |
} |
######################################### |
######################################### |
Line 1861 sub handler {
|
Line 1983 sub handler {
|
@{$modified_urls}=(); |
@{$modified_urls}=(); |
# -------------------------------------------------------------- Check filename |
# -------------------------------------------------------------- Check filename |
|
|
my $fn=&Apache::lonnet::unescape($env{'form.filename'}); |
my $fn=&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 1898 sub handler {
|
Line 2020 sub handler {
|
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
$fn=~s/^http\:\/\/[^\/]+//; |
$fn=~s{^http://[^/]+}{}; |
$fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/; |
$fn=~s{^/~($match_username)}{/home/$1/public_html}; |
|
|
my $targetdir=''; |
my $targetdir=''; |
$docroot=$r->dir_config('lonDocRoot'); |
$docroot=$r->dir_config('lonDocRoot'); |
Line 1922 sub handler {
|
Line 2044 sub handler {
|
return HTTP_NOT_FOUND; |
return HTTP_NOT_FOUND; |
} |
} |
|
|
unless ($env{'form.phase'} eq 'two') { |
|
|
|
# -------------------------------- File is there and owned, init lookup tables. |
# -------------------------------- File is there and owned, init lookup tables. |
|
|
%addid=(); |
%addid=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab'); |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
while (<$fh>=~/(\w+)\s+(\w+)/) { |
$addid{$1}=$2; |
$addid{$1}=$2; |
} |
|
} |
} |
|
} |
|
|
%nokey=(); |
%nokey=(); |
|
|
{ |
{ |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab'); |
while (<$fh>) { |
while (<$fh>) { |
my $word=$_; |
my $word=$_; |
chomp($word); |
chomp($word); |
$nokey{$word}=1; |
$nokey{$word}=1; |
} |
|
} |
} |
|
|
} |
} |
|
|
# ---------------------------------------------------------- Start page output. |
# ---------------------------------------------------------- Start page output. |
Line 1953 sub handler {
|
Line 2071 sub handler {
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
|
|
my $js=&Apache::loncommon::browser_and_searcher_javascript(); |
my $js='<script type="text/javascript">'. |
$r->print('<html><head><title>LON-CAPA Publishing</title> |
&Apache::loncommon::browser_and_searcher_javascript(). |
<script type="text/javascript">'.$js.' |
'</script>'; |
</script></head>'); |
$r->print(&Apache::loncommon::start_page('Resource Publication',$js)); |
$r->print(&Apache::loncommon::bodytag('Resource Publication')); |
|
|
|
|
|
my $thisfn=$fn; |
my $thisfn=$fn; |
Line 1976 sub handler {
|
Line 2093 sub handler {
|
if ($fn=~/\/$/) { |
if ($fn=~/\/$/) { |
# -------------------------------------------------------- This is a directory |
# -------------------------------------------------------- This is a directory |
&publishdirectory($r,$fn,$thisdisfn); |
&publishdirectory($r,$fn,$thisdisfn); |
$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/' |
$r->print('<hr /><a href="/priv/' |
.$cuname.'/'.$thisdisfn |
.$cuname.'/'.$thisdisfn |
.'">'.&mt('Return to Directory').'</a>'); |
.'">'.&mt('Return to Directory').'</a>'); |
|
|
Line 1986 sub handler {
|
Line 2103 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 2027 ENDDIFF
|
Line 2145 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(&Apache::loncommon::end_page()); |
|
|
return OK; |
return OK; |
} |
} |