--- loncom/xml/lonplot.pm 2001/12/28 19:40:47 1.23
+++ loncom/xml/lonplot.pm 2001/12/28 21:56:16 1.25
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.23 2001/12/28 19:40:47 matthew Exp $
+# $Id: lonplot.pm,v 1.25 2001/12/28 21:56:16 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -269,23 +269,23 @@ sub start_plot {
#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
+ &Apache::lonxml::register('Apache::lonplot',
+ ('title','xlabel','ylabel','key','axis','label','curve'));
+ push (@Apache::lonxml::namespace,'plot');
+ my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
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 tags
- my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- &Apache::lonxml::newparser($parser,\$inside);
- ##-------------------------------------------------------
+ }
+ &Apache::lonxml::newparser($parser,\$inside);
+ if ($target eq 'web') {
&get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot');
$result .= &edit_attributes($target,$token,\%plot_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %plot_defaults);
+ ($token,$parstack,$safeeval,keys(%plot_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -296,6 +296,7 @@ sub start_plot {
sub end_plot {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));
@@ -333,11 +334,11 @@ sub start_key {
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot Key');
$result .= &edit_attributes($target,$token,\%key_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %key_defaults);
+ ($token,$parstack,$safeeval,keys(%key_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -363,7 +364,7 @@ sub start_title {
if ($target eq 'web') {
$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
$result.='| '.
&Apache::edit::editfield('',$text,'',20,1).
@@ -380,7 +381,6 @@ sub end_title {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -391,7 +391,7 @@ sub start_xlabel {
if ($target eq 'web') {
$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
$result.=' |
| '.
&Apache::edit::editfield('',$text,'',20,1).
@@ -408,7 +408,6 @@ sub end_xlabel {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -420,7 +419,7 @@ sub start_ylabel {
if ($target eq 'web') {
$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
$result .= ' |
| '.
&Apache::edit::editfield('',$text,'',20,1).
@@ -437,7 +436,6 @@ sub end_ylabel {
my $result = '';
if ($target eq 'web') {
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
@@ -457,7 +455,7 @@ sub start_label {
}
push(@labels,\%label);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot Label');
$result .= &edit_attributes($target,$token,\%label_defaults);
my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
$result .= ' |
| '.
@@ -465,7 +463,7 @@ sub start_label {
&Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %label_defaults);
+ ($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -490,19 +488,19 @@ sub end_label {
sub start_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
+ &Apache::lonxml::register('Apache::lonplot',('function','data'));
+ push (@Apache::lonxml::namespace,'curve');
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');
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot Curve');
$result .= &edit_attributes($target,$token,\%curve_defaults);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %label_defaults);
+ ($token,$parstack,$safeeval,keys(%label_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -514,9 +512,9 @@ sub start_curve {
sub end_curve {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
+ pop @Apache::lonxml::namespace;
+ &Apache::lonxml::deregister('Apache::lonplot',('function','data'));
if ($target eq 'web') {
- pop @Apache::lonxml::namespace;
- &Apache::lonxml::deregister('Apache::lonplot',('function','data'));
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -535,7 +533,7 @@ sub start_function {
$curves[-1]->{'function'} =
&Apache::lonxml::get_all_text("/function",$$parser[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Curve Function');
my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
$result .= ' |
| '.
&Apache::edit::editfield('',$text,'',20,1).
@@ -598,7 +596,7 @@ sub start_data {
}
push @{$curves[-1]->{'data'}},\@data;
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Curve Data');
my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
$result .= ' |
'.
&Apache::edit::editfield('',$text,'',20,1).
@@ -627,7 +625,7 @@ sub start_axis {
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token);
+ $result .= &Apache::edit::tag_start($target,$token,'Plot Axes');
$result .= &edit_attributes($target,$token,\%axis_defaults);
} elsif ($target eq 'modified') {
}
@@ -642,7 +640,7 @@ sub end_axis {
$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
- ($token,$parstack,$safeeval,keys %axis_defaults);
+ ($token,$parstack,$safeeval,keys(%axis_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
$result.= &Apache::edit::handle_insert();
@@ -661,7 +659,7 @@ sub end_axis {
sub set_defaults {
my ($var,$defaults) = @_;
my $key;
- foreach $key (keys %$defaults) {
+ foreach $key (keys(%$defaults)) {
$var->{$key} = $defaults->{$key}->{'default'};
}
}
@@ -669,7 +667,7 @@ sub set_defaults {
##------------------------------------------------------------------- misc
sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
- foreach my $attr (keys %{$defaults}) {
+ foreach my $attr (keys(%{$defaults})) {
$values->{$attr} =
&Apache::lonxml::get_param($attr,$parstack,$safeeval);
if ($values->{$attr} eq '' | !defined($values->{$attr})) {
@@ -795,7 +793,7 @@ sub check_inputs {
sub edit_attributes {
my ($target,$token,$defaults) = @_;
my $result;
- foreach my $attr (%$defaults) {
+ foreach my $attr (sort keys(%$defaults)) {
if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
$result .= &Apache::edit::text_arg(
$defaults->{$attr}->{'description'},
@@ -808,6 +806,7 @@ sub edit_attributes {
$defaults->{$attr}->{'choices'},
$token);
}
+ $result .= '
';
}
return $result;
}
|