version 1.272, 2003/08/13 18:57:28
|
version 1.333, 2004/07/27 23:35:34
|
Line 36
|
Line 36
|
# The C source of the Code may not be distributed by the Licensee |
# The C source of the Code may not be distributed by the Licensee |
# to any other parties under any circumstances. |
# to any other parties under any circumstances. |
# |
# |
# last modified 06/26/00 by Alexander Sakharuk |
|
# 11/6 Gerd Kortemeyer |
|
# 6/1/1 Gerd Kortemeyer |
|
# 2/21,3/13 Guy |
|
# 3/29,5/4 Gerd Kortemeyer |
|
# 5/26 Gerd Kortemeyer |
|
# 5/27 H. K. Ng |
|
# 6/2,6/3,6/8,6/9 Gerd Kortemeyer |
|
# 6/12,6/13 H. K. Ng |
|
# 6/16 Gerd Kortemeyer |
|
# 7/27 H. K. Ng |
|
# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20,8/23,8/24 Gerd Kortemeyer |
|
# Guy Albertelli |
|
# 9/26 Gerd Kortemeyer |
|
# Dec Guy Albertelli |
|
# YEAR=2002 |
|
# 1/1 Gerd Kortemeyer |
|
# 1/2 Matthew Hall |
|
# 1/3 Gerd Kortemeyer |
|
# |
|
|
|
package Apache::lonxml; |
package Apache::lonxml; |
use vars |
use vars |
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $prevent_entity_encode $errorcount $warningcount); |
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount @htmlareafields); |
use strict; |
use strict; |
use HTML::LCParser(); |
use HTML::LCParser(); |
use HTML::TreeBuilder(); |
use HTML::TreeBuilder(); |
Line 96 use Apache::style();
|
Line 77 use Apache::style();
|
use Apache::run(); |
use Apache::run(); |
use Apache::londefdef(); |
use Apache::londefdef(); |
use Apache::scripttag(); |
use Apache::scripttag(); |
|
use Apache::languagetags(); |
use Apache::edit(); |
use Apache::edit(); |
use Apache::inputtags(); |
use Apache::inputtags(); |
use Apache::outputtags(); |
use Apache::outputtags(); |
Line 105 use Apache::loncommon();
|
Line 87 use Apache::loncommon();
|
use Apache::lonfeedback(); |
use Apache::lonfeedback(); |
use Apache::lonmsg(); |
use Apache::lonmsg(); |
use Apache::loncacc(); |
use Apache::loncacc(); |
|
use Apache::lonlocal; |
|
|
#================================================== Main subroutine: xmlparse |
#================================================== Main subroutine: xmlparse |
#debugging control, to turn on debugging modify the correct handler |
#debugging control, to turn on debugging modify the correct handler |
Line 139 $evaluate = 1;
|
Line 122 $evaluate = 1;
|
# stores the list of active tag namespaces |
# stores the list of active tag namespaces |
@namespace=(); |
@namespace=(); |
|
|
# if 0 all high ASCII characters will be encoded into HTML Entities |
|
$prevent_entity_encode=0; |
|
|
|
# has the dynamic menu been updated to know about this resource |
# has the dynamic menu been updated to know about this resource |
$Apache::lonxml::registered=0; |
$Apache::lonxml::registered=0; |
|
|
Line 159 $Apache::lonxml::usestyle=1;
|
Line 139 $Apache::lonxml::usestyle=1;
|
$Apache::lonxml::style_values=''; |
$Apache::lonxml::style_values=''; |
$Apache::lonxml::style_end_values=''; |
$Apache::lonxml::style_end_values=''; |
|
|
|
#array of ssi calls that need to occur after we are done parsing |
|
@Apache::lonxml::ssi_info=(); |
|
|
|
#should we do the postag variable interpolation |
|
$Apache::lonxml::post_evaluate=1; |
|
|
|
#a header message to emit in the case of any generated warning or errors |
|
$Apache::lonxml::warnings_error_header=''; |
|
|
sub xmlbegin { |
sub xmlbegin { |
my $output=''; |
my $output=''; |
|
@htmlareafields=(); |
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$output='<?xml version="1.0"?>' |
$output='<?xml version="1.0"?>' |
.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>' |
.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>' |
Line 175 sub xmlbegin {
|
Line 165 sub xmlbegin {
|
} |
} |
|
|
sub xmlend { |
sub xmlend { |
my ($discussiononly,$symb)=@_; |
my $mode='xml'; |
my $discussion=''; |
my $status='OPEN'; |
if ($ENV{'request.course.id'}) { |
if ($Apache::lonhomework::parsing_a_problem) { |
my $crs='/'.$ENV{'request.course.id'}; |
$mode='problem'; |
if ($ENV{'request.course.sec'}) { |
$status=$Apache::inputtags::status[-1]; |
$crs.='_'.$ENV{'request.course.sec'}; |
|
} |
|
$crs=~s/\_/\//g; |
|
my $seeid=&Apache::lonnet::allowed('rin',$crs); |
|
unless ($symb) { |
|
$symb=&Apache::lonnet::symbread(); |
|
} |
|
if ($symb) { |
|
my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, |
|
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}); |
|
if ($contrib{'version'}) { |
|
unless ($discussiononly) { |
|
$discussion.= |
|
'<address><hr />'; |
|
} |
|
my $idx; |
|
for ($idx=1;$idx<=$contrib{'version'};$idx++) { |
|
my $hidden=($contrib{'hidden'}=~/\.$idx\./); |
|
my $deleted=($contrib{'deleted'}=~/\.$idx\./); |
|
unless ((($hidden) && (!$seeid)) || ($deleted)) { |
|
my $message=$contrib{$idx.':message'}; |
|
$message=~s/\n/\<br \/\>/g; |
|
$message=&Apache::lontexconvert::msgtexconverted($message); |
|
if ($contrib{$idx.':attachmenturl'}) { |
|
my ($fname,$ft) |
|
=($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); |
|
$message.='<p>Attachment: <a href="'. |
|
&Apache::lonnet::tokenwrapper($contrib{$idx.':attachmenturl'}). |
|
'"><tt>'.$fname.'.'.$ft.'</tt></a>'; |
|
} |
|
if ($message) { |
|
if ($hidden) { |
|
$message='<font color="#888888">'.$message.'</font>'; |
|
} |
|
my $screenname=&Apache::loncommon::screenname( |
|
$contrib{$idx.':sendername'}, |
|
$contrib{$idx.':senderdomain'}); |
|
my $plainname=&Apache::loncommon::nickname( |
|
$contrib{$idx.':sendername'}, |
|
$contrib{$idx.':senderdomain'}); |
|
|
|
my $sender='Anonymous'; |
|
if ((!$contrib{$idx.':anonymous'}) || ($seeid)) { |
|
$sender=&Apache::loncommon::aboutmewrapper( |
|
$plainname, |
|
$contrib{$idx.':sendername'}, |
|
$contrib{$idx.':senderdomain'}).' ('. |
|
$contrib{$idx.':sendername'}.' at '. |
|
$contrib{$idx.':senderdomain'}.')'; |
|
if ($contrib{$idx.':anonymous'}) { |
|
$sender.=' [anonymous] '. |
|
$screenname; |
|
} |
|
if ($seeid) { |
|
if ($hidden) { |
|
$sender.=' <a href="/adm/feedback?unhide='. |
|
$symb.':::'.$idx.'">Make Visible</a>'; |
|
} else { |
|
$sender.=' <a href="/adm/feedback?hide='. |
|
$symb.':::'.$idx.'">Hide</a>'; |
|
} |
|
$sender.=' <a href="/adm/feedback?deldisc='. |
|
$symb.':::'.$idx.'">Delete</a>'; |
|
} |
|
} else { |
|
if ($screenname) { |
|
$sender='<i>'.$screenname.'</i>'; |
|
} |
|
} |
|
$discussion.='<p><b>'.$sender.'</b> ('. |
|
localtime($contrib{$idx.':timestamp'}). |
|
'):<blockquote>'.$message. |
|
'</blockquote></p>'; |
|
} |
|
} |
|
} |
|
unless ($discussiononly) { |
|
$discussion.='</address>'; |
|
} |
|
} |
|
if ($discussiononly) { |
|
$discussion.=(<<ENDDISCUSS); |
|
<form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> |
|
<input type="submit" name="discuss" value="Post Discussion" /> |
|
<input type="submit" name="anondiscuss" value="Post Anonymous Discussion" /> |
|
<input type="hidden" name="symb" value="$symb" /> |
|
<input type="hidden" name="sendit" value="true" /> |
|
<br /> |
|
<font size="1">Note: in anonymous discussion, your name is visible only to |
|
course faculty</font><br /> |
|
<textarea name=comment cols=60 rows=10 wrap=hard></textarea> |
|
<p> |
|
Attachment (128 KB max size): <input type="file" name="attachment" /> |
|
</p> |
|
</form> |
|
ENDDISCUSS |
|
$discussion.=&Apache::lonfeedback::generate_preview_button(); |
|
} |
|
} |
|
} |
} |
return $discussion.($discussiononly?'':'</html>'); |
return &Apache::lonfeedback::list_discussion($mode,$status).'</html>'; |
} |
} |
|
|
sub tokeninputfield { |
sub tokeninputfield { |
Line 373 sub printtokenheader {
|
Line 263 sub printtokenheader {
|
my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); |
my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); |
return |
return |
'<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'. |
'<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'. |
'Checked out for '.$plainname. |
&mt('Checked out for').' '.$plainname. |
'<br />User: '.$tuname.' at '.$tudom. |
'<br />'.&mt('User').': '.$tuname.' at '.$tudom. |
'<br />ID: '.$idhash{$tuname}. |
'<br />'.&mt('ID').': '.$idhash{$tuname}. |
'<br />CourseID: '.$tcrsid. |
'<br />'.&mt('CourseID').': '.$tcrsid. |
'<br />Course: '.$ENV{'course.'.$tcrsid.'.description'}. |
'<br />'.&mt('Course').': '.$ENV{'course.'.$tcrsid.'.description'}. |
'<br />DocID: '.$token. |
'<br />'.&mt('DocID').': '.$token. |
'<br />Time: '.localtime().'<hr />'; |
'<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />'; |
} else { |
} else { |
return $token; |
return $token; |
} |
} |
Line 412 sub xmlparse {
|
Line 302 sub xmlparse {
|
&Apache::inputtags::initialize_inputtags(); |
&Apache::inputtags::initialize_inputtags(); |
&Apache::outputtags::initialize_outputtags(); |
&Apache::outputtags::initialize_outputtags(); |
&Apache::edit::initialize_edit(); |
&Apache::edit::initialize_edit(); |
|
&Apache::londefdef::initialize_londefdef(); |
|
|
# |
# |
# do we have a course style file? |
# do we have a course style file? |
Line 428 sub xmlparse {
|
Line 319 sub xmlparse {
|
&Apache::style::styleparser($target,$styletext)); |
&Apache::style::styleparser($target,$styletext)); |
} |
} |
} |
} |
|
} elsif ($ENV{'construct.style'} && ($ENV{'request.state'} eq 'construct')) { |
|
my $location=&Apache::lonnet::filelocation('',$ENV{'construct.style'}); |
|
my $styletext=&Apache::lonnet::getfile($location); |
|
if ($styletext ne '-1') { |
|
%style_for_target = (%style_for_target, |
|
&Apache::style::styleparser($target,$styletext)); |
|
} |
} |
} |
#&printalltags(); |
#&printalltags(); |
my @pars = (); |
my @pars = (); |
Line 452 sub xmlparse {
|
Line 350 sub xmlparse {
|
if ($ENV{'request.uri'}) { |
if ($ENV{'request.uri'}) { |
&writeallows($ENV{'request.uri'}); |
&writeallows($ENV{'request.uri'}); |
} |
} |
|
&do_registered_ssi(); |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
if ($Apache::lonxml::counter_changed) { &store_counter() } |
return $finaloutput; |
return $finaloutput; |
} |
} |
Line 481 sub latex_special_symbols {
|
Line 380 sub latex_special_symbols {
|
my ($string,$where)=@_; |
my ($string,$where)=@_; |
if ($where eq 'header') { |
if ($where eq 'header') { |
$string =~ s/(\\|_|\^)/ /g; |
$string =~ s/(\\|_|\^)/ /g; |
$string =~ s/(\$|%|\#|&|\{|\})/\\$1/g; |
$string =~ s/(\$|%|\{|\})/\\$1/g; |
|
$string =~ s/_/ /g; |
|
$string=&Apache::lonprintout::character_chart($string); |
|
# any & or # leftover should be safe to just escape |
|
$string=~s/([^\\])\&/$1\\\&/g; |
|
$string=~s/([^\\])\#/$1\\\#/g; |
} else { |
} else { |
$string=~s/\\ /\\char92 /g; |
$string=~s/\\/\\ensuremath{\\backslash}/g; |
$string=~s/\^/\\char94 /g; |
$string=~s/([^\\]|^)\%/$1\\\%/g; |
$string=~s/\~/\\char126 /g; |
$string=~s/([^\\]|^)\$/$1\\\$/g; |
$string=~s/(&[^A-Za-z\#])/\\$1/g; |
$string=~s/([^\\])\_/$1\\_/g; |
$string=~s/([^&])\#/$1\\#/g; |
$string=~s/\$\$/\$\\\$/g; |
$string=~s/(\$|_|{|})/\\$1/g; |
$string=~s/\_\_/\_\\\_/g; |
$string=~s/\\char92 /\\texttt{\\char92}/g; |
$string=~s/\#\#/\#\\\#/g; |
$string=~s/(>|<)/\$$1\$/g; #more or less |
$string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g; |
if ($string=~m/\d%/) {$string =~ s/(\d)%/$1\\%/g;} #percent after digit |
$string=~s/(>|<)/\\ensuremath\{$1\}/g; #more or less |
if ($string=~m/\s%/) {$string =~ s/(\s)%/$1\\%/g;} #percent after space |
$string=&Apache::lonprintout::character_chart($string); |
if ($string eq '%.') {$string = '\%.';} #percent at the end of statement |
# any & or # leftover should be safe to just escape |
|
$string=~s/([^\\]|^)\&/$1\\\&/g; |
|
$string=~s/([^\\]|^)\#/$1\\\#/g; |
|
$string=~s/\|/\$\\mid\$/g; |
|
#single { or } How to escape? |
} |
} |
return $string; |
return $string; |
} |
} |
Line 556 sub inner_xmlparse {
|
Line 464 sub inner_xmlparse {
|
#clear out any tags that didn't end |
#clear out any tags that didn't end |
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) { |
my $lasttag=$$stack[-1]; |
my $lasttag=$$stack[-1]; |
if ($token->[1] =~ /^$lasttag$/i) { |
if ($token->[1] =~ /^\Q$lasttag\E$/i) { |
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>'); |
last; |
last; |
} else { |
} else { |
Line 571 sub inner_xmlparse {
|
Line 479 sub inner_xmlparse {
|
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:"); |
} |
} |
#evaluate variable refs in result |
#evaluate variable refs in result |
if ($result ne "") { |
if ($Apache::lonxml::post_evaluate &&$result ne "") { |
my $extras; |
my $extras; |
if (!$Apache::lonxml::usestyle) { |
if (!$Apache::lonxml::usestyle) { |
$extras=$Apache::lonxml::style_values; |
$extras=$Apache::lonxml::style_values; |
Line 582 sub inner_xmlparse {
|
Line 490 sub inner_xmlparse {
|
$result= &Apache::run::evaluate($result,$safeeval,$extras); |
$result= &Apache::run::evaluate($result,$safeeval,$extras); |
} |
} |
} |
} |
|
$Apache::lonxml::post_evaluate=1; |
|
|
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) { |
#Style file definitions should be correct |
#Style file definitions should be correct |
if ($target eq 'tex' && ($Apache::lonxml::usestyle)) { |
if ($target eq 'tex' && ($Apache::lonxml::usestyle)) { |
Line 589 sub inner_xmlparse {
|
Line 499 sub inner_xmlparse {
|
} |
} |
} |
} |
|
|
# Encode any high ASCII characters |
|
if (!$Apache::lonxml::prevent_entity_encode) { |
|
$result=&HTML::Entities::encode($result,"\200-\377"); |
|
} |
|
if ($Apache::lonxml::redirection) { |
if ($Apache::lonxml::redirection) { |
$Apache::lonxml::outputstack['-1'] .= $result; |
$Apache::lonxml::outputstack['-1'] .= $result; |
} else { |
} else { |
Line 622 sub inner_xmlparse {
|
Line 528 sub inner_xmlparse {
|
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
|
## |
|
## Looks to see if there is a subroutine defined for this tag. If so, call it, |
|
## otherwise do not call it as we do not know what it is. |
|
## |
sub callsub { |
sub callsub { |
my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $currentstring=''; |
my $currentstring=''; |
Line 654 sub callsub {
|
Line 564 sub callsub {
|
$parstack,$parser,$safeeval, |
$parstack,$parser,$safeeval, |
$style); |
$style); |
} else { |
} else { |
|
if ($target eq 'tex') { |
|
# throw away tag name |
|
return ''; |
|
} |
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode"); |
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode"); |
if ($metamode <1) { |
if ($metamode <1) { |
if (defined($token->[4]) && ($metamode < 1)) { |
if (defined($token->[4]) && ($metamode < 1)) { |
Line 694 sub setup_globals {
|
Line 608 sub setup_globals {
|
my ($request,$target)=@_; |
my ($request,$target)=@_; |
$Apache::lonxml::request=$request; |
$Apache::lonxml::request=$request; |
$Apache::lonxml::registered = 0; |
$Apache::lonxml::registered = 0; |
|
@Apache::lonxml::htmlareafields=(); |
$errorcount=0; |
$errorcount=0; |
$warningcount=0; |
$warningcount=0; |
$Apache::lonxml::default_homework_loaded=0; |
$Apache::lonxml::default_homework_loaded=0; |
Line 701 sub setup_globals {
|
Line 616 sub setup_globals {
|
&init_counter(); |
&init_counter(); |
@Apache::lonxml::pwd=(); |
@Apache::lonxml::pwd=(); |
@Apache::lonxml::extlinks=(); |
@Apache::lonxml::extlinks=(); |
|
@Apache::lonxml::ssi_info=(); |
|
$Apache::lonxml::post_evaluate=1; |
|
$Apache::lonxml::warnings_error_header=''; |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
$Apache::lonxml::redirection = 0; |
$Apache::lonxml::redirection = 0; |
$Apache::lonxml::metamode = 1; |
$Apache::lonxml::metamode = 1; |
Line 744 sub init_safespace {
|
Line 662 sub init_safespace {
|
$safeeval->permit("entereval"); |
$safeeval->permit("entereval"); |
$safeeval->permit(":base_math"); |
$safeeval->permit(":base_math"); |
$safeeval->permit("sort"); |
$safeeval->permit("sort"); |
|
$safeeval->permit("time"); |
$safeeval->deny(":base_io"); |
$safeeval->deny(":base_io"); |
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse'); |
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse'); |
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart'); |
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT'); |
|
$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval, |
|
'&chem_standard_order'); |
|
|
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); |
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); |
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); |
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); |
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); |
Line 820 sub init_safespace {
|
Line 741 sub init_safespace {
|
$safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase'); |
$safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase'); |
$safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed'); |
$safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed'); |
$safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed'); |
$safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed'); |
|
$safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR'); |
|
$safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG'); |
|
$safehole->wrap(\&Apache::caparesponse::get_sigrange,$safeeval,'&LONCAPA_INTERNAL_get_sigrange'); |
|
|
#need to inspect this class of ops |
#need to inspect this class of ops |
# $safeeval->deny(":base_orig"); |
# $safeeval->deny(":base_orig"); |
|
$safeeval->permit("require"); |
$safeinit .= ';$external::target="'.$target.'";'; |
$safeinit .= ';$external::target="'.$target.'";'; |
my $rndseed; |
my $rndseed; |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
$safeinit .= ';$external::randomseed='.$rndseed.';'; |
$safeinit .= ';$external::randomseed="'.$rndseed.'";'; |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run($safeinit,$safeeval); |
&Apache::run::run($safeinit,$safeeval); |
|
|
} |
} |
|
|
sub default_homework_load { |
sub default_homework_load { |
Line 844 sub default_homework_load {
|
Line 770 sub default_homework_load {
|
} |
} |
} |
} |
|
|
|
my $metamode_was; |
sub startredirection { |
sub startredirection { |
$Apache::lonxml::redirection++; |
if (!$Apache::lonxml::redirection) { |
push (@Apache::lonxml::outputstack, ''); |
$metamode_was=$Apache::lonxml::metamode; |
|
} |
|
$Apache::lonxml::metamode=0; |
|
$Apache::lonxml::redirection++; |
|
push (@Apache::lonxml::outputstack, ''); |
} |
} |
|
|
sub endredirection { |
sub endredirection { |
if (!$Apache::lonxml::redirection) { |
if (!$Apache::lonxml::redirection) { |
&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller); |
&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller); |
return ''; |
return ''; |
} |
} |
$Apache::lonxml::redirection--; |
$Apache::lonxml::redirection--; |
pop @Apache::lonxml::outputstack; |
if (!$Apache::lonxml::redirection) { |
|
$Apache::lonxml::metamode=$metamode_was; |
|
} |
|
pop @Apache::lonxml::outputstack; |
} |
} |
|
|
sub end_tag { |
sub end_tag { |
Line 891 sub decreasedepth {
|
Line 825 sub decreasedepth {
|
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1; |
} |
} |
if ( $Apache::lonxml::depth < -1) { |
if ( $Apache::lonxml::depth < -1) { |
&Apache::lonxml::warning("Missing tags, unable to properly run file."); |
&Apache::lonxml::warning(&mt("Missing tags, unable to properly run file.")); |
$Apache::lonxml::depth='-1'; |
$Apache::lonxml::depth='-1'; |
} |
} |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
Line 901 sub decreasedepth {
|
Line 835 sub decreasedepth {
|
|
|
sub get_all_text_unbalanced { |
sub get_all_text_unbalanced { |
#there is a copy of this in lonpublisher.pm |
#there is a copy of this in lonpublisher.pm |
my($tag,$pars)= @_; |
my($tag,$pars)= @_; |
my $token; |
my $token; |
my $result=''; |
my $result=''; |
$tag='<'.$tag.'>'; |
$tag='<'.$tag.'>'; |
while ($token = $$pars[-1]->get_token) { |
while ($token = $$pars[-1]->get_token) { |
if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) { |
if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) { |
$result.=$token->[1]; |
$result.=$token->[1]; |
} elsif ($token->[0] eq 'PI') { |
} elsif ($token->[0] eq 'PI') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} elsif ($token->[0] eq 'S') { |
} elsif ($token->[0] eq 'S') { |
$result.=$token->[4]; |
$result.=$token->[4]; |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} |
} |
if ($result =~ /(.*)\Q$tag\E(.*)/s) { |
if ($result =~ /\Q$tag\E/is) { |
&Apache::lonxml::debug('Got a winner with leftovers ::'.$2); |
($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is; |
&Apache::lonxml::debug('Result is :'.$1); |
#&Apache::lonxml::debug('Got a winner with leftovers ::'.$2); |
$result=$1; |
#&Apache::lonxml::debug('Result is :'.$1); |
my $redo=$tag.$2; |
$redo=$tag.$redo; |
&Apache::lonxml::newparser($pars,\$redo); |
&Apache::lonxml::newparser($pars,\$redo); |
last; |
last; |
} |
} |
} |
} |
return $result |
return $result |
} |
} |
|
|
sub increment_counter { |
sub increment_counter { |
Line 954 sub store_counter {
|
Line 888 sub store_counter {
|
|
|
sub get_all_text { |
sub get_all_text { |
my($tag,$pars,$style)= @_; |
my($tag,$pars,$style)= @_; |
&Apache::lonxml::debug("Got a ".ref($pars)); |
|
my $gotfullstack=1; |
my $gotfullstack=1; |
if (ref($pars) ne 'ARRAY') { |
if (ref($pars) ne 'ARRAY') { |
$gotfullstack=0; |
$gotfullstack=0; |
$pars=[$pars]; |
$pars=[$pars]; |
} |
} |
&Apache::lonxml::debug("Got a ".ref($style)); |
|
if (ref($style) ne 'HASH') { |
if (ref($style) ne 'HASH') { |
$style={}; |
$style={}; |
} else { |
|
&Apache::lonhomework::showhash(%$style); |
|
} |
} |
my $depth=0; |
my $depth=0; |
my $token; |
my $token; |
Line 981 sub get_all_text {
|
Line 911 sub get_all_text {
|
} elsif ($token->[0] eq 'PI') { |
} elsif ($token->[0] eq 'PI') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} elsif ($token->[0] eq 'S') { |
} elsif ($token->[0] eq 'S') { |
if ($token->[1] =~ /^$tag$/i) { $depth++; } |
if ($token->[1] =~ /^\Q$tag\E$/i) { $depth++; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/i) { $Apache::lonxml::usestyle=1; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/) { $Apache::lonxml::usestyle=1; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/i) { $Apache::lonxml::usestyle=0; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/) { $Apache::lonxml::usestyle=0; } |
$result.=$token->[4]; |
$result.=$token->[4]; |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
if ( $token->[1] =~ /^$tag$/i) { $depth--; } |
if ( $token->[1] =~ /^\Q$tag\E$/i) { $depth--; } |
#skip sending back the last end tag |
#skip sending back the last end tag |
if ($depth == 0 && exists($$style{'/'.$token->[1]})) { |
if ($depth == 0 && exists($$style{'/'.$token->[1]}) && $Apache::lonxml::usestyle) { |
my $string= |
my $string= |
'<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'. |
'<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'. |
$$style{'/'.$token->[1]}. |
$$style{'/'.$token->[1]}. |
Line 1015 sub get_all_text {
|
Line 945 sub get_all_text {
|
#never found the end tag ran out of text, throw error send back blank |
#never found the end tag ran out of text, throw error send back blank |
&error('Never found end tag for <'.$tag. |
&error('Never found end tag for <'.$tag. |
'> current string <pre>'. |
'> current string <pre>'. |
&HTML::Entities::encode($result). |
&HTML::Entities::encode($result,'<>&"'). |
'</pre>'); |
'</pre>'); |
if ($gotfullstack) { |
if ($gotfullstack) { |
my $newstring='</'.$tag.'>'.$result; |
my $newstring='</'.$tag.'>'.$result; |
Line 1033 sub get_all_text {
|
Line 963 sub get_all_text {
|
} elsif ($token->[0] eq 'PI') { |
} elsif ($token->[0] eq 'PI') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} elsif ($token->[0] eq 'S') { |
} elsif ($token->[0] eq 'S') { |
if ( $token->[1] =~ /^$tag$/i) { |
if ( $token->[1] =~ /^\Q$tag\E$/i) { |
$$pars[-1]->unget_token($token); last; |
$$pars[-1]->unget_token($token); last; |
} else { |
} else { |
$result.=$token->[4]; |
$result.=$token->[4]; |
} |
} |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/i) { $Apache::lonxml::usestyle=1; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_ON$/) { $Apache::lonxml::usestyle=1; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/i) { $Apache::lonxml::usestyle=0; } |
if ($token->[1] =~ /^LONCAPA_INTERNAL_TURN_STYLE_OFF$/) { $Apache::lonxml::usestyle=0; } |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$result.=$token->[2]; |
$result.=$token->[2]; |
} |
} |
Line 1096 sub writeallows {
|
Line 1026 sub writeallows {
|
&Apache::lonnet::appenv(%httpref); |
&Apache::lonnet::appenv(%httpref); |
} |
} |
|
|
|
sub register_ssi { |
|
my ($url,%form)=@_; |
|
push (@Apache::lonxml::ssi_info,{'url'=>$url,'form'=>\%form}); |
|
return ''; |
|
} |
|
|
|
sub do_registered_ssi { |
|
foreach my $info (@Apache::lonxml::ssi_info) { |
|
my %form=%{ $info->{'form'}}; |
|
my $url=$info->{'url'}; |
|
&Apache::lonnet::ssi($url,%form); |
|
} |
|
} |
# |
# |
# Afterburner handles anchors, highlights and links |
# Afterburner handles anchors, highlights and links |
# |
# |
Line 1108 sub afterburn {
|
Line 1051 sub afterburn {
|
my $anchorname=$_; |
my $anchorname=$_; |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs; |
$result=~s/(\Q$matchthis\E)/\<font color=\"red\"\>$1\<\/font\>/gs; |
} |
} |
} |
} |
if ($ENV{'form.link'}) { |
if ($ENV{'form.link'}) { |
Line 1116 sub afterburn {
|
Line 1059 sub afterburn {
|
my ($anchorname,$linkurl)=split(/\>/,$_); |
my ($anchorname,$linkurl)=split(/\>/,$_); |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
$result=~s/(\Q$matchthis\E)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs; |
} |
} |
} |
} |
if ($ENV{'form.anchor'}) { |
if ($ENV{'form.anchor'}) { |
my $anchorname=$ENV{'form.anchor'}; |
my $anchorname=$ENV{'form.anchor'}; |
my $matchthis=$anchorname; |
my $matchthis=$anchorname; |
$matchthis=~s/\_+/\\s\+/g; |
$matchthis=~s/\_+/\\s\+/g; |
$result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s; |
$result=~s/(\Q$matchthis\E)/\<a name=\"$anchorname\"\>$1\<\/a\>/s; |
$result.=(<<"ENDSCRIPT"); |
$result.=(<<"ENDSCRIPT"); |
<script type="text/javascript"> |
<script type="text/javascript"> |
document.location.hash='$anchorname'; |
document.location.hash='$anchorname'; |
Line 1135 ENDSCRIPT
|
Line 1078 ENDSCRIPT
|
|
|
sub storefile { |
sub storefile { |
my ($file,$contents)=@_; |
my ($file,$contents)=@_; |
|
&Apache::lonnet::correct_line_ends(\$contents); |
if (my $fh=Apache::File->new('>'.$file)) { |
if (my $fh=Apache::File->new('>'.$file)) { |
print $fh $contents; |
print $fh $contents; |
$fh->close(); |
$fh->close(); |
Line 1146 sub storefile {
|
Line 1090 sub storefile {
|
} |
} |
|
|
sub createnewhtml { |
sub createnewhtml { |
my $filecontents=(<<SIMPLECONTENT); |
my $title=&mt('Title of document goes here'); |
|
my $body=&mt('Body of document goes here'); |
|
my $filecontents=(<<SIMPLECONTENT); |
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd"> |
<html> |
<html> |
<head> |
<head> |
<title> |
<title>$title</title> |
Title of Document Goes Here |
|
</title> |
|
</head> |
</head> |
<body bgcolor="#FFFFFF"> |
<body bgcolor="#FFFFFF"> |
|
$body |
Body of Document Goes Here |
|
|
|
</body> |
</body> |
</html> |
</html> |
SIMPLECONTENT |
SIMPLECONTENT |
|
return $filecontents; |
|
} |
|
|
|
sub createnewsty { |
|
my $filecontents=(<<SIMPLECONTENT); |
|
<definetag name=""> |
|
<render> |
|
<web></web> |
|
<tex></tex> |
|
</render> |
|
</definetag> |
|
SIMPLECONTENT |
return $filecontents; |
return $filecontents; |
} |
} |
|
|
|
|
sub inserteditinfo { |
sub inserteditinfo { |
my ($result,$filecontents)=@_; |
my ($result,$filecontents,$filetype)=@_; |
$filecontents = &HTML::Entities::encode($filecontents); |
$filecontents = &HTML::Entities::encode($filecontents,'<>&"'); |
# my $editheader='<a href="#editsection">Edit below</a><hr />'; |
# my $editheader='<a href="#editsection">Edit below</a><hr />'; |
my $xml_help = Apache::loncommon::helpLatexCheatsheet(); |
my $xml_help = ''; |
|
my $initialize=''; |
|
if ($filetype eq 'html') { |
|
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons(); |
|
$initialize=&Apache::lonhtmlcommon::htmlareaheaders(). |
|
&Apache::lonhtmlcommon::spellheader().(<<FULLPAGE); |
|
<script type="text/javascript"> |
|
$addbuttons |
|
|
|
HTMLArea.loadPlugin("FullPage"); |
|
|
|
function initDocument() { |
|
var editor=new HTMLArea("filecont",config); |
|
editor.registerPlugin(FullPage); |
|
editor.generate(); |
|
} |
|
</script> |
|
FULLPAGE |
|
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i; |
|
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
|
} |
|
my $cleanbut = ''; |
|
if ($filetype eq 'html') { |
|
$cleanbut='<input type="submit" name="attemptclean" value="'. |
|
&mt('Save and then attempt to clean HTML').'" />'; |
|
} |
my $titledisplay=&display_title(); |
my $titledisplay=&display_title(); |
|
my %lt=&Apache::lonlocal::texthash('st' => 'Save this', |
|
'vi' => 'View', |
|
'ed' => 'Edit'); |
my $buttons=(<<BUTTONS); |
my $buttons=(<<BUTTONS); |
<input type="submit" name="attemptclean" |
$cleanbut |
value="Save and then attempt to clean HTML" /> |
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" /> |
<input type="submit" name="savethisfile" value="Save this" /> |
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" /> |
<input type="submit" name="viewmode" value="View" /> |
|
BUTTONS |
BUTTONS |
|
$buttons.=&Apache::lonhtmlcommon::spelllink('xmledit','filecont'); |
my $editfooter=(<<ENDFOOTER); |
my $editfooter=(<<ENDFOOTER); |
|
$initialize |
<hr /> |
<hr /> |
<a name="editsection" /> |
<a name="editsection" /> |
<form method="post"> |
<form method="post" name="xmledit"> |
$xml_help |
$xml_help |
<input type="hidden" name="editmode" value="Edit" /> |
<input type="hidden" name="editmode" value="$lt{'ed'}" /> |
$buttons<br /> |
$buttons<br /> |
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea> |
<textarea cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea> |
<br />$buttons |
<br />$buttons |
<br /> |
<br /> |
</form> |
</form> |
$titledisplay |
$titledisplay |
|
</body> |
ENDFOOTER |
ENDFOOTER |
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
$result=~s/(\<\/body\>)/$editfooter/is; |
Line 1229 sub handler {
|
Line 1214 sub handler {
|
$Apache::lonxml::debug=$ENV{'user.debug'}; |
$Apache::lonxml::debug=$ENV{'user.debug'}; |
|
|
if ($ENV{'browser.mathml'}) { |
if ($ENV{'browser.mathml'}) { |
$request->content_type('text/xml'); |
&Apache::loncommon::content_type($request,'text/xml'); |
} else { |
} else { |
$request->content_type('text/html'); |
&Apache::loncommon::content_type($request,'text/html'); |
} |
} |
&Apache::loncommon::no_cache($request); |
&Apache::loncommon::no_cache($request); |
$request->send_http_header; |
$request->send_http_header; |
Line 1240 sub handler {
|
Line 1225 sub handler {
|
|
|
|
|
my $file=&Apache::lonnet::filelocation("",$request->uri); |
my $file=&Apache::lonnet::filelocation("",$request->uri); |
|
my $filetype; |
|
if ($file =~ /\.sty$/) { |
|
$filetype='sty'; |
|
} else { |
|
$filetype='html'; |
|
} |
# |
# |
# Edit action? Save file. |
# Edit action? Save file. |
# |
# |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) { |
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) { |
if (&storefile($file,$ENV{'form.filecont'})) { |
if (&storefile($file,$ENV{'form.filecont'})) { |
$request->print("<font COLOR=\"#0000FF\">Updated: ". strftime("%d %b %H:%M:%S",localtime())." </font>"); |
&Apache::lonxml::info("<font COLOR=\"#0000FF\">". |
|
&mt('Updated').": ". |
|
&Apache::lonlocal::locallocaltime(time). |
|
" </font>"); |
} |
} |
} |
} |
} |
} |
Line 1254 sub handler {
|
Line 1248 sub handler {
|
my $result = ''; |
my $result = ''; |
my $filecontents=&Apache::lonnet::getfile($file); |
my $filecontents=&Apache::lonnet::getfile($file); |
if ($filecontents eq -1) { |
if ($filecontents eq -1) { |
|
my $bodytag=&Apache::loncommon::bodytag('File Error'); |
|
my $fnf=&mt('File not found'); |
$result=(<<ENDNOTFOUND); |
$result=(<<ENDNOTFOUND); |
<html> |
<html> |
<head> |
<head> |
<title>File not found</title> |
<title>$fnf</title> |
</head> |
</head> |
<body bgcolor="#FFFFFF"> |
$bodytag |
<b>File not found: $file</b> |
<b>$fnf: $file</b> |
</body> |
</body> |
</html> |
</html> |
ENDNOTFOUND |
ENDNOTFOUND |
$filecontents=''; |
$filecontents=''; |
if ($ENV{'request.state'} ne 'published') { |
if ($ENV{'request.state'} ne 'published') { |
$filecontents=&createnewhtml(); |
if ($filetype eq 'sty') { |
|
$filecontents=&createnewsty(); |
|
} else { |
|
$filecontents=&createnewhtml(); |
|
} |
$ENV{'form.editmode'}='Edit'; #force edit mode |
$ENV{'form.editmode'}='Edit'; #force edit mode |
} |
} |
} else { |
} else { |
Line 1292 ENDNOTFOUND
|
Line 1292 ENDNOTFOUND
|
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) { |
my $displayfile=$request->uri; |
my $displayfile=$request->uri; |
$displayfile=~s/^\/[^\/]*//; |
$displayfile=~s/^\/[^\/]*//; |
$result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile. |
$result='<html><body bgcolor="#FFFFFF">'. |
|
&Apache::lonxml::message_location().'<h3>'. |
|
$displayfile. |
'</h3></body></html>'; |
'</h3></body></html>'; |
$result=&inserteditinfo($result,$filecontents); |
$result=&inserteditinfo($result,$filecontents,$filetype); |
} |
} |
} |
} |
|
if ($filetype eq 'html') { writeallows($request->uri); } |
|
|
|
|
writeallows($request->uri); |
&Apache::lonxml::add_messages(\$result); |
|
|
|
|
$request->print($result); |
$request->print($result); |
|
|
return OK; |
return OK; |
Line 1320 sub display_title {
|
Line 1322 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"); |
|
# &Apache::lonnet::logthis($_[0]); |
|
} |
} |
} |
|
|
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 "<b>ERROR:</b>".join("\n",@_)."\n"; |
push(@Apache::lonxml::error_messages, |
|
$Apache::lonxml::warnings_error_header. |
|
"<b>ERROR:</b>".join("<br />\n",@_)."<br />\n"); |
|
$Apache::lonxml::warnings_error_header=''; |
} else { |
} else { |
print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />"; |
push(@Apache::lonxml::error_messages, |
|
"<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 1345 sub error {
|
Line 1356 sub error {
|
"Error [$declutter]",join('<br />',@_)); |
"Error [$declutter]",join('<br />',@_)); |
} |
} |
} |
} |
|
|
#FIXME probably shouldn't have me get everything forever. |
|
&Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",join('<br />',@_)); |
|
#&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]); |
|
} |
} |
} |
} |
|
|
sub warning { |
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 ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) { |
print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n"; |
my $request=$Apache::lonxml::request; |
} |
if (!$request) { $request=Apache->request; } |
} |
push(@Apache::lonxml::warning_messages, |
|
$Apache::lonxml::warnings_error_header. |
|
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n"); |
|
$Apache::lonxml::warnings_error_header=''; |
|
} |
|
} |
|
} |
|
|
|
sub info { |
|
if ($ENV{'form.grade_target'} ne 'tex' |
|
&& $ENV{'request.state'} eq 'construct') { |
|
push(@Apache::lonxml::info_messages,join('<br />',@_)."<br />\n"); |
|
} |
|
} |
|
|
|
sub message_location { |
|
return '__LONCAPA_INTERNAL_MESSAGE_LOCATION__'; |
|
} |
|
|
|
sub add_messages { |
|
my ($msg)=@_; |
|
my $result=join(' ', |
|
@Apache::lonxml::info_messages, |
|
@Apache::lonxml::error_messages, |
|
@Apache::lonxml::warning_messages); |
|
undef(@Apache::lonxml::info_messages); |
|
undef(@Apache::lonxml::error_messages); |
|
undef(@Apache::lonxml::warning_messages); |
|
$$msg=~s/__LONCAPA_INTERNAL_MESSAGE_LOCATION__/$result/; |
|
$$msg=~s/__LONCAPA_INTERNAL_MESSAGE_LOCATION__//g; |
} |
} |
|
|
sub get_param { |
sub get_param { |
Line 1367 sub get_param {
|
Line 1403 sub get_param {
|
if ( ! $context ) { $context = -1; } |
if ( ! $context ) { $context = -1; } |
my $args =''; |
my $args =''; |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
|
if ( ! $Apache::lonxml::usestyle ) { |
|
$args=$Apache::lonxml::style_values.$args; |
|
} |
if ( ! $args ) { return undef; } |
if ( ! $args ) { return undef; } |
if ( $case_insensitive ) { |
if ( $case_insensitive ) { |
if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) { |
if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) { |
Line 1390 sub get_param_var {
|
Line 1429 sub get_param_var {
|
if ( ! $context ) { $context = -1; } |
if ( ! $context ) { $context = -1; } |
my $args =''; |
my $args =''; |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } |
|
if ( ! $Apache::lonxml::usestyle ) { |
|
$args=$Apache::lonxml::style_values.$args; |
|
} |
&Apache::lonxml::debug("Args are $args param is $param"); |
&Apache::lonxml::debug("Args are $args param is $param"); |
if ($case_insensitive) { |
if ($case_insensitive) { |
if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) { |
if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) { |