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.449 and 1.484.4.2

version 1.449, 2007/08/03 23:29:54	version 1.484.4.2, 2009/03/20 20:59:54
Line 92 use Apache::loncacc();	Line 92 use Apache::loncacc();
use Apache::lonmaxima();	use Apache::lonmaxima();
use Apache::lonlocal;	use Apache::lonlocal;

#================================================== Main subroutine: xmlparse	#==================================== Main subroutine: xmlparse

#debugging control, to turn on debugging modify the correct handler	#debugging control, to turn on debugging modify the correct handler

$Apache::lonxml::debug=0;	$Apache::lonxml::debug=0;

# keeps count of the number of warnings and errors generated in a parse	# keeps count of the number of warnings and errors generated in a parse
Line 135 $Apache::lonxml::request='';	Line 137 $Apache::lonxml::request='';
$Apache::lonxml::counter=1;	$Apache::lonxml::counter=1;
$Apache::lonxml::counter_changed=0;	$Apache::lonxml::counter_changed=0;

	# Part counter hash. In analysis mode, the
	# problems can use this to record which parts increment the counter
	# by how much. The counter subs will maintain this hash via
	# their optional part parameters. Note that the assumption is that
	# analysis is done in one request and therefore it is not necessary to
	# save this information request-to-request.


	%Apache::lonxml::counters_per_part = ();

#internal check on whether to look at style defs	#internal check on whether to look at style defs
$Apache::lonxml::usestyle=1;	$Apache::lonxml::usestyle=1;

Line 349 sub xmlparse {	Line 361 sub xmlparse {
$safeeval,\%style_for_target,1);	$safeeval,\%style_for_target,1);

