version 1.34, 2001/08/11 18:06:25
|
version 1.45, 2001/09/26 16:26:49
|
Line 11
|
Line 11
|
# 04/16/2001 Scott Harrison |
# 04/16/2001 Scott Harrison |
# 05/03,05/05,05/07 Gerd Kortemeyer |
# 05/03,05/05,05/07 Gerd Kortemeyer |
# 05/28/2001 Scott Harrison |
# 05/28/2001 Scott Harrison |
# 06/23,08/07,08/11 Gerd Kortemeyer |
# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer |
|
|
package Apache::lonpublisher; |
package Apache::lonpublisher; |
|
|
Line 71 sub metaeval {
|
Line 71 sub metaeval {
|
} @{$token->[3]}; |
} @{$token->[3]}; |
if ($metadatafields{$unikey}) { |
if ($metadatafields{$unikey}) { |
my $newentry=$parser->get_text('/'.$entry); |
my $newentry=$parser->get_text('/'.$entry); |
unless ($metadatafields{$unikey}=~/$newentry/) { |
unless (($metadatafields{$unikey}=~/$newentry/) || |
|
($newentry eq '')) { |
$metadatafields{$unikey}.=', '.$newentry; |
$metadatafields{$unikey}.=', '.$newentry; |
} |
} |
} else { |
} else { |
Line 133 sub selectbox {
|
Line 134 sub selectbox {
|
|
|
# -------------------------------------------------------- Publication Step One |
# -------------------------------------------------------- Publication Step One |
|
|
sub makeallowed { |
|
} |
|
|
|
sub urlfixup { |
sub urlfixup { |
return shift; |
my ($url,$target)=@_; |
|
unless ($url) { return ''; } |
|
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); |
|
map { |
|
if ($_ eq $host) { |
|
$url=~s/^http\:\/\///; |
|
$url=~s/^$host//; |
|
} |
|
} values %Apache::lonnet::hostname; |
|
if ($url=~/^http\:\/\//) { return $url; } |
|
$url=~s/\~$cuname/res\/$cudom\/$cuname/; |
|
if ($target) { |
|
$target=~s/\/[^\/]+$//; |
|
$url=&Apache::lonnet::hreflocation($target,$url); |
|
} |
|
return $url; |
} |
} |
|
|
sub publish { |
sub publish { |
Line 147 sub publish {
|
Line 160 sub publish {
|
my $scrout=''; |
my $scrout=''; |
my $allmeta=''; |
my $allmeta=''; |
my $content=''; |
my $content=''; |
|
my %allow=(); |
|
undef %allow; |
|
|
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
return |
return |
Line 236 sub publish {
|
Line 251 sub publish {
|
map { |
map { |
if (defined($parms{$_})) { |
if (defined($parms{$_})) { |
my $oldurl=$parms{$_}; |
my $oldurl=$parms{$_}; |
my $newurl=&urlfixup($oldurl); |
my $newurl=&urlfixup($oldurl,$target); |
if ($newurl ne $oldurl) { |
if ($newurl ne $oldurl) { |
$parms{$_}=$newurl; |
$parms{$_}=$newurl; |
print $logfile 'URL: '.$tag.':'.$oldurl.' - '. |
print $logfile 'URL: '.$tag.':'.$oldurl.' - '. |
$newurl."\n"; |
$newurl."\n"; |
} |
} |
&makeallowed($newurl); |
$allow{$newurl}=1; |
} |
} |
} ('src','href','codebase'); |
} ('src','href','background'); |
|
|
|
if ($tag eq 'applet') { |
|
my $codebase=''; |
|
if (defined($parms{'codebase'})) { |
|
my $oldcodebase=$parms{'codebase'}; |
|
unless ($oldcodebase=~/\/$/) { |
|
$oldcodebase.='/'; |
|
} |
|
$codebase=&urlfixup($oldcodebase,$target); |
|
$codebase=~s/\/$//; |
|
if ($codebase ne $oldcodebase) { |
|
$parms{'codebase'}=$codebase; |
|
print $logfile 'URL codebase: '.$tag.':'. |
|
$oldcodebase.' - '. |
|
$codebase."\n"; |
|
} |
|
$allow{$codebase.'/*'}=1; |
|
} else { |
|
map { |
|
if (defined($parms{$_})) { |
|
my $oldurl=$parms{$_}; |
|
my $newurl=&urlfixup($oldurl,$target); |
|
$newurl=~s/\/[^\/]+$/\/\*/; |
|
print $logfile 'Allow: applet '.$_.':'. |
|
$oldurl.' allows '. |
|
$newurl."\n"; |
|
$allow{$newurl}=1; |
|
} |
|
} ('archive','code','object'); |
|
} |
|
} |
|
|
my $newparmstring=''; |
my $newparmstring=''; |
my $endtag=''; |
my $endtag=''; |
Line 258 sub publish {
|
Line 304 sub publish {
|
} keys %parms; |
} keys %parms; |
|
|
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
} |
} else { |
|
$allow{$token->[2]->{'src'}}=1; |
|
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
unless ($token->[1] eq 'allow') { |
unless ($token->[1] eq 'allow') { |
$outstring.=$token->[2]; |
$outstring.='</'.$token->[1].'>'; |
} |
} |
} else { |
} else { |
$outstring.=$token->[1]; |
$outstring.=$token->[1]; |
} |
} |
} |
} |
|
# ------------------------------------------------------------ Construct Allows |
|
unless ($style eq 'rat') { |
|
$scrout.='<h3>Dependencies</h3>'; |
|
my $allowstr="\n"; |
|
map { |
|
$allowstr.='<allow src="'.$_.'" />'."\n"; |
|
$scrout.='<br>'; |
|
unless ($_=~/\*/) { |
|
$scrout.='<a href="'.$_.'">'; |
|
} |
|
$scrout.='<tt>'.$_.'</tt>'; |
|
unless ($_=~/\*/) { |
|
$scrout.='</a>'; |
|
} |
|
} keys %allow; |
|
$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s; |
|
} |
|
# ------------------------------------------------------------- Write modified |
|
|
{ |
{ |
my $org; |
my $org; |
unless ($org=Apache::File->new('>'.$source)) { |
unless ($org=Apache::File->new('>'.$source)) { |
Line 285 sub publish {
|
Line 352 sub publish {
|
} else { |
} else { |
print $logfile "Does not need ID and/or index fixup\n"; |
print $logfile "Does not need ID and/or index fixup\n"; |
} |
} |
|
} |
# --------------------------------------------- Initial step done, now metadata |
# --------------------------------------------- Initial step done, now metadata |
|
|
# ---------------------------------------- Storage for metadata keys and fields |
# ---------------------------------------- Storage for metadata keys and fields |
Line 294 sub publish {
|
Line 361 sub publish {
|
%metadatakeys=(); |
%metadatakeys=(); |
|
|
my %oldparmstores=(); |
my %oldparmstores=(); |
|
|
|
$scrout.='<h3>Metadata Information</h3>'; |
|
|
# ------------------------------------------------ First, check out environment |
# ------------------------------------------------ First, check out environment |
unless (-e $source.'.meta') { |
unless (-e $source.'.meta') { |
Line 343 sub publish {
|
Line 412 sub publish {
|
} |
} |
|
|
# -------------------------------------------------- Parse content for metadata |
# -------------------------------------------------- Parse content for metadata |
|
if ($style eq 'ssi') { |
|
my $oldenv=$ENV{'request.uri'}; |
|
|
|
$ENV{'request.uri'}=$target; |
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
|
$ENV{'request.uri'}=$oldenv; |
|
|
&metaeval($allmeta); |
&metaeval($allmeta); |
|
} |
# ---------------- Find and document discrepancies in the parameters and stores |
# ---------------- Find and document discrepancies in the parameters and stores |
|
|
my $chparms=''; |
my $chparms=''; |
Line 380 sub publish {
|
Line 453 sub publish {
|
$scrout.='<p><b>Obsolete parameters or stored values:</b> '. |
$scrout.='<p><b>Obsolete parameters or stored values:</b> '. |
$chparms; |
$chparms; |
} |
} |
} |
|
# ------------------------------------------------------- Now have all metadata |
# ------------------------------------------------------- Now have all metadata |
|
|
$scrout.= |
$scrout.= |
Line 460 sub publish {
|
Line 533 sub publish {
|
|
|
$scrout.=&textfield('Publisher/Owner','owner', |
$scrout.=&textfield('Publisher/Owner','owner', |
$metadatafields{'owner'}); |
$metadatafields{'owner'}); |
|
# --------------------------------------------------- Correct copyright for rat |
|
if ($style eq 'rat') { |
|
if ($metadatafields{'copyright'} eq 'public') { |
|
delete $metadatafields{'copyright'}; |
|
} |
|
delete $cprtag{'public'}; |
|
} |
|
|
$scrout.=&selectbox('Copyright/Distribution','copyright', |
$scrout.=&selectbox('Copyright/Distribution','copyright', |
$metadatafields{'copyright'},%cprtag); |
$metadatafields{'copyright'},%cprtag); |
Line 775 sub handler {
|
Line 855 sub handler {
|
return OK; |
return OK; |
} |
} |
|
|
|
# Get query string for limited number of parameters |
|
|
|
map { |
|
my ($name, $value) = split(/=/,$_); |
|
$value =~ tr/+/ /; |
|
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; |
|
if ($name eq 'filename') { |
|
unless ($ENV{'form.'.$name}) { |
|
$ENV{'form.'.$name}=$value; |
|
} |
|
} |
|
} (split(/&/,$ENV{'QUERY_STRING'})); |
|
|
|
|
# -------------------------------------------------------------- Check filename |
# -------------------------------------------------------------- Check filename |
|
|
my $fn=$ENV{'form.filename'}; |
my $fn=$ENV{'form.filename'}; |
Line 806 sub handler {
|
Line 900 sub handler {
|
return HTTP_NOT_ACCEPTABLE; |
return HTTP_NOT_ACCEPTABLE; |
} |
} |
|
|
$fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; |
$fn=~s/^http\:\/\/[^\/]+//; |
|
$fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/; |
|
|
my $targetdir=''; |
my $targetdir=''; |
$docroot=$r->dir_config('lonDocRoot'); |
$docroot=$r->dir_config('lonDocRoot'); |