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.362 and 1.371

version 1.362, 2005/03/10 19:10:31	version 1.371, 2005/04/07 00:42:07
Line 174 sub xmlend {	Line 174 sub xmlend {
my ($target,$parser)=@_;	my ($target,$parser)=@_;
my $mode='xml';	my $mode='xml';
my $status='OPEN';	my $status='OPEN';
if ($Apache::lonhomework::parsing_a_problem) {	if ($Apache::lonhomework::parsing_a_problem \|\|
	$Apache::lonhomework::parsing_a_task ) {
$mode='problem';	$mode='problem';
$status=$Apache::inputtags::status[-1];	$status=$Apache::inputtags::status[-1];
}	}
Line 320 sub xmlparse {	Line 321 sub xmlparse {

&setup_globals($request,$target);	&setup_globals($request,$target);
&Apache::inputtags::initialize_inputtags();	&Apache::inputtags::initialize_inputtags();
	&Apache::bridgetask::initialize_bridgetask();
&Apache::outputtags::initialize_outputtags();	&Apache::outputtags::initialize_outputtags();
&Apache::edit::initialize_edit();	&Apache::edit::initialize_edit();
&Apache::londefdef::initialize_londefdef();	&Apache::londefdef::initialize_londefdef();
Line 419 sub latex_special_symbols {	Line 421 sub latex_special_symbols {
$string=~s/([^\\])\#/$1\\\#/g;	$string=~s/([^\\])\#/$1\\\#/g;
} else {	} else {
$string=~s/\\/\\ensuremath{\\backslash}/g;	$string=~s/\\/\\ensuremath{\\backslash}/g;
$string=~s/([^\\]\|^)\%/$1\\\%/g;	$string=~s/\\\%\|\%/\\\%/g;
$string=~s/([^\\]\|^)\$/$1\\\$/g;	$string=~s/\\{\|{/\\{/g;
$string=~s/([^\\])\_/$1\\_/g;	$string=~s/\\}\|}/\\}/g;
$string=~s/\$\$/\$\\\$/g;	$string=~s/\\\$\|\$/\\\$/g;
$string=~s/\_\_/\_\\\_/g;	$string=~s/\\\_\|\_/\\\_/g;
$string=~s/\#\#/\#\\\#/g;
$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;	$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;
$string=~s/(>\|<)/\\ensuremath\{$1\}/g; #more or less	$string=~s/(>\|<)/\\ensuremath\{$1\}/g; #more or less
$string=&Apache::lonprintout::character_chart($string);	$string=&Apache::lonprintout::character_chart($string);
# any & or # leftover should be safe to just escape	# any & or # leftover should be safe to just escape
$string=~s/([^\\]\|^)\&/$1\\\&/g;	$string=~s/\\\&\|\&/\\\&/g;
$string=~s/([^\\]\|^)\#/$1\\\#/g;	$string=~s/\\\#\|\#/\\\#/g;
$string=~s/\\|/\$\\mid\$/g;	$string=~s/\\|/\$\\mid\$/g;
#single { or } How to escape?	#single { or } How to escape?
}	}
Line 694 sub init_safespace {	Line 695 sub init_safespace {
$safeeval->permit(":base_math");	$safeeval->permit(":base_math");
$safeeval->permit("sort");	$safeeval->permit("sort");
$safeeval->permit("time");	$safeeval->permit("time");
	$safeeval->deny("rand");
	$safeeval->deny("srand");
$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,	$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
'&chem_standard_order');	'&chem_standard_order');
	$safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status');

$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');
Line 1056 sub get_all_text {	Line 1060 sub get_all_text {
sub newparser {	sub newparser {
my ($parser,$contentref,$dir) = @_;	my ($parser,$contentref,$dir) = @_;
push (@$parser,HTML::LCParser->new($contentref));	push (@$parser,HTML::LCParser->new($contentref));
$$parser['-1']->xml_mode('1');	$$parser[-1]->xml_mode(1);
	$$parser[-1]->marked_sections(1);
if ( $dir eq '' ) {	if ( $dir eq '' ) {
push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);	push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
} else {	} else {
Line 1251 $initialize	Line 1256 $initialize
$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="44" name="filecont" id="filecont">$filecontents</textarea>	<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
<br />$buttons	<br />$buttons
<br />	<br />
</form>	</form>
Line 1297 sub handler {	Line 1302 sub handler {

$Apache::lonxml::debug=$ENV{'user.debug'};	$Apache::lonxml::debug=$ENV{'user.debug'};

if ($ENV{'browser.mathml'}) {	&Apache::loncommon::content_type($request,'text/html');
&Apache::loncommon::content_type($request,'text/xml');
} else {
&Apache::loncommon::content_type($request,'text/html');
}
&Apache::loncommon::no_cache($request);	&Apache::loncommon::no_cache($request);
$request->set_last_modified(&Apache::lonnet::metadata($request->uri,	if ($ENV{'request.state'} eq 'published') {
'lastrevisiondate'));	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
	'lastrevisiondate'));
	}
$request->send_http_header;	$request->send_http_header;

return OK if $request->header_only;	return OK if $request->header_only;
Line 1372 ENDNOTFOUND	Line 1375 ENDNOTFOUND
if (!$ENV{'form.editmode'} \|\| $ENV{'form.viewmode'}) {	if (!$ENV{'form.editmode'} \|\| $ENV{'form.viewmode'}) {
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,	$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
'',%mystyle);	'',%mystyle);
	undef($Apache::lonhomework::parsing_a_task);
}	}
}	}

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

Removed from v.1.362
changed lines
	Added in v.1.371