--- loncom/xml/lonxml.pm 2006/02/04 22:11:42 1.396
+++ loncom/xml/lonxml.pm 2006/07/11 09:44:04 1.415
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.396 2006/02/04 22:11:42 foxr Exp $
+# $Id: lonxml.pm,v 1.415 2006/07/11 09:44:04 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@
package Apache::lonxml;
use vars
-qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount @htmlareafields);
+qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace $errorcount $warningcount);
use strict;
use HTML::LCParser();
use HTML::TreeBuilder();
@@ -123,9 +123,6 @@ $evaluate = 1;
# stores the list of active tag namespaces
@namespace=();
-# has the dynamic menu been updated to know about this resource
-$Apache::lonxml::registered=0;
-
# a pointer the the Apache request object
$Apache::lonxml::request='';
@@ -162,28 +159,6 @@ sub disable_LaTeX_substitutions {
$Apache::lonxml::substitute_LaTeX_symbols = 0;
}
-sub xmlbegin {
- my ($style)=@_;
- my $output='';
- @htmlareafields=();
- if ($env{'browser.mathml'}) {
- $output='<?xml version="1.0"?>'
- #.'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'."\n"
-# .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
-
-# .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">] >'
- .'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">'
- .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '
- .'xmlns="http://www.w3.org/1999/xhtml">';
- } else {
- $output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>';
- }
- if ($style eq 'encode') {
- $output=&HTML::Entities::encode($output,'<>&"');
- }
- return $output;
-}
-
sub xmlend {
my ($target,$parser)=@_;
my $mode='xml';
@@ -204,9 +179,9 @@ sub xmlend {
$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
&Apache::lonxml::newparser($parser,\$discussion,'');
return '';
- } else {
- return $discussion.&Apache::loncommon::endbodytag();
}
+
+ return $discussion;
}
sub tokeninputfield {
@@ -304,18 +279,6 @@ sub printtokenheader {
}
}
-sub fontsettings {
- my $headerstring='';
- if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) {
- $headerstring.=
- '<meta Content-Type="text/html; charset=x-mac-roman" />';
- } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
- $headerstring.=
- '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
- }
- return $headerstring;
-}
-
sub printalltags {
my $temp;
foreach $temp (sort keys %Apache::lonxml::alltags) {
@@ -403,13 +366,14 @@ sub latex_special_symbols {
return $string;
}
if ($where eq 'header') {
- $string =~ s/(\\|_|\^)/ /g;
+ $string =~ s/\\/\$\\backslash\$/g; # \ -> $\backslash$ per LaTex line by line pg 10.
$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;
+ $string =~ s/_/\\_/g; # _ -> \_
+ $string =~ s/\^/\\\^{}/g; # ^ -> \^{}
} else {
$string=~s/\\/\\ensuremath{\\backslash}/g;
$string=~s/\\\%|\%/\\\%/g;
@@ -637,8 +601,6 @@ sub callsub {
sub setup_globals {
my ($request,$target)=@_;
$Apache::lonxml::request=$request;
- $Apache::lonxml::registered = 0;
- @Apache::lonxml::htmlareafields=();
$errorcount=0;
$warningcount=0;
$Apache::lonxml::default_homework_loaded=0;
@@ -649,6 +611,7 @@ sub setup_globals {
@Apache::lonxml::ssi_info=();
$Apache::lonxml::post_evaluate=1;
$Apache::lonxml::warnings_error_header='';
+ $Apache::lonxml::substitute_LaTeX_symbols = 1;
if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;
@@ -970,6 +933,16 @@ sub decreasedepth {
#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
}
+sub get_id {
+ my ($parstack,$safeeval)=@_;
+ my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ if ($env{'request.state'} eq 'construct' && $id =~ /(\.|_)/) {
+ &error(&mt("IDs are not allowed to contain "<tt>_</tt>" or "<tt>.</tt>""));
+ }
+ if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
+ return $id;
+}
+
sub get_all_text_unbalanced {
#there is a copy of this in lonpublisher.pm
my($tag,$pars)= @_;
@@ -1027,9 +1000,36 @@ sub init_counter {
sub store_counter {
&Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
+ $Apache::lonxml::counter_changed=0;
return '';
}
+{
+ my $state;
+ sub clear_problem_counter {
+ undef($state);
+ &Apache::lonnet::delenv('form.counter');
+ &Apache::lonxml::init_counter();
+ &Apache::lonxml::store_counter();
+ }
+
+ sub remember_problem_counter {
+ &Apache::lonnet::transfer_profile_to_env();
+ $state = $env{'form.counter'};
+ }
+
+ sub restore_problem_counter {
+ if (defined($state)) {
+ &Apache::lonnet::appenv(('form.counter' => $state));
+ }
+ }
+ sub get_problem_counter {
+ if ($Apache::lonxml::counter_changed) { &store_counter() }
+ &Apache::lonnet::transfer_profile_to_env();
+ return $env{'form.counter'};
+ }
+}
+
sub get_all_text {
my($tag,$pars,$style)= @_;
my $gotfullstack=1;
@@ -1289,8 +1289,7 @@ sub inserteditinfo {
my $initialize='';
if ($filetype eq 'html') {
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
- $initialize=&Apache::lonhtmlcommon::htmlareaheaders().
- &Apache::lonhtmlcommon::spellheader();
+ $initialize=&Apache::lonhtmlcommon::spellheader();
if (!&Apache::lonhtmlcommon::htmlareablocked() &&
&Apache::lonhtmlcommon::htmlareabrowser()) {
$initialize.=(<<FULLPAGE);
@@ -1420,17 +1419,13 @@ sub handler {
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {
- my $bodytag=&Apache::loncommon::bodytag('File Error');
+ my $start_page=&Apache::loncommon::start_page('File Error');
+ my $end_page=&Apache::loncommon::end_page();
my $fnf=&mt('File not found');
$result=(<<ENDNOTFOUND);
-<html>
-<head>
-<title>$fnf</title>
-</head>
-$bodytag
+$start_page
<b>$fnf: $file</b>
-</body>
-</html>
+$end_page
ENDNOTFOUND
$filecontents='';
if ($env{'request.state'} ne 'published') {
@@ -1468,18 +1463,20 @@ ENDNOTFOUND
if ($env{'form.editmode'} && (!($env{'form.viewmode'}))) {
my $displayfile=$request->uri;
$displayfile=~s/^\/[^\/]*//;
- my $bodytag='<body bgcolor="#FFFFFF">';
- if ($env{'environment.remote'} eq 'off') {
- $bodytag=&Apache::loncommon::bodytag();
+ my %options = ();
+ if ($env{'environment.remote'} ne 'off') {
+ $options{'bgcolor'} = '#FFFFFF';
}
- $result='<html>'.$bodytag.
+ my $start_page = &Apache::loncommon::start_page(undef,undef,
+ \%options);
+ $result=$start_page.
&Apache::lonxml::message_location().'<h3>'.
$displayfile.
- '</h3></body></html>';
+ '</h3>'.&Apache::loncommon::end_page();
$result=&inserteditinfo($result,$filecontents,$filetype);
}
}
- if ($filetype eq 'html') { writeallows($request->uri); }
+ if ($filetype eq 'html') { &writeallows($request->uri); }
&Apache::lonxml::add_messages(\$result);
@@ -1542,9 +1539,11 @@ sub error {
if ( !$symb ) {
#public or browsers
$errormsg=&mt("An error occured while processing this resource. The author has been notified.");
- }
+ }
+ my $host=$Apache::lonnet::perlvar{'lonHostID'};
+ my $msg = join('<br />',(@_,"The occured on host <tt>$host</tt>"));
#notify author
- &Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_));
+ &Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
#notify course
if ( $symb && $env{'request.course.id'} ) {
my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
@@ -1562,7 +1561,7 @@ sub error {
my $now=time;
if ($now-$lastnotified{$key}>86400) {
&Apache::lonmsg::user_normal_msg($user,$domain,
- "Error [$declutter]",join('<br />',@_));
+ "Error [$declutter]",$msg);
&Apache::lonnet::put('nohist_xmlerrornotifications',
{$key => $now},
$cdom,$cnum);