loncom/xml/lonplot.pm - diff

Return to lonplot.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.3 and 1.4

version 1.3, 2001/12/18 16:06:01	version 1.4, 2001/12/18 20:34:58
Line 112 sub start_plot {	Line 112 sub start_plot {
&Apache::lonxml::register('Apache::plot',	&Apache::lonxml::register('Apache::plot',
('title','xlabel','ylabel','key','axis','label','curve'));	('title','xlabel','ylabel','key','axis','label','curve'));
push (@Apache::lonxml::namespace,'plot');	push (@Apache::lonxml::namespace,'plot');
##-------------------------------------------------------	## Always evaluate the insides of the <plot></plot> tags
## How do I do this? I need to "eval" and I need to keep the info
## available for the parser.
##
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);	my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
if ($eval eq 'on') {	&Apache::lonxml::newparser($parser,\$inside);
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
#&Apache::lonxml::debug("M is evaulated to:$inside:");
}
##-------------------------------------------------------	##-------------------------------------------------------
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,'plot');	&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,'plot');
	if ($target eq 'web') {
	}
return '';	return '';
}	}

sub end_plot {	sub end_plot {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
pop @Apache::lonxml::namespace;	pop @Apache::lonxml::namespace;
my $result;	&Apache::lonxml::deregister('Apache::lonplot',
## Determine filename	('title','xlabel','ylabel','key','axis','label','curve'));
my $tmpdir = '/home/httpd/perl/tmp/';	my $result = '';
my $filename = $tmpdir.$ENV{'user.name'}.'_'.$ENV{'user.domain'}.	if ($target eq 'web') {
'_plot.data';	## Determine filename -- may need a better way later
my $usersees=md5_base64($filename.'_'.$ENV{'REMOTE_ADDR'});	my $tmpdir = '/home/httpd/perl/tmp/';
	my $filename = $tmpdir.$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
## Write the plot description to the file	'_plot.data';
my $fh=&Apache::File->new('/home/httpd/perl/tmp/'.$realname);	my $usersees=md5_base64($filename.'_'.$ENV{'REMOTE_ADDR'});
## Ack!
## return image tag for the plot	## Write the plot description to the file
$result = '<img src=\"/cgi-bin/plot.cgi?'.$usersees.'"';	my $fh=&Apache::File->new('/home/httpd/perl/tmp/'.$realname);
	# write plot values
	# write title, xlabel, ylabel
	# write key values
	# write axis values
	# write label values
	# write curve values
	## Ack!
	## return image tag for the plot
	$result = '<img src=\"/cgi-bin/plot.cgi?'.$usersees.'"';
	}
return $result;	return $result;
}	}

Line 150 sub start_key {	Line 156 sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);	&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_key {	sub end_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}
##------------------------------------------------------------------- title	##------------------------------------------------------------------- title
Line 163 sub start_title {	Line 175 sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);	$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
my $result='';	my $result='';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_title {	sub end_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}
##------------------------------------------------------------------- xlabel	##------------------------------------------------------------------- xlabel
Line 176 sub start_xlabel {	Line 194 sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_xlabel {	sub end_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}
##------------------------------------------------------------------- ylabel	##------------------------------------------------------------------- ylabel
Line 189 sub start_ylabel {	Line 213 sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_ylabel {	sub end_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}
##------------------------------------------------------------------- label	##------------------------------------------------------------------- label
Line 205 sub start_label {	Line 235 sub start_label {
&get_attributes($label,\%label_defaults,$parstack,$safeeval,$tagstack);	&get_attributes($label,\%label_defaults,$parstack,$safeeval,$tagstack);
$label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);	$label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
push(@labels,\%label);	push(@labels,\%label);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_label {	sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

Line 221 sub start_curve {	Line 257 sub start_curve {
my %curve;	my %curve;
&get_attributes($curve,\%curve_defaults,$parstack,$safeeval,$tagstack);	&get_attributes($curve,\%curve_defaults,$parstack,$safeeval,$tagstack);
push (@curves,$curve);	push (@curves,$curve);
	&Apache::lonxml::register('Apache::lonplot',('function','data'));
&Apache::lonxml::register('Apache::plot',('function','data'));
push (@Apache::lonxml::namespace,'curve');	push (@Apache::lonxml::namespace,'curve');
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_curve {	sub end_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	pop @Apache::lonxml::namespace;
	&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

Line 238 sub end_curve {	Line 280 sub end_curve {
sub start_function {	sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
	if (exists($curves[-1]->{'data'}) {
	&Apache::lonxml::warning('Use of <function> precludes use of <data>. The <data> will be omitted in favor of the <function> declaration.');
	delete($curves[-1]->{'data'});
	}
$curves[-1]->{'function'} =	$curves[-1]->{'function'} =
&Apache::lonxml::get_all_text("/function",$$parser[-1]);	&Apache::lonxml::get_all_text("/function",$$parser[-1]);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_function {	sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

Line 254 sub end_function {	Line 305 sub end_function {
sub start_data {	sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
push( @{$curves[-1]->{'data'}},	if (exists($curves[-1]->{'function'})) {
&Apache::lonxml::get_all_text("/data",$$parser[-1]));	&Apache::lonxml::warning('Use of <data> precludes use of <function>. The <function> will be omitted in favor of the <data> declaration.');
	delete($curves[-1]->{'function'});
	}
	my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
	$datatext =~ s/(\s+$\|^\s+)//g;
	$datatext =~ s/\s+/ /g;
	if ($datatext !~ /^(([+-]?\d\.?\d)[, ]?)+$/) {
	&Apache::lonxml::warning('Malformed data: '.$datatext);
	$datatext = '';
	}
	push( @{$curves[-1]->{'data'}},$datatext;
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_data {	sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

Line 270 sub start_axis {	Line 337 sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
&get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);	&get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

sub end_axis {	sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';	my $result = '';
	if ($target eq 'web') {
	# This routine should never return anything.
	}
return $result;	return $result;
}	}

Line 299 sub get_attributes{	Line 372 sub get_attributes{

1;	1;
__END__	__END__

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

Removed from v.1.3
changed lines
	Added in v.1.4