version 1.33, 2001/08/07 21:27:06
|
version 1.36, 2001/08/11 19:06:54
|
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 Gerd Kortemeyer |
# 06/23,08/07,08/11 Gerd Kortemeyer |
|
|
package Apache::lonpublisher; |
package Apache::lonpublisher; |
|
|
Line 133 sub selectbox {
|
Line 133 sub selectbox {
|
|
|
# -------------------------------------------------------- Publication Step One |
# -------------------------------------------------------- Publication Step One |
|
|
|
sub urlfixup { |
|
my ($url,$target)=@_; |
|
my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); |
|
map { |
|
if ($_ eq $host) { |
|
$url=~s/^http\:\/\///; |
|
$url=~s/^$host//; |
|
} |
|
} values %Apache::lonnet::hostname; |
|
$url=~s/\~$cuname/res\/$cudom\/$cuname/; |
|
if ($target) { |
|
$target=~s/\/[^\/]+$//; |
|
$url=&Apache::lonnet::hreflocation($target,$url); |
|
} |
|
return $url; |
|
} |
|
|
sub publish { |
sub publish { |
|
|
my ($source,$target,$style)=@_; |
my ($source,$target,$style)=@_; |
Line 140 sub publish {
|
Line 157 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 200 sub publish {
|
Line 219 sub publish {
|
print $logfile "Needs ID and/or index fixup\n". |
print $logfile "Needs ID and/or index fixup\n". |
"Max ID : $maxid (min 10)\n". |
"Max ID : $maxid (min 10)\n". |
"Max Index: $maxindex (min 10)\n"; |
"Max Index: $maxindex (min 10)\n"; |
|
} |
my $outstring=''; |
my $outstring=''; |
my $parser=HTML::TokeParser->new(\$content); |
my $parser=HTML::TokeParser->new(\$content); |
my $token; |
my $token; |
while ($token=$parser->get_token) { |
while ($token=$parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $counter; |
my $counter; |
if ($counter=$addid{$token->[1]}) { |
my $tag=$token->[1]; |
|
unless ($tag eq 'allow') { |
|
my %parms=%{$token->[2]}; |
|
if ($counter=$addid{$tag}) { |
if ($counter eq 'id') { |
if ($counter eq 'id') { |
if (defined($token->[2]->{'id'})) { |
unless (defined($parms{'id'})) { |
$outstring.=$token->[4]; |
|
} else { |
|
$maxid++; |
$maxid++; |
my $thisid=' id="'.$maxid.'"'; |
$parms{'id'}=$maxid; |
my $fixup=$token->[4]; |
print $logfile 'ID: '.$tag.':'.$maxid."\n"; |
$fixup=~s/(\<\w+)/$1$thisid/; |
|
$outstring.=$fixup; |
|
print $logfile 'ID: '.$fixup."\n"; |
|
} |
} |
} else { |
} elsif ($counter eq 'index') { |
if (defined($token->[2]->{'index'})) { |
unless (defined($parms{'index'})) { |
$outstring.=$token->[4]; |
|
} else { |
|
$maxindex++; |
$maxindex++; |
my $thisindex=' index="'.$maxindex.'"'; |
$parms{'index'}=$maxindex; |
my $fixup=$token->[4]; |
print $logfile 'Index: '.$tag.':'.$maxindex."\n"; |
$fixup=~s/(\<\w+)/$1$thisindex/; |
|
$outstring.=$fixup; |
|
print $logfile 'Index: '.$fixup."\n"; |
|
} |
} |
} |
} |
} else { |
} |
$outstring.=$token->[4]; |
|
} |
map { |
|
if (defined($parms{$_})) { |
|
my $oldurl=$parms{$_}; |
|
my $newurl=&urlfixup($oldurl,$target); |
|
if ($newurl ne $oldurl) { |
|
$parms{$_}=$newurl; |
|
print $logfile 'URL: '.$tag.':'.$oldurl.' - '. |
|
$newurl."\n"; |
|
} |
|
$allow{$newurl}=1; |
|
} |
|
} ('src','href','codebase'); |
|
|
|
my $newparmstring=''; |
|
my $endtag=''; |
|
map { |
|
if ($_ eq '/') { |
|
$endtag=' /'; |
|
} else { |
|
my $quote=($parms{$_}=~/\"/?"'":'"'); |
|
$newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote; |
|
} |
|
} keys %parms; |
|
|
|
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
|
} else { |
|
$allow{$token->[2]->{'src'}}=1; |
|
} |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$outstring.=$token->[2]; |
unless ($token->[1] eq 'allow') { |
|
$outstring.=$token->[2]; |
|
} |
} else { |
} else { |
$outstring.=$token->[1]; |
$outstring.=$token->[1]; |
} |
} |
} |
} |
|
# ------------------------------------------------------------ Construct Allows |
|
my $allowstr="\n"; |
|
map { |
|
$allowstr.='<allow src="'.$_.'" />'."\n"; |
|
} keys %allow; |
|
$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s; |
|
|
{ |
{ |
my $org; |
my $org; |
unless ($org=Apache::File->new('>'.$source)) { |
unless ($org=Apache::File->new('>'.$source)) { |
Line 250 sub publish {
|
Line 298 sub publish {
|
print $org $outstring; |
print $org $outstring; |
} |
} |
$content=$outstring; |
$content=$outstring; |
|
|
|
if ($needsfixup) { |
print $logfile "End of ID and/or index fixup\n". |
print $logfile "End of ID and/or index fixup\n". |
"Max ID : $maxid (min 10)\n". |
"Max ID : $maxid (min 10)\n". |
"Max Index: $maxindex (min 10)\n"; |
"Max Index: $maxindex (min 10)\n"; |