--- loncom/xml/lonplot.pm	2001/12/20 20:24:36	1.11
+++ loncom/xml/lonplot.pm	2001/12/21 16:59:01	1.14
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.11 2001/12/20 20:24:36 matthew Exp $
+# $Id: lonplot.pm,v 1.14 2001/12/21 16:59:01 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,7 +26,7 @@
 # http://www.lon-capa.org/
 #
 # 12/15/01 Matthew
-# 12/18 12/19 12/20 Matthew
+# 12/17 12/18 12/19 12/20 12/21 Matthew
 package Apache::lonplot;
 
 use strict;
@@ -34,7 +34,7 @@ use Apache::File;
 use Apache::response;
 use Apache::lonxml;
 
-use Digest::MD5  qw(md5 md5_hex md5_base64);
+use Digest::MD5 qw(md5_base64);
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::lonplot',('plot'));
@@ -56,9 +56,9 @@ sub BEGIN {
 ##
 ##  @labels: $labels[$i] = \%label
 ##           %label: text, xpos, ypos, justify
-## 
+##
 ##  @curves: $curves[$i] = \%curve
-##        %curve: name, linestyle, ( function | data )
+##           %curve: name, linestyle, ( function | data )
 ##
 ##  $curves[$i]->{'data'} = [ [x1,x2,x3,x4],
 ##                            [y1,y2,y3,y4] ]
@@ -116,9 +116,9 @@ my %axis_defaults =
 
 my %curve_defaults = 
     (
-     color     => {default => 'x000000', test => $color_test             },
-     name      => {default => 'x000000', test => sub {1} },#sub {$_[0]=~/^[\w ]*$/} },
-     linestyle => {default => 'lines',   test => $linestyle_test         }
+     color     => {default => 'x000000', test => $color_test     },
+     name      => {default => '',        test => $words_test     },
+     linestyle => {default => 'lines',   test => $linestyle_test }
      );
 
 ##
@@ -155,20 +155,40 @@ sub end_plot {
 	('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';
     if ($target eq 'web') {
-	## Determine filename -- Need to use the 'id' thingy that Gerd 
-	## mentioned.
+	##
+	## Make sure we have all the input we need:
+	if (! defined(%plot  )) { &set_defaults(\%plot,\%plot_defaults); }
+	if (! defined(%key   )) {} # No key for this plot
+	if (! defined(%axis  )) { &set_defaults(\%axis,\%axis_defaults); }
+	if (! defined($title )) {} # No title for this plot
+	if (! defined($xlabel)) {} # No xlabel for this plot
+	if (! defined($ylabel)) {} # No ylabel for this plot
+	if ($#labels < 0) { } # No labels for this plot
+	if ($#curves < 0) { 
+	    &Apache::lonxml::warning("No curves specified for plot!!!!");
+	    return '';
+	}
+	my $curve;
+	foreach $curve (@curves) {
+	    if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
+		&Apache::lonxml::warning("One of the curves specified did not contain any <data> or <function> declarations\n");
+		return '';
+	    }
+	}
+	##
+	## Determine filename
 	my $tmpdir = '/home/httpd/perl/tmp/';
-	my $filename = $tmpdir.$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
-	    '_plot.data';
-	my $usersees=md5_base64($filename.'_'.$ENV{'REMOTE_ADDR'});
-	
+	my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+	    '_'.time.'_'.$$.'_plot.data';
 	## 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>'.$/;
+	my $fh=Apache::File->new(">$tmpdir$filename");
+	print $fh &write_gnuplot_file();
+	close($fh);
 	## return image tag for the plot
-	$result .= '<img src="/cgi-bin/plot.cgi?'.$usersees.'"/>';
+	$result .= <<"ENDIMAGE";
+<img src = "/cgi-bin/plot.gif?$filename" 
+     alt = "/cgi-bin/plot.gif?$filename" />
+ENDIMAGE
     }
     return $result;
 }
@@ -392,6 +412,16 @@ sub end_axis {
     return $result;
 }
 
+##----------------------------------------------------------- set_defaults
+sub set_defaults {
+    my $var      = shift;
+    my $defaults = shift;
+    my $key;
+    foreach $key (keys %$defaults) {
+	$var->{$key} = $defaults->{$key}->{'default'};
+    }
+}
+
 ##------------------------------------------------------------------- misc
 sub get_attributes{
     my $values   = shift;
@@ -419,19 +449,18 @@ sub get_attributes{
 }
 
 sub write_gnuplot_file {
-    my $fh = shift;
     my $gnuplot_input = '';
     my $curve;
     # Collect all the colors
     my @Colors;
     push @Colors, $plot{'bgcolor'};
     push @Colors, $plot{'fgcolor'}; 
-    push @Colors, $axis{'color'};
-    push @Colors, $axis{'color'}; 
+    push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'});
+    push @Colors, $Colors[-1];  # Redundancy
     foreach $curve (@curves) {
 	push @Colors, ($curve->{'color'} ne '' ? 
 		       $curve->{'color'}       : 
-		       $plot{'fgcolor'}      );
+		       $plot{'fgcolor'}        );
     }
     # set term
     $gnuplot_input .= 'set term gif ';
@@ -445,18 +474,16 @@ sub write_gnuplot_file {
     $gnuplot_input .= ($plot{'border'} eq 'on'?
 		       'set border'.$/           :
 		       'set noborder'.$/         );    # title, xlabel, ylabel
-    {
-    $gnuplot_input .= <<"ENDLABELS";
-set output 
-set title  "$title"
-set xlabel "$xlabel"
-set ylabel "$ylabel"
-set xrange \[$axis{'xmin'}:$axis{'xmax'}\]
-set yrange \[$axis{'ymin'}:$axis{'ymax'}\]
-ENDLABELS
+    $gnuplot_input .= "set output\n";
+    $gnuplot_input .= "set title  \"$title\"\n"  if (defined($title)) ;
+    $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel));
+    $gnuplot_input .= "set ylabel \"$ylabel\"\n" if (defined($ylabel));
+    if (defined(%axis)) {
+	$gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
+	$gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
     }
     # Key
-    if (defined($key{'pos'})) {
+    if (defined(%key)) {
 	$gnuplot_input .= 'set key '.$key{'pos'}.' ';
 	if ($key{'title'} ne '') {
 	    $gnuplot_input .= 'title "'.$key{'title'}.'" ';
@@ -464,7 +491,7 @@ ENDLABELS
 	$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
     } else {
 	$gnuplot_input .= 'set nokey'.$/;
-    }    
+    }
     # labels
     my $label;
     foreach $label (@labels) {
@@ -500,7 +527,6 @@ ENDLABELS
     }
     $gnuplot_input .= $/.$datatext;
     return $gnuplot_input;
-#    print $fh $gnuplot_input;
 }
 
 1;