--- loncom/cgi/graph.png	2003/10/29 14:47:43	1.30
+++ loncom/cgi/graph.png	2005/05/25 22:31:51	1.35
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: graph.png,v 1.30 2003/10/29 14:47:43 matthew Exp $
+# $Id: graph.png,v 1.35 2005/05/25 22:31:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,19 +38,18 @@ graph.png
 
 =head1 SYNOPSIS
 
-produces plots based on input
+produces plots from data stored in users environment.
 
 =head1 DESCRIPTION
 
-graph.png is a cgi-bin script which produces plots based on input data.
-
-The query string is expected to be as follows (without whitespace):
-
-escape(Plot title) & escape(X label)& escape(Y label) & Maximum Y value &
-Number of bars & $data1 & $data2
-
-$data1 and $data2 are expected to be comma seperated lists of numbers.
-escape( value ) means the values must be run through lonnet::escape.
+graph.png is a cgi-bin script which produces plots based on data stored
+in the users environment.  The users cookie is checked prior to producing
+a plot.  The query string is expected to be an identifier, $id.  
+The parameters defining the plot must be stored in the environment as 
+$ENV{'cgi.'.$id.'.'.$dataname}.  Two types of plots can be produced, 'bar'
+and 'xy'.  The 'xy' graph can will 1 or 2 y-axes if the parameter
+'two_axes' is set to false or true respectively.  See perldoc GD::Graph and
+loncommon::DrawBarGraph, loncommon::DrawXYGraph, and loncommon::DrawXYYGraph.
 
 =cut
 
@@ -60,7 +59,7 @@ use GD::Graph::bars;
 use GD::Graph::lines;
 use GD::Graph::colour;
 use GD::Graph::Data;
-use LONCAPA::loncgi();
+use LONCAPA::loncgi;
 
 sub unescape {
     my $str=shift;
@@ -90,11 +89,11 @@ END
 my $id = $ENV{'QUERY_STRING'};
 
 #
-# &get_env($name,$default)
+# usage: &get_env($name,$default)
 sub get_env {
     my $key = 'cgi.'.$id.'.'.(shift());
-    return shift if (! exists($ENV{$key}));
-    return $ENV{$key};
+    return shift if (! exists($Apache::lonnet::env{$key}));
+    return $Apache::lonnet::env{$key};
 }
 
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
@@ -113,6 +112,9 @@ END
 
 $|=1;   # Autoflush after each print/write
 
+##
+## Set up the plot
+##
 my $colordefaults = join(',',
                          ('#33ff00', 
                           '#0033cc','#990000','#aaaa66','#663399','#ff9933',
@@ -143,7 +145,7 @@ my %GraphSettings = (
 
 $GraphSettings{'x_label_skip'}  = &get_env('xskip',1);
 $GraphSettings{'x_tick_offset'} = &get_env('x_tick_offset',0);
-$GraphSettings{'y_max_value'}   = &get_env('Max',1);
+$GraphSettings{'y_max_value'}   = &get_env('y_max_value',1);
 
 my $MyGraph;
 if ($PlotType eq 'bar') {
@@ -170,6 +172,9 @@ if ($PlotType eq 'bar') {
     $GraphSettings{'zero_axis'}     = 1;
     if (&get_env('two_axes',0)) {
         $GraphSettings{'two_axes'}     = 1;
+        $GraphSettings{'y1_label'}     = &get_env('y1_label',
+                                                  $GraphSettings{'y_label'});
+        $GraphSettings{'y2_label'}     = &get_env('y2_label','');
         $GraphSettings{'y1_max_value'} = &get_env('y1_max_value',0);
         $GraphSettings{'y1_min_value'} = &get_env('y1_min_value',1);
         $GraphSettings{'y2_max_value'} = &get_env('y2_max_value',1);
@@ -193,11 +198,13 @@ if (! defined($MyGraph)) {
 ##
 ## Build the @Data array
 my $NumSets = &get_env('NumSets');
-my @Data;  # stores the data for the graph
+my @Data;        # stores the data for the graph
+my @Legend;      # one entry per data set
 my @xlabels  = split(',',&get_env('labels'));
 push(@Data,\@xlabels);
 for (my $i=1;$i<=$NumSets;$i++) {
     push(@Data,[split(',',&get_env('data.'.$i))]);
+    push(@Legend,&get_env('data.'.$i.'.label',undef));
 }
 
 my $error = '';
@@ -206,6 +213,11 @@ if (! $MyGraph->set(%GraphSettings)) {
     return;
 }
 
+if (join('',@Legend) ne '') {
+    $MyGraph->set_legend(@Legend);
+}
+
+
 my $plot = $MyGraph->plot(\@Data);
 if (! defined($plot)) {
     my $error = 'Unable to plot the data provided.';