Diff for /loncom/xml/lonxml.pm between versions 1.297 and 1.302

version 1.297, 2004/01/21 02:33:05 version 1.302, 2004/02/19 19:29:40
Line 192  sub xmlend { Line 192  sub xmlend {
  $mode='problem';   $mode='problem';
  $status=$Apache::inputtags::status[-1];    $status=$Apache::inputtags::status[-1]; 
     }      }
     return &Apache::lonfeedback::list_discussion().'</html>';      return &Apache::lonfeedback::list_discussion($mode,$status).'</html>';
 }  }
   
 sub tokeninputfield {  sub tokeninputfield {
Line 405  sub latex_special_symbols { Line 405  sub latex_special_symbols {
  $string =~ s/_/ /g;   $string =~ s/_/ /g;
     } else {      } else {
  $string=~s/\\ /\\char92 /g;   $string=~s/\\ /\\char92 /g;
  $string=~s/\^/\\\^ /g;   $string=~s/\^/\\\^\\strut /g;
  $string=~s/\~/\\char126 /g;   $string=~s/\~/\\char126 /g;
  #fixup & if it doesn't look like   #fixup & if it doesn't look like
         # &#123; or &alpha;          # &#123; or &alpha;
  $string=~s/(&(?!((\#[0-9]+)|([a-z]+));))/\\$1/gi;   $string=~s/(&(?!((\#[0-9]+)|([a-z]+));))/\\$1/gi;
  $string=~s/([^&])\#/$1\\#/g;          $string=~s/([^&\\])\#/$1\\#/g;
    $string=~s/\#\#/\#\\#/g;
  $string=~s/(\$|_|{|})/\\$1/g;   $string=~s/(\$|_|{|})/\\$1/g;
  $string=~s/\\char92 /\\texttt{\\char92}/g;   $string=~s/\\char92 /\\texttt{\\char92}/g;
  $string=~s/(>|<)/\$$1\$/g; #more or less   $string=~s/(>|<)/\$$1\$/g; #more or less
Line 1294  sub display_title { Line 1295  sub display_title {
 }  }
   
 sub debug {  sub debug {
   if ($Apache::lonxml::debug eq 1) {      if ($Apache::lonxml::debug eq "1") {
     $|=1;   $|=1;
     print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");   my $request=$Apache::lonxml::request;
   }   if (!$request) { $request=Apache->request; }
    $request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
       }
 }  }
   
 sub error {  sub error {
   $errorcount++;    $errorcount++;
     my $request=$Apache::lonxml::request;
     if (!$request) { $request=Apache->request; }
   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {    if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
     # If printing in construction space, put the error inside <pre></pre>      # If printing in construction space, put the error inside <pre></pre>
       print $Apache::lonxml::warnings_error_header.        $request->print($Apache::lonxml::warnings_error_header.
   "<b>ERROR:</b>".join("\n",@_)."\n";        "<b>ERROR:</b>".join("\n",@_)."\n");
       $Apache::lonxml::warnings_error_header='';        $Apache::lonxml::warnings_error_header='';
   } else {    } else {
     print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";      $request->print("<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />");
     #notify author      #notify author
     &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));      &Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
     #notify course      #notify course
Line 1333  sub warning { Line 1338  sub warning {
       
     if ($ENV{'form.grade_target'} ne 'tex') {      if ($ENV{'form.grade_target'} ne 'tex') {
  if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {   if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
     print $Apache::lonxml::warnings_error_header.      my $request=$Apache::lonxml::request;
  "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";      if (!$request) { $request=Apache->request; }
       $request->print($Apache::lonxml::warnings_error_header.
         "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
     $Apache::lonxml::warnings_error_header='';      $Apache::lonxml::warnings_error_header='';
  }   }
     }      }

Removed from v.1.297  
changed lines
  Added in v.1.302


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