version 1.199, 2005/06/27 21:40:39
|
version 1.217, 2007/01/19 06:10:09
|
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 278 sub metaread {
|
Line 280 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 355 sub hiddenfield {
|
Line 356 sub hiddenfield {
|
|
|
sub checkbox { |
sub checkbox { |
my ($name,$text)=@_; |
my ($name,$text)=@_; |
return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text); |
return "\n<br /><label><input type='checkbox' name='$name' /> ". |
|
&mt($text)."</label>"; |
} |
} |
|
|
sub selectbox { |
sub selectbox { |
Line 493 sub get_subscribed_hosts {
|
Line 495 sub get_subscribed_hosts {
|
my $srcf=$2; |
my $srcf=$2; |
opendir(DIR,$1); |
opendir(DIR,$1); |
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 'subscription' && |
$subhost ne 'tmp') && |
$subhost ne 'tmp') && |
Line 505 sub get_subscribed_hosts {
|
Line 507 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 547 sub get_max_ids_indices {
|
Line 543 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 676 sub fix_ids_and_indices {
|
Line 673 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 685 sub fix_ids_and_indices {
|
Line 683 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 696 sub fix_ids_and_indices {
|
Line 696 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 837 sub store_metadata {
|
Line 839 sub store_metadata {
|
$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef, |
$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef, |
$metadata{'url'}); |
$metadata{'url'}); |
} 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 '') { |
Line 847 sub store_metadata {
|
Line 849 sub store_metadata {
|
&Apache::lonnet::logthis($status); |
&Apache::lonnet::logthis($status); |
return ($error,undef); |
return ($error,undef); |
} |
} |
return (undef,$status); |
return (undef,'success'); |
} |
} |
|
|
|
|
Line 933 sub publish {
|
Line 935 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 978 sub publish {
|
Line 980 sub publish {
|
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 1027 sub publish {
|
Line 1029 sub publish {
|
$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 1162 sub publish {
|
Line 1164 sub publish {
|
'<p>'.($env{'form.makeobsolete'}?'':'<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'}) { |
unless ($env{'form.makeobsolete'}) { |
$intr_scrout.= |
$intr_scrout.= |
Line 1312 END
|
Line 1314 END
|
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights'); |
my $uctitle=&mt('Obsolete'); |
my $uctitle=&mt('Obsolete'); |
$intr_scrout.= |
$intr_scrout.= |
"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
"\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
'</b></font> <input type="checkbox" name="obsolete" '; |
'</b></font> <input type="checkbox" name="obsolete" '; |
if ($metadatafields{'obsolete'}) { |
if ($metadatafields{'obsolete'}) { |
$intr_scrout.=' checked="1" '; |
$intr_scrout.=' checked="1" '; |
} |
} |
$intr_scrout.='/ ></p>'. |
$intr_scrout.='/ ></label></p>'. |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
&text_with_browse_field('Suggested Replacement for Obsolete File', |
'obsoletereplacement', |
'obsoletereplacement', |
$metadatafields{'obsoletereplacement'}); |
$metadatafields{'obsoletereplacement'}); |
Line 1430 sub phasetwo {
|
Line 1432 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(&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 1458 sub phasetwo {
|
Line 1460 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 1659 sub phasetwo {
|
Line 1662 sub phasetwo {
|
unless ($batch) { |
unless ($batch) { |
|
|
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 1779 sub publishdirectory {
|
Line 1782 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('obsolete','make file(s) obsolete'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
&checkbox('forceoverride','force directory level catalog information over existing'). |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'); |
} else { |
} else { |
Line 1811 sub publishdirectory {
|
Line 1814 sub publishdirectory {
|
# previously published, modified now |
# previously published, modified now |
$publishthis=1; |
$publishthis=1; |
} |
} |
|
my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9]; |
|
my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9]; |
|
if ( $meta_rmtime<$meta_cmtime ) { |
|
$publishthis=1; |
|
} |
} else { |
} else { |
# never published |
# never published |
$publishthis=1; |
$publishthis=1; |
} |
} |
|
|
if ($publishthis) { |
if ($publishthis) { |
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename); |
&batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename); |
} else { |
} else { |
Line 1843 sub defaultmetapublish {
|
Line 1852 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 1880 sub defaultmetapublish {
|
Line 1888 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 1942 sub handler {
|
Line 1950 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 1979 sub handler {
|
Line 1987 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 2003 sub handler {
|
Line 2011 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 2034 sub handler {
|
Line 2038 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 2067 sub handler {
|
Line 2070 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 2112 ENDDIFF
|
Line 2116 ENDDIFF
|
$r->print('<hr />'); |
$r->print('<hr />'); |
} |
} |
} |
} |
$r->print('</body></html>'); |
$r->print(&Apache::loncommon::end_page()); |
|
|
return OK; |
return OK; |
} |
} |