--- loncom/xml/lonplot.pm	2001/12/20 19:20:43	1.10
+++ loncom/xml/lonplot.pm	2001/12/20 20:24:36	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.10 2001/12/20 19:20:43 matthew Exp $
+# $Id: lonplot.pm,v 1.11 2001/12/20 20:24:36 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,14 +67,14 @@ sub BEGIN {
 ##
 ## Tests used in checking the validitity of input
 ##
-my $int_test       = sub {$_[0]=~/^\d+$/};
-my $real_test      = sub {$_[0]=~/^[+-]?\d*\.?\d*$/};
-my $color_test     = sub {$_[0]=~/^x[\da-f]{6}$/};
+my $int_test       = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
+my $real_test      = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*$/};
+my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
 my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below)+$/};
 my $sml_test       = sub {$_[0]=~/^(small|medium|large)$/};
 my $linestyle_test = sub {$_[0]=~/^(lines|linespoints|dots|points|steps)$/};
-my $words_test     = sub {$_[0]=~/^(\w+ *)+$/};
+my $words_test     = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^(\w+ ?)+$/};
 ##
 ## Default values for attributes of elements
 ##
@@ -108,16 +108,16 @@ my %label_defaults =
 my %axis_defaults = 
     (
      color     => {default => 'x000000', test => $color_test},
-     xmin      => {default => -10.0,     test => $real_test },
-     xmax      => {default =>  10.0,     test => $real_test },
-     ymin      => {default => -10.0,     test => $real_test },
-     ymax      => {default =>  10.0,     test => $real_test }
+     xmin      => {default => '-10.0',   test => $real_test },
+     xmax      => {default => ' 10.0',   test => $real_test },
+     ymin      => {default => '-10.0',   test => $real_test },
+     ymax      => {default => ' 10.0',   test => $real_test }
      );
 
 my %curve_defaults = 
     (
      color     => {default => 'x000000', test => $color_test             },
-     name      => {default => 'x000000', test => sub {$_[0]=~/^[\w ]*$/} },
+     name      => {default => 'x000000', test => sub {1} },#sub {$_[0]=~/^[\w ]*$/} },
      linestyle => {default => 'lines',   test => $linestyle_test         }
      );
 
@@ -141,7 +141,8 @@ sub start_plot {
     $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
     &Apache::lonxml::newparser($parser,\$inside);
     ##-------------------------------------------------------
-    &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,$tagstack);
+    &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
     if ($target eq 'web') {
     }
     return '';
@@ -160,15 +161,14 @@ sub end_plot {
 	my $filename = $tmpdir.$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
 	    '_plot.data';
 	my $usersees=md5_base64($filename.'_'.$ENV{'REMOTE_ADDR'});
-#	my $usersees=$filename.'_'.$ENV{'REMOTE_ADDR'};
 	
 	## Write the plot description to the file
 	my $fh=Apache::File->new('/home/httpd/perl/tmp/'.$filename);
 	$result .= '<pre>';
 	$result .= &write_gnuplot_file($fh);
-	$result .= '</pre>';
+	$result .= '</pre>'.$/;
 	## return image tag for the plot
-#	$result = '<img src=\"/cgi-bin/plot.cgi?'.$usersees.'"';
+	$result .= '<img src="/cgi-bin/plot.cgi?'.$usersees.'"/>';
     }
     return $result;
 }
@@ -177,7 +177,8 @@ sub end_plot {
 sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);
+    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
     if ($target eq 'web') {
 	# This routine should never return anything.
     }
@@ -254,7 +255,8 @@ sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my %label;
-    &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,$tagstack);
+    &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.
@@ -281,7 +283,8 @@ sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     my %curve;
-    &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,$tagstack);
+    &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
     push (@curves,\%curve);
     &Apache::lonxml::register('Apache::lonplot',('function','data'));
     push (@Apache::lonxml::namespace,'curve');
@@ -372,7 +375,8 @@ sub end_data {
 sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);
+    &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
+		    $tagstack->[-1]);
     if ($target eq 'web') {
 	# This routine should never return anything.
     }
@@ -400,18 +404,18 @@ sub get_attributes{
 	$values->{$attr} = 
 	             &Apache::lonxml::get_param($attr,$parstack,$safeeval);
 	if ($values->{$attr} eq '' | !defined($values->{$attr})) {
-	    $values->{$attr} = $defaults->{$attr};
+	    $values->{$attr} = $defaults->{$attr}->{'default'};
 	    next;
 	}
 	my $test = $defaults->{$attr}->{'test'};
 	if (! &$test($values->{$attr})) {
 	    &Apache::lonxml::warning
 		($tag.':'.$attr.': Bad value.'.'Replacing your value with : '
-		 .$defaults->{$attr} );
-	    $values->{$attr} = $defaults->{$attr};
+		 .$defaults->{$attr}->{'default'} );
+	    $values->{$attr} = $defaults->{$attr}->{'default'};
 	}
-	return ;
     }
+    return ;
 }
 
 sub write_gnuplot_file {
@@ -443,7 +447,7 @@ sub write_gnuplot_file {
 		       'set noborder'.$/         );    # title, xlabel, ylabel
     {
     $gnuplot_input .= <<"ENDLABELS";
-set output "-"
+set output 
 set title  "$title"
 set xlabel "$xlabel"
 set ylabel "$ylabel"
@@ -454,12 +458,10 @@ ENDLABELS
     # Key
     if (defined($key{'pos'})) {
 	$gnuplot_input .= 'set key '.$key{'pos'}.' ';
-	$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ');
 	if ($key{'title'} ne '') {
-	    $gnuplot_input .= 'title "'.$key{'title'}.'"'.$/;
-	} else {
-	    $gnuplot_input .= $/;
-	}
+	    $gnuplot_input .= 'title "'.$key{'title'}.'" ';
+	} 
+	$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     } else {
 	$gnuplot_input .= 'set nokey'.$/;
     }