if (@stack) {	if (@stack) {
&warning("At end of file some tags were still left unclosed, ".	&warning(&mt('At end of file some tags were still left unclosed:').
'<tt><'.join('></tt>, <tt><',reverse(@stack)).	' <tt><'.join('></tt>, <tt><',reverse(@stack)).
'></tt>');	'></tt>');
}	}
if ($env{'request.uri'}) {	if ($env{'request.uri'}) {
Line 365 sub xmlparse {	Line 377 sub xmlparse {
$finaloutput .= join('',@script_var_displays);	$finaloutput .= join('',@script_var_displays);
undef(@script_var_displays);	undef(@script_var_displays);
}	}
	&init_state();
if ($env{'form.return_only_error_and_warning_counts'}) {	if ($env{'form.return_only_error_and_warning_counts'}) {
	if ($env{'request.filename'}=~/\.(html\|htm\|xml)$/i) {
	my $error=&verify_html($content_file_string);
	if ($error) { $errorcount++; }
	}
return "$errorcount:$warningcount";	return "$errorcount:$warningcount";
}	}
return $finaloutput;	return $finaloutput;
Line 470 sub inner_xmlparse {	Line 486 sub inner_xmlparse {
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
my $lasttag=$$stack[-1];	my $lasttag=$$stack[-1];
if ($token->[1] =~ /^\Q$lasttag\E$/i) {	if ($token->[1] =~ /^\Q$lasttag\E$/i) {
&Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>');	&Apache::lonxml::warning(&mt('Using tag [_1] on line [_2] as end tag to [_3]','</'.$token->[1].'>','.$token->[3].','<'.$$stack[-1].'>'));
last;	last;
} else {	} else {
&Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file');	&Apache::lonxml::warning(&mt('Found tag [_1] on line [_2] when looking for [_3] in file.','</'.$token->[1].'>',$token->[3],'</'.$$stack[-1].'>'));
&end_tag($stack,$parstack,$token);	&end_tag($stack,$parstack,$token);
}	}
}	}
Line 619 sub callsub {	Line 635 sub callsub {
return $currentstring;	return $currentstring;
}	}

	{
	my %state;

	sub init_state {
	undef(%state);
	}

	sub set_state {
	my ($key,$value) = @_;
	$state{$key} = $value;
	return $value;
	}
	sub get_state {
	my ($key) = @_;
	return $state{$key};
	}
	}

sub setup_globals {	sub setup_globals {
my ($request,$target)=@_;	my ($request,$target)=@_;
$Apache::lonxml::request=$request;	$Apache::lonxml::request=$request;
$errorcount=0;	$errorcount=0;
$warningcount=0;	$warningcount=0;
	$Apache::lonxml::internal_error=0;
$Apache::lonxml::default_homework_loaded=0;	$Apache::lonxml::default_homework_loaded=0;
$Apache::lonxml::usestyle=1;	$Apache::lonxml::usestyle=1;
&init_counter();	&init_counter();
	&clear_bubble_lines_for_part();
	&init_state();
	&set_state('target',$target);
@Apache::lonxml::pwd=();	@Apache::lonxml::pwd=();
@Apache::lonxml::extlinks=();	@Apache::lonxml::extlinks=();
@script_var_displays=();	@script_var_displays=();
Line 681 sub init_safespace {	Line 719 sub init_safespace {
$safeeval->permit(":base_math");	$safeeval->permit(":base_math");
$safeeval->permit("sort");	$safeeval->permit("sort");
$safeeval->permit("time");	$safeeval->permit("time");
	$safeeval->permit("caller");
$safeeval->deny("rand");	$safeeval->deny("rand");
$safeeval->deny("srand");	$safeeval->deny("srand");
$safeeval->deny(":base_io");	$safeeval->deny(":base_io");
Line 690 sub init_safespace {	Line 729 sub init_safespace {
$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(\&Apache::response::check_status,$safeeval,'&check_status');
	$safehole->wrap(\&Apache::response::implicit_multiplication,$safeeval,'&implicit_multiplication');

$safehole->wrap(\&Apache::lonmaxima::maxima_eval,$safeeval,'&maxima_eval');	$safehole->wrap(\&Apache::lonmaxima::maxima_eval,$safeeval,'&maxima_eval');
$safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');	$safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
Line 699 sub init_safespace {	Line 739 sub init_safespace {
$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,	$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
'&capa_formula_fix');	'&capa_formula_fix');

	$safehole->wrap(\&Apache::lonlocal::locallocaltime,$safeeval,
	'&locallocaltime');

$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 800 sub init_safespace {	Line 843 sub init_safespace {
$safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase');	$safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase');
$safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed');	$safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed');
$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::loncommon::languages,$safeeval,'&languages');
$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::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');	$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');
Line 908 sub endredirection {	Line 952 sub endredirection {
}	}
pop @Apache::lonxml::outputstack;	pop @Apache::lonxml::outputstack;
}	}
	sub in_redirection {
	return ($Apache::lonxml::redirection > 0)
	}

sub end_tag {	sub end_tag {
my ($tagstack,$parstack,$token)=@_;	my ($tagstack,$parstack,$token)=@_;
Line 1005 sub get_all_text_unbalanced {	Line 1052 sub get_all_text_unbalanced {
}	}
}	}
return $result	return $result

}	}

	#########################################################################
	# #
	# bubble line counter management #
	# #
	#########################################################################

=pod	=pod

For bubble grading mode and exam bubble printing mode, the tracking of	For bubble grading mode and exam bubble printing mode, the tracking of
Line 1022 Increments the internal counter environm	Line 1076 Increments the internal counter environm

Optional Arguments:	Optional Arguments:
$increment - amount to increment by (defaults to 1)	$increment - amount to increment by (defaults to 1)
	Also 1 if the value is negative or zero.
	$part_response - A concatenation of the part and response id
	identifying exactly what is being 'answered'.


=cut	=cut

sub increment_counter {	sub increment_counter {
my ($increment) = @_;	my ($increment, $part_response) = @_;
if (defined($increment) && $increment gt 0) {	if ($env{'form.grade_noincrement'}) { return; }
$Apache::lonxml::counter+=$increment;	if (!defined($increment) \|\| $increment le 0) {
} else {	$increment = 1;
$Apache::lonxml::counter++;	}
	$Apache::lonxml::counter += $increment;

	# If the caller supplied the response_id parameter,
	# Maintain its counter.. creating if necessary.

	if (defined($part_response)) {
	if (!defined($Apache::lonxml::counters_per_part{$part_response})) {
	$Apache::lonxml::counters_per_part{$part_response} = 0;
	}
	$Apache::lonxml::counters_per_part{$part_response} += $increment;
	my $new_value = $Apache::lonxml::counters_per_part{$part_response};
}	}

$Apache::lonxml::counter_changed=1;	$Apache::lonxml::counter_changed=1;
}	}

Line 1057 sub init_counter {	Line 1127 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;	$Apache::lonxml::counter_changed=0;
return '';	return '';
}	}
Line 1078 sub store_counter {	Line 1148 sub store_counter {

sub restore_problem_counter {	sub restore_problem_counter {
if (defined($state)) {	if (defined($state)) {
&Apache::lonnet::appenv(('form.counter' => $state));	&Apache::lonnet::appenv({'form.counter' => $state});
}	}
}	}
sub get_problem_counter {	sub get_problem_counter {
Line 1088 sub store_counter {	Line 1158 sub store_counter {
}	}
}	}

	=pod

	=item bubble_lines_for_part(part_response)

	Returns the number of lines required to get a response for
	$part_response (this is just $Apache::lonxml::counters_per_part{$part_response}

	=cut

	sub bubble_lines_for_part {
	my ($part_response) = @_;

	if (!defined($Apache::lonxml::counters_per_part{$part_response})) {
	return 0;
	} else {
	return $Apache::lonxml::counters_per_part{$part_response};
	}
	}

	=pod

	=item clear_bubble_lines_for_part

	Clears the hash of bubble lines per part. If a caller
	needs to analyze several resources this should be called between
	resources to reset the hash for each problem being analyzed.

	=cut

	sub clear_bubble_lines_for_part {
	undef(%Apache::lonxml::counters_per_part);
	}

	=pod

	=item set_bubble_lines(part_response, value)

	If there is a problem part, that for whatever reason
	requires bubble lines that are not
	the same as the counter increment, it can call this sub during
	analysis to set its hash value explicitly.

	=cut

	sub set_bubble_lines {
	my ($part_response, $value) = @_;

	$Apache::lonxml::counters_per_part{$part_response} = $value;
	}

	=pod

	=item get_bubble_line_hash

	Returns the current bubble line hash. This is assumed to
	be small so we return a copy


	=cut

	sub get_bubble_line_hash {
	return %Apache::lonxml::counters_per_part;
	}


	#--------------------------------------------------

sub get_all_text {	sub get_all_text {
my($tag,$pars,$style)= @_;	my($tag,$pars,$style)= @_;
my $gotfullstack=1;	my $gotfullstack=1;
Line 1248 sub writeallows {	Line 1385 sub writeallows {
&Apache::lonnet::hreflocation($thisdir,&unescape($_))}=$thisurl;	&Apache::lonnet::hreflocation($thisdir,&unescape($_))}=$thisurl;
}	}
@extlinks=();	@extlinks=();
&Apache::lonnet::appenv(%httpref);	&Apache::lonnet::appenv(\%httpref);
}	}

sub register_ssi {	sub register_ssi {
Line 1315 sub storefile {	Line 1452 sub storefile {
$fh->close();	$fh->close();
return 1;	return 1;
} else {	} else {
&warning("Unable to save file $file");	&warning(&mt('Unable to save file [_1]','<tt>'.$file.'</tt>'));
return 0;	return 0;
}	}
}	}
Line 1348 SIMPLECONTENT	Line 1485 SIMPLECONTENT
return $filecontents;	return $filecontents;
}	}

	sub verify_html {
	my ($filecontents)=@_;
	if ($filecontents!~/(?:\<\|\&lt\;)(?:html\|xml)[^\<]*(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] starting tag','<html>','<xml>');
	}
	if ($filecontents!~/(?:\<\|\&lt\;)\/(?:html\|xml)(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] ending tag','<html>','<xml>');
	}
	if ($filecontents!~/(?:\<\|\&lt\;)(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>');
	}
	if ($filecontents!~/(?:\<\|\&lt\;)\/(?:body\|frameset)[^\<]*(?:\>\|\&gt\;)/is) {
	return &mt('File does not have [_1] or [_2] ending tag','<body>','<frameset>');
	}
	return '';
	}

	sub renderingoptions {
	my %langchoices=('' => '');
	foreach (&Apache::loncommon::languageids()) {
	if (&Apache::loncommon::supportedlanguagecode($_)) {
	$langchoices{&Apache::loncommon::supportedlanguagecode($_)}
	= &Apache::loncommon::plainlanguagedescription($_);
	}
	}
	return
	'<span class="LC_nobreak">'.
	&mt('Language:').' '.
	&Apache::loncommon::select_form($env{'form.languages'},'languages',
	%langchoices).'
	</span>
	<span class="LC_nobreak">'.
	&mt('Math Rendering:').' '.
	&Apache::loncommon::select_form($env{'form.texengine'},'texengine',
	('' => '',
	'tth' => 'tth (TeX to HTML)',
	'jsMath' => 'jsMath',
	'mimetex' => 'mimetex (Convert to Images)')).'
	</span>';
	}

sub inserteditinfo {	sub inserteditinfo {
my ($result,$filecontents,$filetype)=@_;	my ($filecontents, $filetype, $filename)=@_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');	$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $xml_help = '';	my $xml_help = '';
my $initialize='';	my $initialize='';
if ($filetype eq 'html') {	my $textarea_id = 'filecont';
my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();	my ($add_to_onload, $add_to_onresize);
$initialize=&Apache::lonhtmlcommon::spellheader();	$initialize=&Apache::lonhtmlcommon::spellheader();
if (!&Apache::lonhtmlcommon::htmlareablocked() &&	if ($filetype eq 'html'
&Apache::lonhtmlcommon::htmlareabrowser()) {	&& (!&Apache::lonhtmlcommon::htmlareablocked() &&
$initialize.=(<<FULLPAGE);	&Apache::lonhtmlcommon::htmlareabrowser())) {
	$textarea_id .= '___Frame';
	my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
	$initialize.=(<<FULLPAGE);
<script type="text/javascript">	<script type="text/javascript">
$addbuttons	lonca

HTMLArea.loadPlugin("FullPage");

function initDocument() {	function initDocument() {
var editor=new HTMLArea("filecont",config);	var oFCKeditor = new FCKeditor('filecont');
editor.registerPlugin(FullPage);	oFCKeditor.Config['CustomConfigurationsPath'] = '/fckeditor/loncapaconfig.js' ;
editor.generate();	oFCKeditor.Config['FullPage'] = true
	oFCKeditor.Config['AutoDetectLanguage'] = false;
	oFCKeditor.Config['DefaultLanguage'] = "$lang";
	oFCKeditor.ReplaceTextarea();
	}
	function check_if_dirty(editor) {
	if (editor.IsDirty()) {
	unClean();
	}
	}
	function FCKeditor_OnComplete(editor) {
	editor.Events.AttachEvent("OnSelectionChange",check_if_dirty);
	resize_textarea('$textarea_id','LC_aftertextarea');
}	}
</script>	</script>
FULLPAGE	FULLPAGE
} else {	} else {
$initialize.=(<<FULLPAGE);	$initialize.=(<<FULLPAGE);
<script type="text/javascript">	<script type="text/javascript">
$addbuttons
function initDocument() {	function initDocument() {
	resize_textarea('$textarea_id','LC_aftertextarea');
}	}
</script>	</script>
FULLPAGE	FULLPAGE
}	}
$result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
	$add_to_onload = 'initDocument();';
	$add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";

	if ($filetype eq 'html') {
$xml_help=&Apache::loncommon::helpLatexCheatsheet();	$xml_help=&Apache::loncommon::helpLatexCheatsheet();
}	}
my $cleanbut = '';

my $titledisplay=&display_title();	my $titledisplay=&display_title();
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',	my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
Line 1393 FULLPAGE	Line 1584 FULLPAGE
'dv' => 'Discard Edits and View',	'dv' => 'Discard Edits and View',
'un' => 'undo',	'un' => 'undo',
'ed' => 'Edit');	'ed' => 'Edit');
my $buttons=(<<BUTTONS);	my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
$cleanbut	my $textarea_events = &Apache::edit::element_change_detection();
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />	my $form_events = &Apache::edit::form_change_detection();
<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" /><hr>	my $htmlerror;
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />	if ($filetype eq 'html') {
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />	$htmlerror=&verify_html($filecontents);
BUTTONS	if ($htmlerror) {
$buttons.=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');	$htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
	}
	}
my $editfooter=(<<ENDFOOTER);	my $editfooter=(<<ENDFOOTER);
$initialize	$initialize
<hr />
<a name="editsection" />	<a name="editsection" />
<form method="post" name="xmledit">	<form $form_events method="post" name="xmledit">
$xml_help	<div class="LC_edit_problem_editxml_header">
<input type="hidden" name="editmode" value="$lt{'ed'}" />	<table class="LC_edit_problem_header_title"><tr><td>
$buttons<br />	$filename
<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>	</td><td align="right">
<br />$buttons	$xml_help
<br />	</td></tr>
	</table>
	<div class="LC_edit_problem_discards">
	<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
	<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
	$spelllink $htmlerror
	</div>
	<div class="LC_edit_problem_saves">
	<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
	<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
	</div>
	</div>
	<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
	<div id="LC_aftertextarea">
	<br />
	$titledisplay
	</div>
</form>	</form>
$titledisplay
</body>	</body>
ENDFOOTER	ENDFOOTER
# $result=~s/(\<body[^\>]*\>)/$1$editheader/is;	return ($editfooter,$add_to_onload,$add_to_onresize);;
$result=~s/(\<\/body\>)/$editfooter/is;
return $result;
}	}

