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.490 and 1.505.2.1

version 1.490, 2008/12/07 23:41:02	version 1.505.2.1, 2010/05/30 02:57:01
Line 109 use Apache::lonfeedback();	Line 109 use Apache::lonfeedback();
use Apache::lonmsg();	use Apache::lonmsg();
use Apache::loncacc();	use Apache::loncacc();
use Apache::lonmaxima();	use Apache::lonmaxima();
	use Apache::lonr();
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonhtmlcommon();

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

Line 242 sub tokeninputfield {	Line 244 sub tokeninputfield {
document.tokeninput.barcode.value='';	document.tokeninput.barcode.value='';
}	}
</script>	</script>
<form method="post" name="tokeninput">	<form method="post" name="tokeninput" action="">
<table border="2" bgcolor="#FFFFBB">	<table border="2" bgcolor="#FFFFBB">
<tr><th>DocID Checkin</th></tr>	<tr><th>DocID Checkin</th></tr>
<tr><td>	<tr><td>
Line 250 sub tokeninputfield {	Line 252 sub tokeninputfield {
<tr>	<tr>
<td>Scan in Barcode</td>	<td>Scan in Barcode</td>
<td><input type="text" size="22" name="barcode"	<td><input type="text" size="22" name="barcode"
onChange="updatetoken()"/></td>	onchange="updatetoken()"/></td>
</tr>	</tr>
<tr><td><i>or</i> Type in DocID</td>	<tr><td><i>or</i> Type in DocID</td>
<td>	<td>
Line 259 onChange="updatetoken()"/></td>	Line 261 onChange="updatetoken()"/></td>
<input type="text" size="5" name="codetwo" />	<input type="text" size="5" name="codetwo" />
<b><font size="+2">*</font></b>	<b><font size="+2">*</font></b>
<input type="text" size="10" name="codethree" value="$defhost"	<input type="text" size="10" name="codethree" value="$defhost"
onChange="this.value=this.value.toUpperCase()" />	onchange="this.value=this.value.toUpperCase()" />
</td></tr>	</td></tr>
</table>	</table>
</td></tr>	</td></tr>
Line 755 sub init_safespace {	Line 757 sub init_safespace {
$safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,	$safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,
'&maxima_cas_formula_fix');	'&maxima_cas_formula_fix');

	$safehole->wrap(\&Apache::lonr::r_eval,$safeeval,'&r_eval');
	$safehole->wrap(\&Apache::lonr::Rentry,$safeeval,'&Rentry');
	$safehole->wrap(\&Apache::lonr::Rarray,$safeeval,'&Rarray');
	$safehole->wrap(\&Apache::lonr::r_check,$safeeval,'&r_check');
	$safehole->wrap(\&Apache::lonr::r_cas_formula_fix,$safeeval,
	'&r_cas_formula_fix');

$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,	$safehole->wrap(\&Apache::caparesponse::capa_formula_fix,$safeeval,
'&capa_formula_fix');	'&capa_formula_fix');

Line 1035 sub get_id {	Line 1044 sub get_id {
my ($parstack,$safeeval)=@_;	my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);	my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if ($env{'request.state'} eq 'construct' && $id =~ /([._]\|[^\w\d\s[:punct:]])/) {	if ($env{'request.state'} eq 'construct' && $id =~ /([._]\|[^\w\d\s[:punct:]])/) {
&error(&mt("ID "[_1]" contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -",'<tt>'.$id.'</tt>'));	&error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"<tt>'.$id.'</tt>"'));
}	}
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }	if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
return $id;	return $id;
Line 1504 SIMPLECONTENT	Line 1513 SIMPLECONTENT
return $filecontents;	return $filecontents;
}	}

	sub createnewjs {
	my $filecontents=(<<SIMPLECONTENT);
	<script type="text/javascript" language="Javascript">

	</script>
	SIMPLECONTENT
	return $filecontents;
	}

