--- loncom/xml/lonplot.pm	2001/12/17 21:43:12	1.1
+++ loncom/xml/lonplot.pm	2001/12/18 20:34:58	1.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.1 2001/12/17 21:43:12 matthew Exp $
+# $Id: lonplot.pm,v 1.4 2001/12/18 20:34:58 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,10 +25,13 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/21 Guy
+# 12/15/01 Matthew
+# 12/18 Matthew
 package Apache::lonplot;
 use strict;
 use Apache::response;
+use Apache::lonxml;
+use Digest::MD5  qw(md5 md5_hex md5_base64);
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::lonplot',('plot'));
@@ -103,53 +106,68 @@ sub start_plot {
     %plot = '';   %key='';    %axis=''; 
     $title='';    $xlabel=''; $ylabel='';
     @labels = ''; @curves='';
+
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    #
     &Apache::lonxml::register('Apache::plot',
 	     ('title','xlabel','ylabel','key','axis','label','curve'));
     push (@Apache::lonxml::namespace,'plot');
-    &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval);
-    return '';
-}
-
-sub get_attributes{
-    %values   = %{$_[0]};
-    %defaults = %{$_[1]};
-    $parstack = $_[2];
-    $safeeval = $_[3];
-    my $attr;
-    foreach $attr (keys %defaults) {
-	$values{$attr} = &Apache::lonxml::get_param($attr,$parstack,$safeeval);
-	my $test = $defaults{$attr}->{'test'};
-	$values{$attr} = (&$test($values{$attr}) ?
-			  $values{$attr}         :
-			  $defaults{$attr}      );
+    ## 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,'plot');
+    if ($target eq 'web') {
     }
-    return ;
+    return '';
 }
 
 sub end_plot {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     pop @Apache::lonxml::namespace;
-    my $result;
-    ## Determine filename
-    my $filename = 
-    ## Write the plot description to the file
-    ## return image tag for the plot
+    &Apache::lonxml::deregister('Apache::lonplot',
+	('title','xlabel','ylabel','key','axis','label','curve'));
+    my $result = '';
+    if ($target eq 'web') {
+	## Determine filename -- may need a better way later
+	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'});
+	
+	## Write the plot description to the file
+	my $fh=&Apache::File->new('/home/httpd/perl/tmp/'.$realname);
+	# write plot values
+	# write title, xlabel, ylabel
+	# write key values
+	# write axis values
+	# write label values
+	# write curve values
+	## Ack! 
+	## return image tag for the plot
+	$result = '<img src=\"/cgi-bin/plot.cgi?'.$usersees.'"';
+    }
     return $result;
 }
+
 ##----------------------------------------------------------------- key
 sub start_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval);
+    &get_attributes(\%key,\%key_defaults,$parstack,$safeeval,$tagstack);
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_key {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 ##------------------------------------------------------------------- title
@@ -157,12 +175,18 @@ 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') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_title {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 ##------------------------------------------------------------------- xlabel
@@ -170,12 +194,18 @@ 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') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_xlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 ##------------------------------------------------------------------- ylabel
@@ -183,28 +213,40 @@ 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') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_ylabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 ##------------------------------------------------------------------- label
 sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    my $label = &newhashref();
-    &get_attributes($label,\%label_defaults,$parstack,$safeeval);
+    my %label;
+    &get_attributes($label,\%label_defaults,$parstack,$safeeval,$tagstack);
     $label->{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
-    push(@labels,$label);
+    push(@labels,\%label);
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
@@ -212,19 +254,25 @@ sub end_label {
 sub start_curve {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    my $curve = &newhashref();
-    &get_attributes($curve,\%curve_defaults,$parstack,$safeeval);
+    my %curve;
+    &get_attributes($curve,\%curve_defaults,$parstack,$safeeval,$tagstack);
     push (@curves,$curve);
-    
-    &Apache::lonxml::register('Apache::plot',('function','data'));
+    &Apache::lonxml::register('Apache::lonplot',('function','data'));
     push (@Apache::lonxml::namespace,'curve');
-    
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 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') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
@@ -232,15 +280,24 @@ 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') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_function {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
@@ -248,14 +305,30 @@ sub end_function {
 sub start_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    push( @{$curves[-1]->{'data'}},
-	  &Apache::lonxml::get_all_text("/data",$$parser[-1]));
+    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+$|^\s+)//g;
+    $datatext =~ s/\s+/ /g;
+    if ($datatext !~ /^(([+-]?\d*\.?\d*)[, ]?)+$/) {
+	&Apache::lonxml::warning('Malformed data: '.$datatext);
+	$datatext = '';
+    }
+    push( @{$curves[-1]->{'data'}},$datatext;
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_data {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
@@ -263,22 +336,44 @@ sub end_data {
 sub start_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
-    &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval);
+    &get_attributes(\%axis,\%label_defaults,$parstack,$safeeval,$tagstack);
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 sub end_axis {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
+    if ($target eq 'web') {
+	# This routine should never return anything.
+    }
     return $result;
 }
 
 ##------------------------------------------------------------------- misc
-sub newhashref{
-    my %hash;
-    return \%hash;
+sub get_attributes{
+    %values   = %{shift};
+    %defaults = %{shift};
+    $parstack = shift;
+    $safeeval = shift;
+    $tag      = shift;
+    my $attr;
+    foreach $attr (keys %defaults) {
+	$values{$attr} = &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+	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};
+    }
+    return ;
 }
 
-
 1;
 __END__
+
+
+
+
+