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.397 and 1.402

version 1.397, 2006/02/05 18:30:56	version 1.402, 2006/03/23 23:48:10
Line 971 sub decreasedepth {	Line 971 sub decreasedepth {
#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";	#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 {	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)= @_;
Line 1028 sub init_counter {	Line 1038 sub init_counter {

sub store_counter {	sub store_counter {
&Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));	&Apache::lonnet::appenv(('form.counter' => $Apache::lonxml::counter));
	$Apache::lonxml::counter_changed=0;
return '';	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 {	sub get_all_text {
my($tag,$pars,$style)= @_;	my($tag,$pars,$style)= @_;
my $gotfullstack=1;	my $gotfullstack=1;
Line 1421 sub handler {	Line 1458 sub handler {
my $result = '';	my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);	my $filecontents=&Apache::lonnet::getfile($file);
if ($filecontents eq -1) {	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('File Error');
my $fnf=&mt('File not found');	my $fnf=&mt('File not found');
$result=(<<ENDNOTFOUND);	$result=(<<ENDNOTFOUND);
<html>	$start_page
<head>
<title>$fnf</title>
</head>
$bodytag
<b>$fnf: $file</b>	<b>$fnf: $file</b>
</body>	$end_page
</html>
ENDNOTFOUND	ENDNOTFOUND
$filecontents='';	$filecontents='';
if ($env{'request.state'} ne 'published') {	if ($env{'request.state'} ne 'published') {
Line 1469 ENDNOTFOUND	Line 1502 ENDNOTFOUND
if ($env{'form.editmode'} && (!($env{'form.viewmode'}))) {	if ($env{'form.editmode'} && (!($env{'form.viewmode'}))) {
my $displayfile=$request->uri;	my $displayfile=$request->uri;
$displayfile=~s/^\/[^\/]*//;	$displayfile=~s/^\/[^\/]*//;
my $bodytag='<body bgcolor="#FFFFFF">';	my %options = ();
if ($env{'environment.remote'} eq 'off') {	if ($env{'environment.remote'} ne 'off') {
$bodytag=&Apache::loncommon::bodytag();	$options{'bgcolor'} = '#FFFFFF';
	$options{'only_body'} = 1;
}	}
$result='<html>'.$bodytag.	my $start_page = &Apache::loncommon::start_page(undef,undef,
	\%options);
	$result=$start_page.
&Apache::lonxml::message_location().'<h3>'.	&Apache::lonxml::message_location().'<h3>'.
$displayfile.	$displayfile.
'</h3></body></html>';	'</h3>'.&Apache::loncommon::end_page();
$result=&inserteditinfo($result,$filecontents,$filetype);	$result=&inserteditinfo($result,$filecontents,$filetype);
}	}
}	}
if ($filetype eq 'html') { writeallows($request->uri); }	if ($filetype eq 'html') { &writeallows($request->uri); }


&Apache::lonxml::add_messages(\$result);	&Apache::lonxml::add_messages(\$result);

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

Removed from v.1.397
changed lines
	Added in v.1.402