sub verify_html {	sub verify_html {
my ($filecontents)=@_;	my ($filecontents)=@_;
if ($filecontents!~/(?:\<\|\&lt\;)(?:html\|xml)[^\<]*(?:\>\|\&gt\;)/is) {	if ($filecontents!~/(?:\<\|\&lt\;)(?:html\|xml)[^\<]*(?:\>\|\&gt\;)/is) {
Line 1529 sub renderingoptions {	Line 1547 sub renderingoptions {
= &Apache::loncommon::plainlanguagedescription($_);	= &Apache::loncommon::plainlanguagedescription($_);
}	}
}	}
return	my $output;
'<span class="LC_nobreak">'.	unless ($env{'form.forceedit'}) {
&mt('Language:').' '.	$output .=
&Apache::loncommon::select_form($env{'form.languages'},'languages',	'<span class="LC_nobreak">'.
%langchoices).'	&mt('Language:').' '.
</span>	&Apache::loncommon::select_form(
<span class="LC_nobreak">'.	$env{'form.languages'},
	'languages',
	&Apache::lonlocal::texthash(%langchoices)).
	'</span>';
	}
	$output .=
	' <span class="LC_nobreak">'.
&mt('Math Rendering:').' '.	&mt('Math Rendering:').' '.
&Apache::loncommon::select_form($env{'form.texengine'},'texengine',	&Apache::loncommon::select_form(
('' => '',	$env{'form.texengine'},
'tth' => 'tth (TeX to HTML)',	'texengine',
'jsMath' => 'jsMath',	&Apache::lonlocal::texthash
'mimetex' => 'mimetex (Convert to Images)')).'	('' => '',
</span>';	'tth' => 'tth (TeX to HTML)',
	'jsMath' => 'jsMath',
	'mimetex' => 'mimetex (Convert to Images)')).
	'</span>';
	return $output;
}	}

sub inserteditinfo {	sub inserteditinfo {
Line 1551 sub inserteditinfo {	Line 1579 sub inserteditinfo {
my $xml_help = '';	my $xml_help = '';
my $initialize='';	my $initialize='';
my $textarea_id = 'filecont';	my $textarea_id = 'filecont';
	my $dragmath_button;
my ($add_to_onload, $add_to_onresize);	my ($add_to_onload, $add_to_onresize);
$initialize=&Apache::lonhtmlcommon::spellheader();	$initialize=&Apache::lonhtmlcommon::spellheader();
if ($filetype eq 'html'	if ($filetype eq 'html'
Line 1588 FULLPAGE	Line 1617 FULLPAGE
}	}
</script>	</script>
FULLPAGE	FULLPAGE
	if ($filetype eq 'html' \|\| $filetype eq 'tex') {
	$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
	$dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1);
	}
}	}

$add_to_onload = 'initDocument();';	$add_to_onload = 'initDocument();';
Line 1598 FULLPAGE	Line 1631 FULLPAGE
}	}

my $titledisplay=&display_title();	my $titledisplay=&display_title();
	my $wysiwyglink;
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',	my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',	'vi' => 'Save and View',
'dv' => 'Discard Edits and View',	'dv' => 'Discard Edits and View',
Line 1606 FULLPAGE	Line 1640 FULLPAGE
my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');	my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
my $textarea_events = &Apache::edit::element_change_detection();	my $textarea_events = &Apache::edit::element_change_detection();
my $form_events = &Apache::edit::form_change_detection();	my $form_events = &Apache::edit::form_change_detection();
my $htmlerror=&verify_html($filecontents);	my $htmlerror;
if ($htmlerror) {	if ($filetype eq 'html') {
$htmlerror='<span class="LC_error">'.$htmlerror.'</span>';	$htmlerror=&verify_html($filecontents);
	if ($htmlerror) {
	$htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
	}
	if (&Apache::lonhtmlcommon::htmlareabrowser()) {
	if (&Apache::lonhtmlcommon::htmlareablocked()) {
	$wysiwyglink = &Apache::lonhtmlcommon::enablelink($textarea_id);
	} else {
	$wysiwyglink = &Apache::lonhtmlcommon::disablelink($textarea_id);
	}
	}
}	}
my $editfooter=(<<ENDFOOTER);	my $editfooter=(<<ENDFOOTER);
$initialize	$initialize
Line 1624 $initialize	Line 1668 $initialize
<div class="LC_edit_problem_discards">	<div class="LC_edit_problem_discards">
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />	<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />	<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
$spelllink $htmlerror	$dragmath_button $spelllink $htmlerror
</div>	</div>
<div class="LC_edit_problem_saves">	<div class="LC_edit_problem_saves">
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />	<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
Line 1633 $initialize	Line 1677 $initialize
</div>	</div>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>	<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
<div id="LC_aftertextarea">	<div id="LC_aftertextarea">
	$wysiwyglink
