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.31 and 1.59

version 1.31, 2001/06/23 18:26:40	version 1.59, 2001/12/05 21:12:04
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# Publication Handler	# Publication Handler
	#
	# $Id$
	#
	# Copyright Michigan State University Board of Trustees
	#
	# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
	#
	# LON-CAPA is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 2 of the License, or
	# (at your option) any later version.
	#
	# LON-CAPA is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with LON-CAPA; if not, write to the Free Software
	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	#
	# /home/httpd/html/adm/gpl.txt
	#
	# http://www.lon-capa.org/
	#
#	#
# (TeX Content Handler	# (TeX Content Handler
#	#
Line 11	Line 36
# 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 Gerd Kortemeyer	# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
	# 12/04,12/05 Guy Albertelli
	# 12/05 Gerd Kortemeyer

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

Line 49 sub metaeval {	Line 76 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 65 sub metaeval {	Line 98 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 127 sub selectbox {	Line 161 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 134 sub publish {	Line 187 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 194 sub publish {	Line 249 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);
	$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') {
my $counter;	my $counter;
if ($counter=$addid{$token->[1]}) {	my $tag=$token->[1];
	my $lctag=lc($tag);
	unless ($lctag eq 'allow') {
	my %parms=%{$token->[2]};
	$counter=$addid{$tag};
	if (!$counter) { $counter=$addid{$lctag}; }
	if ($counter) {
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 ($lctag 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;
	if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
	$outstring.='<'.$tag.$newparmstring.$endtag.'>';
	} else {
	$allow{$token->[2]->{'src'}}=1;
	}
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
$outstring.=$token->[2];	if ($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 {
	my $thisdep=$_;
	$allowstr.='<allow src="'.$thisdep.'" />'."\n";
	$scrout.='<br>';
	unless ($thisdep=~/\*/) {
	$scrout.='<a href="'.$thisdep.'">';
	}
	$scrout.='<tt>'.$thisdep.'</tt>';
	unless ($thisdep=~/\*/) {
	$scrout.='</a>';
	if (
	&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
	$thisdep.'.meta') eq '-1') {
	$scrout.=
	' - <font color=red>Currently not available</font>';
	} else {
	my %temphash=(&Apache::lonnet::declutter($target).'___'.
	&Apache::lonnet::declutter($thisdep).'___usage'
	=> time);
	$thisdep=~/^\/res\/(\w+)\/(\w+)\//;
	if ((defined($1)) && (defined($2))) {
	&Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
	}
	}
	}
	} 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 244 sub publish {	Line 392 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 259 sub publish {	Line 409 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 308 sub publish {	Line 460 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 333 sub publish {	Line 490 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 343 sub publish {	Line 501 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 351 sub publish {	Line 509 sub publish {
&hiddenfield('phase','two').	&hiddenfield('phase','two').
&hiddenfield('filename',$ENV{'form.filename'}).	&hiddenfield('filename',$ENV{'form.filename'}).
&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
	&hiddenfield('dependencies',join(',',keys %allow)).
&textfield('Title','title',$metadatafields{'title'}).	&textfield('Title','title',$metadatafields{'title'}).
&textfield('Author(s)','author',$metadatafields{'author'}).	&textfield('Author(s)','author',$metadatafields{'author'}).
&textfield('Subject','subject',$metadatafields{'subject'});	&textfield('Subject','subject',$metadatafields{'subject'});
Line 360 sub publish {	Line 519 sub publish {
my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
my $colcount=0;	my $colcount=0;

{	if (length($content)<500000) {
my $textonly=$content;	my $textonly=$content;
$textonly=~s/\<script[^\<]+\<\/script\>//g;	$textonly=~s/\<script[^\<]+\<\/script\>//g;
$textonly=~s/\<m\>[^\<]+\<\/m\>//g;	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
Line 392 sub publish {	Line 551 sub publish {
}	}
$colcount++;	$colcount++;
} sort keys %keywords;	} sort keys %keywords;
$keywordout.='</tr></table>';

	} else {
	$keywordout.='<td>File too long for keyword analysis</td>';
}	}

$scrout.=$keywordout;	$keywordout.='</tr></table>';

	$scrout.=$keywordout;

$scrout.=&textfield('Additional Keywords','addkey','');	$scrout.=&textfield('Additional Keywords','addkey','');

Line 423 sub publish {	Line 585 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 738 sub handler {	Line 907 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 769 sub handler {	Line 952 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.31
changed lines
	Added in v.1.59