--- loncom/xml/lonplot.pm	2001/12/21 21:39:51	1.16
+++ loncom/xml/lonplot.pm	2001/12/21 22:45:47	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.16 2001/12/21 21:39:51 matthew Exp $
+# $Id: lonplot.pm,v 1.17 2001/12/21 22:45:47 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -135,17 +135,17 @@ 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');
-    ## 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') {
+	&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 '';
 }
@@ -202,9 +202,9 @@ ENDIMAGE
 sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
-		    $tagstack->[-1]);
     if ($target eq 'web') {
+	&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
 	# This routine should never return anything.
     }
     return $result;
@@ -221,9 +221,9 @@ sub end_key {
 ##------------------------------------------------------------------- title
 sub start_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
     my $result='';
     if ($target eq 'web') {
+	$title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
 	# This routine should never return anything.
     }
     return $result;
@@ -241,8 +241,8 @@ sub end_title {
 sub start_xlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
     if ($target eq 'web') {
+	$xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
 	# This routine should never return anything.
     }
     return $result;
@@ -260,8 +260,8 @@ sub end_xlabel {
 sub start_ylabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
     if ($target eq 'web') {
+	$ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
 	# This routine should never return anything.
     }
     return $result;
@@ -279,18 +279,18 @@ sub end_ylabel {
 sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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') {
-	# 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;
 }
 
@@ -307,13 +307,13 @@ sub end_label {
 sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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') {
+	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.
     }
     return $result;
@@ -322,9 +322,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'));
 	# This routine should never return anything.
     }
     return $result;
@@ -333,13 +333,13 @@ sub end_curve {
 sub start_function {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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 (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.
     }
     return $result;
@@ -357,36 +357,38 @@ sub end_function {
 sub start_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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 (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]);
+	&Apache::lonxml::warning(
+             ' Length of data string: '.length($datatext));    
+	$datatext =~ s/\s+/ /g;  
+	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;
+	}
+	&Apache::lonxml::warning(' Data Points: '.$#data);
+	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;
 	# This routine should never return anything.
     }
     return $result;
@@ -405,9 +407,9 @@ sub end_data {
 sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
-		    $tagstack->[-1]);
     if ($target eq 'web') {
+	&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
+			$tagstack->[-1]);
 	# This routine should never return anything.
     }
     return $result;