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.16 and 1.19

version 1.16, 2001/12/21 21:39:51	version 1.19, 2001/12/27 19:47:02
Line 34 use Apache::File;	Line 34 use Apache::File;
use Apache::response;	use Apache::response;
use Apache::lonxml;	use Apache::lonxml;

use Digest::MD5 qw(md5_base64);

sub BEGIN {	sub BEGIN {
&Apache::lonxml::register('Apache::lonplot',('plot'));	&Apache::lonxml::register('Apache::lonplot',('plot'));
}	}
Line 53 sub BEGIN {	Line 51 sub BEGIN {
## grid	## grid
## border	## border
## font	## font
	## align
##	##
## @labels: $labels[$i] = \%label	## @labels: $labels[$i] = \%label
## %label: text, xpos, ypos, justify	## %label: text, xpos, ypos, justify
Line 68 sub BEGIN {	Line 67 sub BEGIN {
## Tests used in checking the validitity of input	## Tests used in checking the validitity of input
##	##
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};	my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d\.?\d$/};	my $real_test =
	sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d\.?\d([eE][+-]\d+)?$/};
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};	my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
my $onoff_test = sub {$_[0]=~/^(on\|off)$/};	my $onoff_test = sub {$_[0]=~/^(on\|off)$/};
my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};	my $key_pos_test = sub {$_[0]=~/^(top\|bottom\|right\|left\|outside\|below\| )+$/};
Line 88 my %plot_defaults =	Line 88 my %plot_defaults =
grid => {default => 'off', test => $onoff_test },	grid => {default => 'off', test => $onoff_test },
border => {default => 'on', test => $onoff_test },	border => {default => 'on', test => $onoff_test },
font => {default => 'medium', test => $sml_test },	font => {default => 'medium', test => $sml_test },
align => {default => 'left', test => $words_test }	align => {default => 'left', test =>
	sub {$_[0]=~/^(left\|right\|center)$/} }
);	);

