Diff for /loncom/xml/run.pm between versions 1.15 and 1.18

version 1.15, 2001/02/19 20:43:00 version 1.18, 2001/07/20 21:19:38
Line 34  ENDEVALUATE Line 34  ENDEVALUATE
 sub evaluate {  sub evaluate {
   my ($expression,$safeeval,$decls) = @_;    my ($expression,$safeeval,$decls) = @_;
   unless (defined $expression) { return ''; }    unless (defined $expression) { return ''; }
     if (!$Apache::lonxml::evaluate) { return $expression; }
   my $result = '';    my $result = '';
   $@='';    $@='';
   print $decls  
   $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.    $safeeval->reval('{'.$decls.';$_=<<\'EXPRESSION\';'."\n".$expression.
    "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');     "\n".'EXPRESSION'."\n".$EVALUATE_STRING.'}');
 #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');  #  $safeeval->reval('{'.$decls.';<< &evaluate(q|'.$expression.'|);}');
Line 50  sub evaluate { Line 50  sub evaluate {
 }  }
   
 sub run {  sub run {
   my ($code,$safeeval) = @_;    my ($code,$safeeval,$hideerrors) = @_;
 #  print "inside run\n";  #  print "inside run\n";
   $@='';    $@='';
   my (@result)=$safeeval->reval($code);    my (@result)=$safeeval->reval($code);
   if ($@ ne '') {     if ($@ ne '' && !$hideerrors) {
     &Apache::lonxml::error(":$code:caused");       &Apache::lonxml::error(":$code:caused");
     &Apache::lonxml::error($@);       &Apache::lonxml::error($@);
   }    }
   if ( $#result < '1') {    if ( $#result < '1') {
     return $result[0];      return $result[0];

Removed from v.1.15  
changed lines
  Added in v.1.18


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>