--- loncom/xml/lonxml.pm 2003/09/15 13:38:19 1.277
+++ loncom/xml/lonxml.pm 2004/03/19 22:06:53 1.312
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.277 2003/09/15 13:38:19 www Exp $
+# $Id: lonxml.pm,v 1.312 2004/03/19 22:06:53 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -96,6 +96,7 @@ use Apache::style();
use Apache::run();
use Apache::londefdef();
use Apache::scripttag();
+use Apache::languagetags();
use Apache::edit();
use Apache::inputtags();
use Apache::outputtags();
@@ -105,6 +106,7 @@ use Apache::loncommon();
use Apache::lonfeedback();
use Apache::lonmsg();
use Apache::loncacc();
+use Apache::lonlocal;
#================================================== Main subroutine: xmlparse
#debugging control, to turn on debugging modify the correct handler
@@ -159,6 +161,15 @@ $Apache::lonxml::usestyle=1;
$Apache::lonxml::style_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 {
my $output='';
if ($ENV{'browser.mathml'}) {
@@ -175,7 +186,13 @@ sub xmlbegin {
}
sub xmlend {
- return &Apache::lonfeedback::list_discussion().'</html>';
+ my $mode='xml';
+ my $status='OPEN';
+ if ($Apache::lonhomework::parsing_a_problem) {
+ $mode='problem';
+ $status=$Apache::inputtags::status[-1];
+ }
+ return &Apache::lonfeedback::list_discussion($mode,$status).'</html>';
}
sub tokeninputfield {
@@ -267,13 +284,13 @@ sub printtokenheader {
my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
return
'<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
- 'Checked out for '.$plainname.
- '<br />User: '.$tuname.' at '.$tudom.
- '<br />ID: '.$idhash{$tuname}.
- '<br />CourseID: '.$tcrsid.
- '<br />Course: '.$ENV{'course.'.$tcrsid.'.description'}.
- '<br />DocID: '.$token.
- '<br />Time: '.localtime().'<hr />';
+ &mt('Checked out for').' '.$plainname.
+ '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
+ '<br />'.&mt('ID').': '.$idhash{$tuname}.
+ '<br />'.&mt('CourseID').': '.$tcrsid.
+ '<br />'.&mt('Course').': '.$ENV{'course.'.$tcrsid.'.description'}.
+ '<br />'.&mt('DocID').': '.$token.
+ '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
} else {
return $token;
}
@@ -306,6 +323,7 @@ sub xmlparse {
&Apache::inputtags::initialize_inputtags();
&Apache::outputtags::initialize_outputtags();
&Apache::edit::initialize_edit();
+ &Apache::londefdef::initialize_londefdef();
#
# do we have a course style file?
@@ -322,6 +340,13 @@ sub xmlparse {
&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();
my @pars = ();
@@ -346,6 +371,7 @@ sub xmlparse {
if ($ENV{'request.uri'}) {
&writeallows($ENV{'request.uri'});
}
+ &do_registered_ssi();
if ($Apache::lonxml::counter_changed) { &store_counter() }
return $finaloutput;
}
@@ -375,20 +401,25 @@ sub latex_special_symbols {
my ($string,$where)=@_;
if ($where eq 'header') {
$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 {
- $string=~s/\\ /\\char92 /g;
- $string=~s/\^/\\char94 /g;
- $string=~s/\~/\\char126 /g;
- $string=~s/(&[^A-Za-z\#])/\\$1/g;
- $string=~s/([^&])\#/$1\\#/g;
- $string=~s/(\$|_|{|})/\\$1/g;
- $string=~s/\\char92 /\\texttt{\\char92}/g;
- $string=~s/(>|<)/\$$1\$/g; #more or less
- if ($string=~m/\d%/) {$string =~ s/(\d)%/$1\\%/g;} #percent after digit
- if ($string=~m/\s%/) {$string =~ s/(\s)%/$1\\%/g;} #percent after space
- if ($string eq '%.') {$string = '\%.';} #percent at the end of statement
+ $string=~s/\\/\\ensuremath{\\backslash}/g;
+ $string=~s/([^\\])\%/$1\\\%/g;
+ $string=~s/([^\\])(\$|_)/$1\\$2/g;
+ $string=~s/\$\$/\$\\\$/g;
+ $string=~s/\#\#/\#\\\#/g;
+ $string=~s/([^\\])(\~|\^)/$1\\$2\\strut /g;
+ $string=~s/(>|<)/\\ensuremath\{$1\}/g; #more or less
+ $string=&Apache::lonprintout::character_chart($string);
+ # any & or # leftover should be safe to just escape
+ $string=~s/([^\\])\&/$1\\\&/g;
+ $string=~s/([^\\])\#/$1\\\#/g;
+#single { or } How to escape?
}
return $string;
}
@@ -466,7 +497,7 @@ sub inner_xmlparse {
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
}
#evaluate variable refs in result
- if ($result ne "") {
+ if ($Apache::lonxml::post_evaluate &&$result ne "") {
my $extras;
if (!$Apache::lonxml::usestyle) {
$extras=$Apache::lonxml::style_values;
@@ -477,6 +508,8 @@ sub inner_xmlparse {
$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') ) {
#Style file definitions should be correct
if ($target eq 'tex' && ($Apache::lonxml::usestyle)) {
@@ -485,9 +518,9 @@ sub inner_xmlparse {
}
# Encode any high ASCII characters
- if (!$Apache::lonxml::prevent_entity_encode) {
- $result=&HTML::Entities::encode($result,"\200-\377");
- }
+# if (!$Apache::lonxml::prevent_entity_encode) {
+# $result=&HTML::Entities::encode($result,"\200-\377");
+# }
if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .= $result;
} else {
@@ -596,6 +629,9 @@ sub setup_globals {
&init_counter();
@Apache::lonxml::pwd=();
@Apache::lonxml::extlinks=();
+ @Apache::lonxml::ssi_info=();
+ $Apache::lonxml::post_evaluate=1;
+ $Apache::lonxml::warnings_error_header='';
if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
@@ -639,6 +675,7 @@ sub init_safespace {
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
$safeeval->permit("sort");
+ $safeeval->permit("time");
$safeeval->deny(":base_io");
$safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
$safehole->wrap(\&Apache::outputtags::multipart,$safeeval,'&multipart');
@@ -715,6 +752,8 @@ sub init_safespace {
$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_set_seed,$safeeval,'&random_set_seed');
+ $safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
+ $safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
#need to inspect this class of ops
# $safeeval->deny(":base_orig");
@@ -725,6 +764,28 @@ sub init_safespace {
$safeinit .= ';$external::randomseed='.$rndseed.';';
&Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run($safeinit,$safeeval);
+
+ my $subroutine=<<'EVALUATESUB';
+sub __LC_INTERNAL_EVALUATE__ {
+ my ($__LC__a,$__LC__b,$__LC__c)=@_;
+ my $__LC__prefix;
+ while(1){
+ {
+ use strict;
+ no strict "vars";
+ if (eval(defined(eval($__LC__a.$__LC__b)))) {
+ return $__LC__prefix.eval($__LC__a.$__LC__b.$__LC__c);
+ }
+ }
+ $__LC__prefix.=substr($__LC__a,0,1,"");
+ if ($__LC__a!~/^(\$|&|\#)/) { last; }
+ }
+ return $__LC__prefix.$__LC__a.$__LC__b.$__LC__c;
+}
+EVALUATESUB
+ $safeeval->permit("require");
+ $safeeval->reval($subroutine);
+ $safeeval->deny("require");
}
sub default_homework_load {
@@ -786,7 +847,7 @@ sub decreasedepth {
$Apache::lonxml::olddepth=$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';
}
my $curdepth=join('_',@Apache::lonxml::depthcounter);
@@ -849,17 +910,13 @@ sub store_counter {
sub get_all_text {
my($tag,$pars,$style)= @_;
- &Apache::lonxml::debug("Got a ".ref($pars));
my $gotfullstack=1;
if (ref($pars) ne 'ARRAY') {
$gotfullstack=0;
$pars=[$pars];
}
- &Apache::lonxml::debug("Got a ".ref($style));
if (ref($style) ne 'HASH') {
$style={};
- } else {
- &Apache::lonhomework::showhash(%$style);
}
my $depth=0;
my $token;
@@ -883,7 +940,7 @@ sub get_all_text {
} elsif ($token->[0] eq 'E') {
if ( $token->[1] =~ /^$tag$/i) { $depth--; }
#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=
'<LONCAPA_INTERNAL_TURN_STYLE_OFF end="yes" />'.
$$style{'/'.$token->[1]}.
@@ -991,6 +1048,19 @@ sub writeallows {
&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
#
@@ -1030,6 +1100,7 @@ ENDSCRIPT
sub storefile {
my ($file,$contents)=@_;
+ &Apache::lonnet::correct_line_ends(\$contents);
if (my $fh=Apache::File->new('>'.$file)) {
print $fh $contents;
$fh->close();
@@ -1081,21 +1152,24 @@ sub inserteditinfo {
}
my $cleanbut = '';
if ($filetype eq 'html') {
- $cleanbut='<input type="submit" name="attemptclean"
- value="Save and then attempt to clean HTML" />';
+ $cleanbut='<input type="submit" name="attemptclean" value="'.
+ &mt('Save and then attempt to clean HTML').'" />';
}
my $titledisplay=&display_title();
+ my %lt=&Apache::lonlocal::texthash('st' => 'Save this',
+ 'vi' => 'View',
+ 'ed' => 'Edit');
my $buttons=(<<BUTTONS);
$cleanbut
-<input type="submit" name="savethisfile" value="Save this" />
-<input type="submit" name="viewmode" value="View" />
+<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
+<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
BUTTONS
my $editfooter=(<<ENDFOOTER);
<hr />
<a name="editsection" />
<form method="post">
$xml_help
-<input type="hidden" name="editmode" value="Edit" />
+<input type="hidden" name="editmode" value="$lt{'ed'}" />
$buttons<br />
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
<br />$buttons
@@ -1143,9 +1217,9 @@ sub handler {
$Apache::lonxml::debug=$ENV{'user.debug'};
if ($ENV{'browser.mathml'}) {
- $request->content_type('text/xml');
+ &Apache::loncommon::content_type($request,'text/xml');
} else {
- $request->content_type('text/html');
+ &Apache::loncommon::content_type($request,'text/html');
}
&Apache::loncommon::no_cache($request);
$request->send_http_header;
@@ -1166,7 +1240,10 @@ sub handler {
unless ($ENV{'request.state'} eq 'published') {
if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
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>");
}
}
}
@@ -1174,13 +1251,15 @@ sub handler {
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {
+ my $bodytag=&Apache::loncommon::bodytag('File Error');
+ my $fnf=&mt('File not found');
$result=(<<ENDNOTFOUND);
<html>
<head>
-<title>File not found</title>
+<title>$fnf</title>
</head>
-<body bgcolor="#FFFFFF">
-<b>File not found: $file</b>
+$bodytag
+<b>$fnf: $file</b>
</body>
</html>
ENDNOTFOUND
@@ -1216,7 +1295,9 @@ ENDNOTFOUND
if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
my $displayfile=$request->uri;
$displayfile=~s/^\/[^\/]*//;
- $result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
+ $result='<html><body bgcolor="#FFFFFF">'.
+ &Apache::lonxml::message_location().'<h3>'.
+ $displayfile.
'</h3></body></html>';
$result=&inserteditinfo($result,$filecontents,$filetype);
}
@@ -1224,7 +1305,7 @@ ENDNOTFOUND
if ($filetype eq 'html') { writeallows($request->uri); }
-
+ &Apache::lonxml::add_messages(\$result);
$request->print($result);
return OK;
@@ -1244,19 +1325,27 @@ sub display_title {
}
sub debug {
- if ($Apache::lonxml::debug eq 1) {
- $|=1;
- print('<font size="-2"<pre>DEBUG:'.&HTML::Entities::encode($_[0])."</pre></font>\n");
- }
+ if ($Apache::lonxml::debug eq "1") {
+ $|=1;
+ 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 {
$errorcount++;
+ my $request=$Apache::lonxml::request;
+ if (!$request) { $request=Apache->request; }
if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
# 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 {
- 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
&Apache::lonmsg::author_res_msg($ENV{'request.filename'},join('<br />',@_));
#notify course
@@ -1269,21 +1358,46 @@ sub error {
"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 {
- $warningcount++;
+ $warningcount++;
- if ($ENV{'form.grade_target'} ne 'tex') {
- if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
- print "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n";
- }
- }
+ if ($ENV{'form.grade_target'} ne 'tex') {
+ if ($ENV{'request.state'} eq 'construct' || $Apache::lonxml::debug) {
+ 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 {
@@ -1291,6 +1405,9 @@ sub get_param {
if ( ! $context ) { $context = -1; }
my $args ='';
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+ if ( ! $Apache::lonxml::usestyle ) {
+ $args=$Apache::lonxml::style_values.$args;
+ }
if ( ! $args ) { return undef; }
if ( $case_insensitive ) {
if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
@@ -1314,6 +1431,9 @@ sub get_param_var {
if ( ! $context ) { $context = -1; }
my $args ='';
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");
if ($case_insensitive) {
if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {