version 1.32, 2001/08/07 12:07:39
|
version 1.41, 2001/08/17 21:25:36
|
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,8/13,8/17 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 urlfixup { |
|
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 { |
|
|
my ($source,$target,$style)=@_; |
my ($source,$target,$style)=@_; |
Line 140 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 200 sub publish {
|
Line 222 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'); |
|
|
|
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 $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->[1].'>'; |
|
} |
} else { |
} else { |
$outstring.=$token->[1]; |
$outstring.=$token->[1]; |
} |
} |
} |
} |
|
# ------------------------------------------------------------ Construct Allows |
|
unless ($style eq 'rat') { |
|
my $allowstr="\n"; |
|
map { |
|
$allowstr.='<allow src="'.$_.'" />'."\n"; |
|
} 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 250 sub publish {
|
Line 335 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"; |
} 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 314 sub publish {
|
Line 401 sub publish {
|
} |
} |
|
|
# -------------------------------------------------- Parse content for metadata |
# -------------------------------------------------- Parse content for metadata |
|
if ($style eq 'ssi') { |
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
$allmeta=Apache::lonxml::xmlparse('meta',$content); |
|
|
&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 340 sub publish {
|
Line 427 sub publish {
|
my $chparms=''; |
my $chparms=''; |
map { |
map { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
if (($_=~/^parameter/) || ($_=~/^stores/)) { |
unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) { |
unless (($metadatafields{$_.'.name'}) || |
|
($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) { |
print $logfile 'Obsolete: '.$_."\n"; |
print $logfile 'Obsolete: '.$_."\n"; |
$chparms.=$_.' '; |
$chparms.=$_.' '; |
} |
} |
Line 350 sub publish {
|
Line 438 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.= |