--- loncom/cgi/graph.png 2001/12/21 14:45:36 1.4
+++ loncom/cgi/graph.png 2003/10/29 14:47:43 1.30
@@ -1,70 +1,241 @@
#!/usr/bin/perl
#
-# The LearningOnline Network with CAPA
+# $Id: graph.png,v 1.30 2003/10/29 14:47:43 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Behrouz Minaei
-# 9/13/2001, 9/25/2001
-# 10/6/2001, 10,9,2001
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/cgi-bin/graph.gif
+#
+# http://www.lon-capa.org/
+#
+# The LearningOnline Network with CAPA
#
# A CGI script that dynamically outputs a graphical chart for lonstatistics.
+#
+####
+
+=pod
+
+=head1 NAME
+
+graph.png
+
+=head1 SYNOPSIS
+
+produces plots based on input
+
+=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.
+
+=cut
use strict;
-use GD::Graph::bars3d;
+use lib '/home/httpd/lib/perl';
+use GD::Graph::bars;
+use GD::Graph::lines;
use GD::Graph::colour;
use GD::Graph::Data;
+use LONCAPA::loncgi();
-$|=1; # Autoflush after each print/write
-my ($cid, $Tag, $Max, $PNo, $data) = split(/&/,$ENV{'QUERY_STRING'});
+sub unescape {
+ my $str=shift;
+ $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ return $str;
+}
+
+sub error {
+ my ($error) = @_;
+ my $Str = <<"END";
+Content-type: text/html
+
+
+Bad Graph
+
+
+There was an error producing the graph you requested.
+
+$error
+
+
+
+END
+ return $Str;
+}
-my @data1=split(/\,/,$data);
-
-my @xlabels;
-for (my $nIdx=0; $nIdx<$PNo; $nIdx++ ) {
- $xlabels[$nIdx]=$nIdx+1;
-}
-my @data =(\@xlabels,\@data1);
-
-my $Range;
-if ( $PNo > 10 ) {$Range = 30*$PNo;}
-else { $Range = 300+30*$PNo; }
-
-if ( $Max <= 1 ) { $Max = 1; }
-elsif ( $Max <= 10 ) { $Max = 10; }
-elsif ( $Max >= 60 ) { $Max = 100; }
-
-my $MyGraph = GD::Graph::bars3d->new($Range, 400);
-
-$MyGraph->set(
- x_label => 'Problems #',
- y_label => $Tag,
- title => 'LON-CAPA Graphical Chart, Course: '.$cid,
- y_max_value => $Max,
- y_tick_number => 10,
- y_label_skip => 1,
- x_label_skip => 2,
-
- # colors
- dclrs => [ qw( green lblue lyellow lpurple cyan lorange)],
-
- # shadows
- bar_spacing => 4,
- shadow_depth => 1,
- shadowclr => 'dred',
+my $id = $ENV{'QUERY_STRING'};
- transparent => 0,
-) or warn $MyGraph->error;
+#
+# &get_env($name,$default)
+sub get_env {
+ my $key = 'cgi.'.$id.'.'.(shift());
+ return shift if (! exists($ENV{$key}));
+ return $ENV{$key};
+}
+
+if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
+ print <
+Bad Cookie
+
+Your cookie information is incorrect.
+
+