sub get_target {	sub get_target {
Line 1480 sub handler {	Line 1685 sub handler {
if ($env{'form.savethisfile'} \|\| $env{'form.viewmode'} \|\| $env{'form.Undo'}) {	if ($env{'form.savethisfile'} \|\| $env{'form.viewmode'} \|\| $env{'form.Undo'}) {
my $html_file=&Apache::lonnet::getfile($file);	my $html_file=&Apache::lonnet::getfile($file);
my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});	my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});
	if ($env{'form.savethisfile'}) {
	$env{'form.editmode'}='Edit'; #force edit mode
	}
}	}
}	}
my %mystyle;	my %mystyle;
Line 1514 ENDNOTFOUND	Line 1722 ENDNOTFOUND
['editmode']);	['editmode']);
}	}
if (!$env{'form.editmode'} \|\| $env{'form.viewmode'} \|\| $env{'form.discardview'}) {	if (!$env{'form.editmode'} \|\| $env{'form.viewmode'} \|\| $env{'form.discardview'}) {
	&Apache::structuretags::reset_problem_globals();
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,	$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
'',%mystyle);	'',%mystyle);
undef($Apache::lonhomework::parsing_a_task);	# .html files may contain <problem> or <Task> need to clean
	# up if it did
	&Apache::structuretags::reset_problem_globals();
	&Apache::lonhomework::finished_parsing();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['rawmode']);	['rawmode']);