<br />	<br />
$titledisplay	$titledisplay
</div>	</div>
Line 1671 sub get_target {	Line 1716 sub get_target {

sub handler {	sub handler {
my $request=shift;	my $request=shift;

my $target=&get_target();	my $target=&get_target();

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

&Apache::loncommon::content_type($request,'text/html');	&Apache::loncommon::content_type($request,'text/html');
Line 1682 sub handler {	Line 1726 sub handler {
$request->set_last_modified(&Apache::lonnet::metadata($request->uri,	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
'lastrevisiondate'));	'lastrevisiondate'));
}	}
	# Embedded Flash movies from Camtasia served from https will not display in IE
	# if XML config file has expired from cache.
	if ($ENV{'SERVER_PORT'} == 443) {
	if ($request->uri =~ /\.xml$/) {
	my ($httpbrowser,$clientbrowser) =
	&Apache::loncommon::decode_user_agent($request);
	if ($clientbrowser =~ /^explorer$/i) {
	delete $request->headers_out->{'Cache-control'};
	delete $request->headers_out->{'Pragma'};
	my $expiration = time + 60;
	my $date=strftime("%a, %d %b %Y %H:%M:%S GMT",gmtime($expiration));
	$request->headers_out->set("Expires" => $date);
	}
	}
	}
$request->send_http_header;	$request->send_http_header;

return OK if $request->header_only;	return OK if $request->header_only;


my $file=&Apache::lonnet::filelocation("",$request->uri);	my $file=&Apache::lonnet::filelocation("",$request->uri);
my $filetype;	my ($filetype,$breadcrumbtext);
if ($file =~ /\.sty$/) {	if ($file =~ /\.(sty\|css\|js\|txt\|tex)$/) {
$filetype='sty';	$filetype=$1;
} else {	} else {
$filetype='html';	$filetype='html';
}	}
	if ($filetype eq 'sty') {
	$breadcrumbtext = 'Style File Editor';
	} elsif ($filetype eq 'js') {
	$breadcrumbtext = 'Javascript Editor';
	} elsif ($filetype eq 'css') {
	$breadcrumbtext = 'CSS Editor';
	} elsif ($filetype eq 'txt') {
	$breadcrumbtext = 'Text Editor';
	} elsif ($filetype eq 'tex') {
	$breadcrumbtext = 'TeX Editor';
	} else {
	$breadcrumbtext = 'HTML Editor';
	}

#	#
# Edit action? Save file.	# Edit action? Save file.
#	#
Line 1712 sub handler {	Line 1785 sub handler {
if ($filecontents eq -1) {	if ($filecontents eq -1) {
my $start_page=&Apache::loncommon::start_page('File Error');	my $start_page=&Apache::loncommon::start_page('File Error');
my $end_page=&Apache::loncommon::end_page();	my $end_page=&Apache::loncommon::end_page();
my $fnf=&mt('File not found');	my $errormsg='<p class="LC_error">'
	.&mt('File not found: [_1]'
	,'<span class="LC_filename">'.$file.'</span>')
	.'</p>';
$result=(<<ENDNOTFOUND);	$result=(<<ENDNOTFOUND);
$start_page	$start_page
<b>$fnf: $file</b>	$errormsg
$end_page	$end_page
ENDNOTFOUND	ENDNOTFOUND
$filecontents='';	$filecontents='';
if ($env{'request.state'} ne 'published') {	if ($env{'request.state'} ne 'published') {
if ($filetype eq 'sty') {	if ($filetype eq 'sty') {
$filecontents=&createnewsty();	$filecontents=&createnewsty();
} else {	} elsif ($filetype eq 'js') {
	$filecontents=&createnewjs();
	} elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
$filecontents=&createnewhtml();	$filecontents=&createnewhtml();
}	}
$env{'form.editmode'}='Edit'; #force edit mode	$env{'form.editmode'}='Edit'; #force edit mode
Line 1738 ENDNOTFOUND	Line 1816 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();	if ($filetype eq 'html' \|\| $filetype eq 'sty') {
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,	&Apache::structuretags::reset_problem_globals();
'',%mystyle);	$result = &Apache::lonxml::xmlparse($request,$target,
	$filecontents,'',%mystyle);
# .html files may contain <problem> or <Task> need to clean	# .html files may contain <problem> or <Task> need to clean
# up if it did	# up if it did
&Apache::structuretags::reset_problem_globals();	&Apache::structuretags::reset_problem_globals();
&Apache::lonhomework::finished_parsing();	&Apache::lonhomework::finished_parsing();
	} elsif ($filetype eq 'tex') {
	$result = &Apache::lontexconvert::converted(\$filecontents,
	$env{'form.texengine'});
	if ($env{'form.return_only_error_and_warning_counts'}) {
	if (&verify_html('<html><body>'.$result.'</body></html>')) {
	$errorcount++;
	}
	$result = "$errorcount:$warningcount";
	}
	} else {
	$result = $filecontents;
	}
&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') {	if (($filetype ne 'html') &&
my $controls =	(!$env{'form.return_only_error_and_warning_counts'})) {
($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls()	my $nochgview = 1;
: '';	my $controls = '';
my %options = ('bgcolor' => '#FFFFFF');	if ($env{'request.state'} eq 'construct') {
$result =	$controls = &Apache::loncommon::head_subbox(
&Apache::loncommon::start_page(undef,undef,\%options).	&Apache::loncommon::CSTR_pageheader()
$controls.	.&Apache::londefdef::edit_controls($nochgview));
$result.	}
&Apache::loncommon::end_page();	if ($filetype ne 'sty' && $filetype ne 'tex') {
}	$result =~ s/</</g;
}	$result =~ s/>/>/g;
	$result = '<table class="LC_sty_begin">'.
	'<tr><td><b><pre>'.$result.
	'</pre></b></td></tr></table>';
	}
	if ($env{'environment.remote'} eq 'off') {
	my $brcrum;
	if ($env{'request.state'} eq 'construct') {
	$brcrum = [{'href' => &Apache::loncommon::authorspace(),
	'text' => 'Construction Space'},
	{'href' => '',
	'text' => $breadcrumbtext}];
	} else {
	$brcrum = ''; # FIXME: Where are we?
	}
	my %options = ('bread_crumbs' => $brcrum,
	'bgcolor' => '#FFFFFF');
	$result =
	&Apache::loncommon::start_page(undef,undef,\%options)
	.$controls
	.$result
	.&Apache::loncommon::end_page();
	} else {
	$result = $controls.$result;
	}
	}
	}
}	}

#	#
Line 1776 ENDNOTFOUND	Line 1893 ENDNOTFOUND

my %options =	my %options =
('add_entries' =>	('add_entries' =>
{'onresize' => $add_to_onresize,	{'onresize' => $add_to_onresize,
'onload' => $add_to_onload, });	'onload' => $add_to_onload, });
	my $header;
	if ($env{'request.state'} eq 'construct') {
	$options{'bread_crumbs'} = [{
	'href' => &Apache::loncommon::authorspace(),
	'text' => 'Construction Space'},
	{'href' => '',
	'text' => $breadcrumbtext}];
	$header = &Apache::loncommon::head_subbox(
	&Apache::loncommon::CSTR_pageheader());
	}
if ($env{'environment.remote'} ne 'off') {	if ($env{'environment.remote'} ne 'off') {
$options{'bgcolor'} = '#FFFFFF';	$options{'bgcolor'} = '#FFFFFF';
$options{'only_body'} = 1;	$options{'only_body'} = 1;
Line 1788 ENDNOTFOUND	Line 1914 ENDNOTFOUND
&Apache::loncommon::resize_textarea_js();	&Apache::loncommon::resize_textarea_js();
my $start_page = &Apache::loncommon::start_page(undef,$js,	my $start_page = &Apache::loncommon::start_page(undef,$js,
\%options);	\%options);
$result=$start_page.	$result = $start_page
&Apache::lonxml::message_location().	.$header
$edit_info.	.&Apache::lonxml::message_location()
&Apache::loncommon::end_page();	.$edit_info
}	.&Apache::loncommon::end_page();
	}
}	}
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 2164 sub get_tag {	Line 2291 sub get_tag {

=pod	=pod

=item &print_pdf_radiobutton(fieldname, value, text)	=item &print_pdf_radiobutton(fieldname, value)

Returns a latexline to generate a PDF-Form-Radiobutton with Text.	Returns a latexline to generate a PDF-Form-Radiobutton.
	Note: Radiobuttons with equal names are automaticly grouped
	in a selection-group.

$fieldname: PDF internalname of the radiobutton	$fieldname: PDF internalname of the radiobutton(group)
$value: Value of radiobutton (read when dumping the PDF data)	$value: Value of radiobutton
$text: Text on the rightside of the radiobutton

=cut	=cut
sub print_pdf_radiobutton {	sub print_pdf_radiobutton {
my $result = '';	my ($fieldname, $value) = @_;
my ($fieldName, $value, $text) = @_;	return '\radioButton[\symbolchoice{circle}]{'
$result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n";	.$fieldname.'}{10bp}{10bp}{'.$value.'}';
$result .= '\radioButton[\symbolchoice{circle}]{'.
$fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n";
$result .= '\end{tabularx}' . "\n";
$result .= '\hspace{2mm}' . "\n";
return $result;
}	}

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

Removed from v.1.490
changed lines
	Added in v.1.505.2.1