[BACK]Return to lonxml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.484 and 1.484.2.2

version 1.484, 2008/08/08 16:50:39 version 1.484.2.2, 2008/10/24 19:36:40
Line 505  sub inner_xmlparse { Line 505  sub inner_xmlparse {
   if (!$Apache::lonxml::usestyle) {    if (!$Apache::lonxml::usestyle) {
       $extras=$Apache::lonxml::style_values;        $extras=$Apache::lonxml::style_values;
   }    }
  if ( $#$parstack > -1 ) {            if ($token->[1] ne 'translated') {
   $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);        if ( $#$parstack > -1 ) {
  } else {            $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
   $result= &Apache::run::evaluate($result,$safeeval,$extras);        } else {
  }            $result=&Apache::run::evaluate($result,$safeeval,$extras);
         }
             }
       }        }
       $Apache::lonxml::post_evaluate=1;        $Apache::lonxml::post_evaluate=1;
   
Line 1854  sub error { Line 1856  sub error {
  my ($symb)=&Apache::lonnet::symbread();   my ($symb)=&Apache::lonnet::symbread();
  if ( !$symb ) {   if ( !$symb ) {
     #public or browsers      #public or browsers
     $errormsg=&mt("An error occured while processing this resource. The author has been notified.");      $errormsg=&mt("An error occurred while processing this resource. The author has been notified.");
  }   }
  my $host=$Apache::lonnet::perlvar{'lonHostID'};   my $host=$Apache::lonnet::perlvar{'lonHostID'};
  push(@errors,   push(@errors,
Line 1893  sub error { Line 1895  sub error {
  }   }
     }      }
     if ($env{'request.role.adv'}) {      if ($env{'request.role.adv'}) {
  $errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));   $errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
     } else {      } else {
  $errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");   $errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
     }      }
  }   }
  push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");   push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
Removed from v.1.484  
changed lines
  Added in v.1.484.2.2

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