Return to lonratsrv.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonratsrv.pm between versions 1.19 and 1.25

version 1.19, 2002/06/27 16:43:57	version 1.25, 2004/02/11 00:10:01
Line 31	Line 31
# 05/29/00,05/30 Gerd Kortemeyer)	# 05/29/00,05/30 Gerd Kortemeyer)
# 7/1 Gerd Kortemeyer)	# 7/1 Gerd Kortemeyer)
# 7/1,7/3,7/4,7/7,7/8,7/10,7/26,10/2 Gerd Kortemeyer	# 7/1,7/3,7/4,7/7,7/8,7/10,7/26,10/2 Gerd Kortemeyer
# 4/30/2001 Scott Harrison
# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer	# 5/3,06/25,07/03,07/04,07/05 Gerd Kortemeyer

package Apache::lonratsrv;	package Apache::lonratsrv;
Line 68 sub qtunescape {	Line 67 sub qtunescape {

sub loadmap {	sub loadmap {
my ($fn,$errtext)=@_;	my ($fn,$errtext)=@_;
	if ($errtext) { return('',$errtext); }
my $outstr='';	my $outstr='';
my @content=();
my @obj=();	my @obj=();
my @links=();	my @links=();
if (-e $fn) {	my $instr='';
	if ($fn=~/^\/*uploaded\//) {
	$instr=&Apache::lonnet::getfile($fn);
	} elsif (-e $fn) {
	my @content=();
{	{
my $fh=Apache::File->new($fn);	my $fh=Apache::File->new($fn);
@content=<$fh>;	@content=<$fh>;
}	}
my $instr=join('',@content);	$instr=join('',@content);
	}
	if ($instr eq -2) {
	$errtext.='Map not loaded: An error occured while trying to load the map.';
	} elsif ($instr) {
my $parser = HTML::TokeParser->new(\$instr);	my $parser = HTML::TokeParser->new(\$instr);
my $token;	my $token;
my $graphmode=0;	my $graphmode=0;
Line 197 sub loadmap {	Line 204 sub loadmap {
# ----------------------------------------------------------- Saves map to disk	# ----------------------------------------------------------- Saves map to disk

sub savemap {	sub savemap {
my ($fn,$errtext,$r)=@_;	my ($fn,$errtext)=@_;
my %alltypes;	my %alltypes;
my %allvalues;	my %allvalues;
if (($fn=~/\.sequence$/) \|\|	if (($fn=~/\.sequence(\.tmp)*$/) \|\|
($fn=~/\.page$/)) {	($fn=~/\.page(\.tmp)*$/)) {

# ------------------------------------------------------------- Deal with input	# ------------------------------------------------------------- Deal with input
my @tags=split(/<&>/,$ENV{'form.output'});	my @tags=split(/<&>/,$ENV{'form.output'});
Line 213 sub savemap {	Line 220 sub savemap {
} else {	} else {
$outstr="<map>\n";	$outstr="<map>\n";
}	}
map {	foreach (@tags) {
my @parts=split(/<:>/,$_);	my @parts=split(/<:>/,$_);
if ($parts[0] eq 'objcont') {	if ($parts[0] eq 'objcont') {
my @comp=split(/:/,$parts[$#parts]);	my @comp=split(/:/,$parts[$#parts]);
Line 262 sub savemap {	Line 269 sub savemap {
} elsif ($parts[0] eq 'objparms') {	} elsif ($parts[0] eq 'objparms') {
undef %alltypes;	undef %alltypes;
undef %allvalues;	undef %allvalues;
map {	foreach (split(/:/,$parts[$#parts])) {
my ($type,$name,$value)=split(/\_\_\_/,$_);	my ($type,$name,$value)=split(/\_\_\_/,$_);
$alltypes{$name}=$type;	$alltypes{$name}=$type;
$allvalues{$name}=$value;	$allvalues{$name}=$value;
} split(/:/,$parts[$#parts]);	}
map {	foreach (keys %allvalues) {
	if ($allvalues{$_} ne '') {
$outstr.='<param to="'.$parts[1].'" type="'	$outstr.='<param to="'.$parts[1].'" type="'
.$alltypes{$_}.'" name="'.$_	.$alltypes{$_}.'" name="'.$_
.'" value="'.$allvalues{$_}.'">'	.'" value="'.$allvalues{$_}.'">'
."</param>\n";	."</param>\n";
} keys %allvalues;	}
	}
} elsif (($parts[0] ne '') && ($graphdef)) {	} elsif (($parts[0] ne '') && ($graphdef)) {
# ------------------------------------------------------------- Graphical input	# ------------------------------------------------------------- Graphical input
$outstr.='<'.$parts[0];	$outstr.='<'.$parts[0];
Line 282 sub savemap {	Line 291 sub savemap {
$outstr.=' value="'.qtescape($parts[$#parts]).'"></'.	$outstr.=' value="'.qtescape($parts[$#parts]).'"></'.
$parts[0].">\n";	$parts[0].">\n";
}	}
} @tags;	}
$outstr.="</map>\n";	$outstr.="</map>\n";
{	if ($fn=~/^\/*uploaded\/(\w+)\/(\w+)\//) {
	$ENV{'form.output'}=$outstr;
	my $home=&Apache::lonnet::homeserver($2,$1);
	my $result=&Apache::lonnet::finishuserfileupload($2,$1,$home,
	'output',(split(/\//,$fn))[-1]);
	if ($result != m\|^/uploaded/\|) {
	$errtext.='Map not saved: A network error occured when trying to save the map. ';
	}
	} else {
my $fh;	my $fh;
if ($fh=Apache::File->new(">$fn")) {	if ($fh=Apache::File->new(">$fn")) {
print $fh $outstr;	print $fh $outstr;
Line 295 sub savemap {	Line 312 sub savemap {
}	}
} else {	} else {
# -------------------------------------------- Cannot write to that file, error	# -------------------------------------------- Cannot write to that file, error
$errtext.='Map not saved: The specified '.$fn.' path does not exist. '.$r->uri();	$errtext.='Map not saved: The specified path does not exist. ';
}	}
return $errtext;	return $errtext;
}	}
Line 327 sub handler {	Line 344 sub handler {
my $outtext='';	my $outtext='';

if ($mode ne 'loadonly') {	if ($mode ne 'loadonly') {
$errtext=&savemap($fn,$errtext,$r);	$errtext=&savemap($fn,$errtext);
}	}
($outtext,$errtext)=&loadmap($fn,$errtext);	($outtext,$errtext)=&loadmap($fn,$errtext);

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

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.19
changed lines
	Added in v.1.25