version 1.345, 2004/10/18 19:49:58
|
version 1.348, 2004/11/30 22:57:16
|
Line 1030 sub parstring {
|
Line 1030 sub parstring {
|
my $val=$token->[2]->{$_}; |
my $val=$token->[2]->{$_}; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
$val =~ s/(\$[^{a-zA-Z_])/\\$1/g; |
$val =~ s/(\$[^{a-zA-Z_])/\\$1/g; |
|
$val =~ s/(\$)$/\\$1/; |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
$temp .= "my \$$_=\"$val\";"; |
$temp .= "my \$$_=\"$val\";"; |
} |
} |
Line 1156 sub inserteditinfo {
|
Line 1157 sub inserteditinfo {
|
if ($filetype eq 'html') { |
if ($filetype eq 'html') { |
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons(); |
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons(); |
$initialize=&Apache::lonhtmlcommon::htmlareaheaders(). |
$initialize=&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::spellheader().(<<FULLPAGE); |
&Apache::lonhtmlcommon::spellheader(); |
|
if (!&Apache::lonhtmlcommon::htmlareablocked() && |
|
&Apache::lonhtmlcommon::htmlareabrowser()) { |
|
$initialize.=(<<FULLPAGE); |
<script type="text/javascript"> |
<script type="text/javascript"> |
$addbuttons |
$addbuttons |
|
|
Line 1169 $addbuttons
|
Line 1173 $addbuttons
|
} |
} |
</script> |
</script> |
FULLPAGE |
FULLPAGE |
|
} else { |
|
$initialize.=(<<FULLPAGE); |
|
<script type="text/javascript"> |
|
$addbuttons |
|
function initDocument() { |
|
} |
|
</script> |
|
FULLPAGE |
|
} |
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i; |
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i; |
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
} |
} |
Line 1360 sub debug {
|
Line 1373 sub debug {
|
my $request=$Apache::lonxml::request; |
my $request=$Apache::lonxml::request; |
if (!$request) { $request=Apache->request; } |
if (!$request) { $request=Apache->request; } |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
# &Apache::lonnet::logthis($_[0]); |
#&Apache::lonnet::logthis($_[0]); |
} |
} |
} |
} |
|
|
|
sub show_error_warn_msg { |
|
return (($Apache::lonxml::debug eq 1) || |
|
($ENV{'request.state'} eq 'construct') || |
|
($Apache::lonhomework::browse eq 'F' |
|
&& |
|
$ENV{'form.show_errors'} eq 'on')); |
|
} |
|
|
sub error { |
sub error { |
$errorcount++; |
$errorcount++; |
if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { |
if ( &show_error_warn_msg() ) { |
# If printing in construction space, put the error inside <pre></pre> |
# If printing in construction space, put the error inside <pre></pre> |
push(@Apache::lonxml::error_messages, |
push(@Apache::lonxml::error_messages, |
$Apache::lonxml::warnings_error_header. |
$Apache::lonxml::warnings_error_header. |
Line 1406 sub warning {
|
Line 1427 sub warning {
|
$warningcount++; |
$warningcount++; |
|
|
if ($ENV{'form.grade_target'} ne 'tex') { |
if ($ENV{'form.grade_target'} ne 'tex') { |
if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) { |
if ( &show_error_warn_msg() ) { |
my $request=$Apache::lonxml::request; |
my $request=$Apache::lonxml::request; |
if (!$request) { $request=Apache->request; } |
if (!$request) { $request=Apache->request; } |
push(@Apache::lonxml::warning_messages, |
push(@Apache::lonxml::warning_messages, |