loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.30 and 1.49

version 1.30, 2001/05/28 19:43:47	version 1.49, 2001/10/16 18:46:10
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,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer
	# 10/3,10/8 Scott Harrison

package Apache::lonpublisher;	package Apache::lonpublisher;

Line 48 sub metaeval {	Line 50 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;
	if (defined($token->[2]->{'package'})) {
	$unikey.='_package_'.$token->[2]->{'package'};
	}
if (defined($token->[2]->{'part'})) {	if (defined($token->[2]->{'part'})) {
$unikey.='_'.$token->[2]->{'part'};	$unikey.='_'.$token->[2]->{'part'};
}	}
	if (defined($token->[2]->{'id'})) {
	$unikey.='_'.$token->[2]->{'id'};
	}
if (defined($token->[2]->{'name'})) {	if (defined($token->[2]->{'name'})) {
$unikey.='_'.$token->[2]->{'name'};	$unikey.='_'.$token->[2]->{'name'};
}	}
Line 64 sub metaeval {	Line 72 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 126 sub selectbox {	Line 135 sub selectbox {

# -------------------------------------------------------- Publication Step One	# -------------------------------------------------------- Publication Step One

sub publish {	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 {
my ($source,$target,$style)=@_;	my ($source,$target,$style)=@_;
my $logfile;	my $logfile;
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 193 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','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 $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') {
	$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 243 sub publish {	Line 344 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 258 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 307 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);
&metaeval($allmeta);	$ENV{'request.uri'}=$oldenv;

	&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 332 sub publish {	Line 442 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 342 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 369 sub publish {	Line 480 sub publish {
$textonly=~s/[^a-z\s]//g;	$textonly=~s/[^a-z\s]//g;

my %keywords=();	my %keywords=();
map {	my $j=0;
unless ($nokey{$_}) {	my $word;
$keywords{$_}=1;	for (my $i=0; $i<length($textonly); $i++) {
}	my $ch.=substr($textonly,$i,1);
} ($textonly=~m/(\w+)/g);	if ($ch=~/\s/) {
	if (length($word)) {
	unless ($nokey{$word}) {
	$keywords{$word}=1;
	}
	}
	$word='';
	}
	else {
	$word.=$ch;
	}
	# map {
	# unless ($nokey{$_}) {
	# $keywords{$_}=1;
	# }
	# } ($textonly=~m/(\w+)/g);
	}

	my $sizkeys=scalar(keys %keywords); # use this value at some point
map {	map {
$keywords{$_}=1;	$keywords{$_}=1;
} split(/\W+/,$metadatafields{'keywords'});	} split(/\W+/,$metadatafields{'keywords'});
Line 389 sub publish {	Line 517 sub publish {
$keywordout.="</tr><tr>\n";	$keywordout.="</tr><tr>\n";
$colcount=0;	$colcount=0;
}	}
$colcount++;	else {
	$colcount++;
	}
} sort keys %keywords;	} sort keys %keywords;
$keywordout.='</tr></table>';	$keywordout.='</tr></table>';

}	}

$scrout.=$keywordout;	$scrout.=$keywordout;

$scrout.=&textfield('Additional Keywords','addkey','');	$scrout.=&textfield('Additional Keywords','addkey','');
Line 422 sub publish {	Line 551 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 737 sub handler {	Line 873 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 748 sub handler {	Line 898 sub handler {
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

unless (($cuname,$cudom)=	($cuname,$cudom)=
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) {	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
	unless (($cuname) && ($cudom)) {
$r->log_reason($cuname.' at '.$cudom.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish file '.$ENV{'form.filename'}.	' trying to publish file '.$ENV{'form.filename'}.
' ('.$fn.') - not authorized',	' ('.$fn.') - not authorized',
Line 767 sub handler {	Line 918 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');

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.30
changed lines
	Added in v.1.49