--- loncom/xml/lonxml.pm 2003/08/13 14:23:37 1.271
+++ loncom/xml/lonxml.pm 2003/10/04 20:49:40 1.284
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.271 2003/08/13 14:23:37 www Exp $
+# $Id: lonxml.pm,v 1.284 2003/10/04 20:49:40 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -105,6 +105,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 +160,12 @@ $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;
+
sub xmlbegin {
my $output='';
if ($ENV{'browser.mathml'}) {
@@ -175,113 +182,13 @@ sub xmlbegin {
}
sub xmlend {
- my ($discussiononly,$symb)=@_;
- my $discussion='';
- if ($ENV{'request.course.id'}) {
- my $crs='/'.$ENV{'request.course.id'};
- if ($ENV{'request.course.sec'}) {
- $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();
- }
- }
+ my $mode='xml';
+ my $status='OPEN';
+ if ($Apache::lonhomework::parsing_a_problem) {
+ $mode='problem';
+ $status=$Apache::inputtags::status[-1];
}
- return $discussion.($discussiononly?'':'</html>');
+ return &Apache::lonfeedback::list_discussion().'</html>';
}
sub tokeninputfield {
@@ -373,13 +280,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;
}
@@ -452,6 +359,7 @@ sub xmlparse {
if ($ENV{'request.uri'}) {
&writeallows($ENV{'request.uri'});
}
+ &do_registered_ssi();
if ($Apache::lonxml::counter_changed) { &store_counter() }
return $finaloutput;
}
@@ -478,24 +386,25 @@ sub htmlclean {
}
sub latex_special_symbols {
- my ($current_token,$stack,$parstack,$where)=@_;
+ my ($string,$where)=@_;
if ($where eq 'header') {
- $current_token =~ s/(\\|_|\^)/ /g;
- $current_token =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+ $string =~ s/(\\|_|\^)/ /g;
+ $string =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
+ $string =~ s/_/ /g;
} else {
- $current_token=~s/\\ /\\char92 /g;
- $current_token=~s/\^/\\char94 /g;
- $current_token=~s/\~/\\char126 /g;
- $current_token=~s/(&[^A-Za-z\#])/\\$1/g;
- $current_token=~s/([^&])\#/$1\\#/g;
- $current_token=~s/(\$|_|{|})/\\$1/g;
- $current_token=~s/\\char92 /\\texttt{\\char92}/g;
- $current_token=~s/(>|<)/\$$1\$/g; #more or less
- if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
- if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
- if ($current_token eq '%.') {$current_token = '\%.';} #persent at the end of statement
+ $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
}
- return $current_token;
+ return $string;
}
sub inner_xmlparse {
@@ -571,7 +480,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;
@@ -582,17 +491,19 @@ 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)) {
- $result=&latex_special_symbols($result,$stack,$parstack);
+ $result=&latex_special_symbols($result);
}
}
# 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 {
@@ -701,6 +612,8 @@ sub setup_globals {
&init_counter();
@Apache::lonxml::pwd=();
@Apache::lonxml::extlinks=();
+ @Apache::lonxml::ssi_info=();
+ $Apache::lonxml::post_evaluate=1;
if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
@@ -891,7 +804,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);
@@ -954,17 +867,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;
@@ -988,7 +897,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]}.
@@ -1096,6 +1005,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
#
@@ -1163,25 +1085,47 @@ SIMPLECONTENT
return $filecontents;
}
+sub createnewsty {
+ my $filecontents=(<<SIMPLECONTENT);
+<definetag name="">
+ <render>
+ <web></web>
+ <tex></tex>
+ </render>
+</definetag>
+SIMPLECONTENT
+ return $filecontents;
+}
+
sub inserteditinfo {
- my ($result,$filecontents)=@_;
+ my ($result,$filecontents,$filetype)=@_;
$filecontents = &HTML::Entities::encode($filecontents);
# my $editheader='<a href="#editsection">Edit below</a><hr />';
- my $xml_help = Apache::loncommon::helpLatexCheatsheet();
+ my $xml_help = '';
+ if ($filetype eq 'html') {
+ $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 %lt=&Apache::lonlocal::texthash('st' => 'Save this',
+ 'vi' => 'View',
+ 'ed' => 'Edit');
my $buttons=(<<BUTTONS);
-<input type="submit" name="attemptclean"
- value="Save and then attempt to clean HTML" />
-<input type="submit" name="savethisfile" value="Save this" />
-<input type="submit" name="viewmode" value="View" />
+$cleanbut
+<input type="submit" name="savethisfile" value="$lt{'st'}" />
+<input type="submit" name="viewmode" 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
@@ -1229,9 +1173,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;
@@ -1240,13 +1184,20 @@ sub handler {
my $file=&Apache::lonnet::filelocation("",$request->uri);
+ my $filetype;
+ if ($file =~ /\.sty$/) {
+ $filetype='sty';
+ } else {
+ $filetype='html';
+ }
#
# Edit action? Save file.
#
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>");
+ $request->print("<font COLOR=\"#0000FF\">".&mt('Updated').": ".
+&Apache::lonlocal::locallocaltime(time)." </font>");
}
}
}
@@ -1254,19 +1205,25 @@ 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
$filecontents='';
if ($ENV{'request.state'} ne 'published') {
- $filecontents=&createnewhtml();
+ if ($filetype eq 'sty') {
+ $filecontents=&createnewsty();
+ } else {
+ $filecontents=&createnewhtml();
+ }
$ENV{'form.editmode'}='Edit'; #force edit mode
}
} else {
@@ -1294,11 +1251,11 @@ ENDNOTFOUND
$displayfile=~s/^\/[^\/]*//;
$result='<html><body bgcolor="#FFFFFF"><h3>'.$displayfile.
'</h3></body></html>';
- $result=&inserteditinfo($result,$filecontents);
+ $result=&inserteditinfo($result,$filecontents,$filetype);
}
}
-
- writeallows($request->uri);
+ if ($filetype eq 'html') { writeallows($request->uri); }
+
$request->print($result);