if ($env{'form.rawmode'}) { $result = $filecontents; }	if ($env{'form.rawmode'}) { $result = $filecontents; }
	if ($filetype eq 'sty') {
	my $controls =
	($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls()
	: '';
	my %options = ('bgcolor' => '#FFFFFF');
	$result =
	&Apache::loncommon::start_page(undef,undef,\%options).
	$controls.
	$result.
	&Apache::loncommon::end_page();
	}
}	}
}	}

#	#
# Edit action? Insert editing commands	# Edit action? Insert editing commands
#	#
unless ($env{'request.state'} eq 'published') {	unless ($env{'request.state'} eq 'published') {
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))	if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
{	{
my $displayfile=$request->uri;	my $displayfile=$request->uri;
$displayfile=~s/^\/[^\/]*//;	$displayfile=~s/^\/[^\/]*//;
my %options = ();
	my ($edit_info, $add_to_onload, $add_to_onresize)=
	&inserteditinfo($filecontents,$filetype,$displayfile);

	my %options =
	('add_entries' =>
	{'onresize' => $add_to_onresize,
	'onload' => $add_to_onload, });

if ($env{'environment.remote'} ne 'off') {	if ($env{'environment.remote'} ne 'off') {
$options{'bgcolor'} = '#FFFFFF';	$options{'bgcolor'} = '#FFFFFF';
	$options{'only_body'} = 1;
}	}
my $start_page = &Apache::loncommon::start_page(undef,undef,	my $js =
	&Apache::edit::js_change_detection().
	&Apache::loncommon::resize_textarea_js();
	my $start_page = &Apache::loncommon::start_page(undef,$js,
\%options);	\%options);
$result=$start_page.	$result=$start_page.
&Apache::lonxml::message_location().'<h3>'.	&Apache::lonxml::message_location().
$displayfile.	$edit_info.
'</h3>'.&Apache::loncommon::end_page();	&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);	&Apache::lonxml::add_messages(\$result);
$request->print($result);	$request->print($result);
Line 1561 sub display_title {	Line 1794 sub display_title {
$title = $env{'request.filename'};	$title = $env{'request.filename'};
$title = substr($title, rindex($title, '/') + 1);	$title = substr($title, rindex($title, '/') + 1);
}	}
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA Construction Space';</script>";	$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA "
	.&mt('Construction Space')."';</script>";
}	}
return $result;	return $result;
}	}
Line 1594 sub show_error_warn_msg {	Line 1828 sub show_error_warn_msg {
}	}