my %key_defaults =	my %key_defaults =
Line 135 sub start_plot {	Line 136 sub start_plot {
#	#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
&Apache::lonxml::register('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));
push (@Apache::lonxml::namespace,'plot');
## Always evaluate the insides of the <plot></plot> tags
my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
&Apache::lonxml::newparser($parser,\$inside);
##-------------------------------------------------------
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
if ($target eq 'web') {	if ($target eq 'web') {
	&Apache::lonxml::register('Apache::lonplot',
	('title','xlabel','ylabel','key','axis','label','curve'));
	push (@Apache::lonxml::namespace,'plot');
	## Always evaluate the insides of the <plot></plot> tags
	my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
	&Apache::lonxml::newparser($parser,\$inside);
	##-------------------------------------------------------
	&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
}	}
return '';	return '';
}	}
Line 202 ENDIMAGE	Line 203 ENDIMAGE
sub start_key {	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->[-1]);
if ($target eq 'web') {	if ($target eq 'web') {
	&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 221 sub end_key {	Line 222 sub end_key {
##------------------------------------------------------------------- title	##------------------------------------------------------------------- title
sub start_title {	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]);
my $result='';	my $result='';
if ($target eq 'web') {	if ($target eq 'web') {
	$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 241 sub end_title {	Line 242 sub end_title {
sub start_xlabel {	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]);
if ($target eq 'web') {	if ($target eq 'web') {
	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 260 sub end_xlabel {	Line 261 sub end_xlabel {
sub start_ylabel {	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]);
if ($target eq 'web') {	if ($target eq 'web') {
	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 279 sub end_ylabel {	Line 280 sub end_ylabel {
sub start_label {	sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
my %label;
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);
$label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
if (! &$words_test($label{'text'})) {
# I should probably warn about it, too.
$label{'text'} = 'Illegal text';
}
push(@labels,\%label);
if ($target eq 'web') {	if ($target eq 'web') {
# This routine should never return anything.	my %label;
	&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	$label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
	if (! &$words_test($label{'text'})) {
	# I should probably warn about it, too.
	$label{'text'} = 'Illegal text';
	}
	push(@labels,\%label);
}	}
	# This routine should never return anything.
return $result;	return $result;
}	}

Line 307 sub end_label {	Line 308 sub end_label {
sub start_curve {	sub start_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';	my $result='';
my %curve;
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
$tagstack->[-1]);
push (@curves,\%curve);
&Apache::lonxml::register('Apache::lonplot',('function','data'));
push (@Apache::lonxml::namespace,'curve');
if ($target eq 'web') {	if ($target eq 'web') {
	my %curve;
	&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
	push (@curves,\%curve);
	&Apache::lonxml::register('Apache::lonplot',('function','data'));
	push (@Apache::lonxml::namespace,'curve');
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 322 sub start_curve {	Line 323 sub start_curve {
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') {	if ($target eq 'web') {
	pop @Apache::lonxml::namespace;
	&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 333 sub end_curve {	Line 334 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'} =
&Apache::lonxml::get_all_text("/function",$$parser[-1]);
if ($target eq 'web') {	if ($target eq 'web') {
	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'} =
	&Apache::lonxml::get_all_text("/function",$$parser[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 357 sub end_function {	Line 358 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='';
if (exists($curves[-1]->{'function'})) {
&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+/ /g; # No whitespace, numbers must be seperated
# by commas
if ($datatext !~ /^(([+-]?\d\.?\d)[, ]?)+$/) {
&Apache::lonxml::warning('Malformed data: '.$datatext);
$datatext = '';
}
# Need to do some error checking on the @data array -
# make sure it's all numbers and make sure each array
# is of the same length.
my @data;
if ($datatext =~ /,/) {
@data = split /,/,$datatext;
} else { # Assume it's space seperated.
@data = split / /,$datatext;
}
for (my $i=0;$i<=$#data;$i++) {
# Check that it's non-empty
# Check that it's a number
# Maybe I need a 'debug=on' switch to list the data set
# out in a warning?
}
push @{$curves[-1]->{'data'}},\@data;
if ($target eq 'web') {	if ($target eq 'web') {
	if (exists($curves[-1]->{'function'})) {
	&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+/ /g;
	# Need to do some error checking on the @data array -
	# make sure it's all numbers and make sure each array
	# is of the same length.
	my @data;
	if ($datatext =~ /,/) {
	@data = split /,/,$datatext;
	} else { # Assume it's space seperated.
	@data = split / /,$datatext;
	}
	for (my $i=0;$i<=$#data;$i++) {
	# Check that it's non-empty
	if (! defined($data[$i])) {
	&Apache::lonxml::warning(
	'undefined <data> value. Replacing with '.
	' pi/e = 1.15572734979092');
	$data[$i] = 1.15572734979092;
	}
	# Check that it's a number
	if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
	&Apache::lonxml::warning(
	'Bad <data> value of '.$data[$i].' Replacing with '.
	' pi/e = 1.15572734979092');
	$data[$i] = 1.15572734979092;
	}
	}
	push @{$curves[-1]->{'data'}},\@data;
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 405 sub end_data {	Line 411 sub end_data {
sub start_axis {	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,\%axis_defaults,$parstack,$safeeval,
$tagstack->[-1]);
if ($target eq 'web') {	if ($target eq 'web') {
	&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
	$tagstack->[-1]);
# This routine should never return anything.	# This routine should never return anything.
}	}
return $result;	return $result;
Line 439 sub get_attributes{	Line 445 sub get_attributes{
my $parstack = shift;	my $parstack = shift;
my $safeeval = shift;	my $safeeval = shift;
my $tag = shift;	my $tag = shift;
my $attr;	foreach my $attr (keys %{$defaults}) {
foreach $attr (keys %{$defaults}) {
$values->{$attr} =	$values->{$attr} =
&Apache::lonxml::get_param($attr,$parstack,$safeeval);	&Apache::lonxml::get_param($attr,$parstack,$safeeval);
if ($values->{$attr} eq '' \| !defined($values->{$attr})) {	if ($values->{$attr} eq '' \| !defined($values->{$attr})) {

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

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