loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.320 and 1.326

version 1.320, 2004/06/03 14:28:39	version 1.326, 2004/07/07 20:43:20
Line 150 $Apache::lonxml::warnings_error_header='	Line 150 $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 604 sub setup_globals {	Line 605 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 662 sub init_safespace {	Line 664 sub init_safespace {
$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 736 sub init_safespace {	Line 740 sub init_safespace {
$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::error,$safeeval,'&LONCAPA_INTERNAL_ERROR');
$safehole->wrap(\&Apache::lonxml::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');	$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");
Line 839 sub decreasedepth {	Line 844 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(.)/is) {	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 1094 sub storefile {	Line 1099 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;	return $filecontents;
}	}

sub createnewsty {	sub createnewsty {
Line 1129 sub inserteditinfo {	Line 1133 sub inserteditinfo {
$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 = '';	my $xml_help = '';
	my $initialize='';
if ($filetype eq 'html') {	if ($filetype eq 'html') {
$xml_help=Apache::loncommon::helpLatexCheatsheet();	my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
	$initialize=&Apache::lonhtmlcommon::htmlareaheaders().(<<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 = '';	my $cleanbut = '';
if ($filetype eq 'html') {	if ($filetype eq 'html') {
Line 1147 $cleanbut	Line 1167 $cleanbut
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />	<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
BUTTONS	BUTTONS
my $editfooter=(<<ENDFOOTER);	my $editfooter=(<<ENDFOOTER);
	$initialize
<hr />	<hr />
<a name="editsection" />	<a name="editsection" />
<form method="post">	<form method="post">
$xml_help	$xml_help
<input type="hidden" name="editmode" value="$lt{'ed'}" />	<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;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.320
changed lines
	Added in v.1.326