sub error {	sub error {
	my @errors = @_;

$errorcount++;	$errorcount++;

	$Apache::lonxml::internal_error=1;

	if (defined($Apache::inputtags::part)) {
	if ( @Apache::inputtags::response ) {
	push(@errors,
	&mt("This error occurred while processing response [_1] in part [_2]",
	$Apache::inputtags::response[-1],
	$Apache::inputtags::part));
	} else {
	push(@errors,
	&mt("This error occurred while processing part [_1]",
	$Apache::inputtags::part));
	}
	}

if ( &show_error_warn_msg() ) {	if ( &show_error_warn_msg() ) {
# If printing in construction space, put the error inside <pre></pre>	# If printing in construction space, put the error inside <pre></pre>
push(@Apache::lonxml::error_messages,	push(@Apache::lonxml::error_messages,
$Apache::lonxml::warnings_error_header.	$Apache::lonxml::warnings_error_header
"<b>ERROR:</b>".join("<br />\n",@_)."<br />\n");	.'<div class="LC_error">'
	.'<b>'.&mt('ERROR:').' </b>'.join("<br />\n",@errors)
	."</div>\n");
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';
} else {	} else {
my $errormsg;	my $errormsg;
my ($symb)=&Apache::lonnet::symbread();	my ($symb)=&Apache::lonnet::symbread();
if ( !$symb ) {	if ( !$symb ) {
#public or browsers	#public or browsers
$errormsg=&mt("An error occured while processing this resource. The author has been notified.");	$errormsg=&mt("An error occurred while processing this resource. The author has been notified.");
}	}
my $host=$Apache::lonnet::perlvar{'lonHostID'};	my $host=$Apache::lonnet::perlvar{'lonHostID'};
my $msg = join('<br />',(@_,"The error occurred on host <tt>$host</tt>"));	push(@errors,
	&mt("The error occurred on host [_1]",
	"<tt>$host</tt>"));

	my $msg = join('<br />', @errors);

#notify author	#notify author
&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);	&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
#notify course	#notify course
Line 1640 sub error {	Line 1899 sub error {
}	}
}	}
if ($env{'request.role.adv'}) {	if ($env{'request.role.adv'}) {
$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));	$errormsg=&mt("An error occurred while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));
} else {	} else {
$errormsg=&mt("An error occured while processing this resource. The instructor has been notified.");	$errormsg=&mt("An error occurred while processing this resource. The instructor has been notified.");
}	}
}	}
push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");	push(@Apache::lonxml::error_messages,"<b>$errormsg</b> <br />");
Line 1655 sub warning {	Line 1914 sub warning {
if ($env{'form.grade_target'} ne 'tex') {	if ($env{'form.grade_target'} ne 'tex') {
if ( &show_error_warn_msg() ) {	if ( &show_error_warn_msg() ) {
push(@Apache::lonxml::warning_messages,	push(@Apache::lonxml::warning_messages,
$Apache::lonxml::warnings_error_header.	$Apache::lonxml::warnings_error_header
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");	.'<div class="LC_warning">'
	.&mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)
	."</div>\n"
	);
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';
}	}
}	}

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

Removed from v.1.449
changed lines
	Added in v.1.484.4.2