--- loncom/xml/lonxml.pm 2007/09/05 01:03:21 1.449.2.1
+++ loncom/xml/lonxml.pm 2009/11/30 21:17:41 1.501
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.449.2.1 2007/09/05 01:03:21 albertel Exp $
+# $Id: lonxml.pm,v 1.501 2009/11/30 21:17:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,6 +37,25 @@
# to any other parties under any circumstances.
#
+=pod
+
+=head1 NAME
+
+Apache::lonxml
+
+=head1 SYNOPSIS
+
+XML Parsing Module
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES
+
+=cut
+
+
package Apache::lonxml;
use vars
@@ -90,10 +109,14 @@ use Apache::lonfeedback();
use Apache::lonmsg();
use Apache::loncacc();
use Apache::lonmaxima();
+use Apache::lonr();
use Apache::lonlocal;
+use Apache::lonhtmlcommon();
+
+#==================================== Main subroutine: xmlparse
-#================================================== Main subroutine: xmlparse
#debugging control, to turn on debugging modify the correct handler
+
$Apache::lonxml::debug=0;
# keeps count of the number of warnings and errors generated in a parse
@@ -135,6 +158,16 @@ $Apache::lonxml::request='';
$Apache::lonxml::counter=1;
$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
$Apache::lonxml::usestyle=1;
@@ -349,8 +382,8 @@ sub xmlparse {
$safeeval,\%style_for_target,1);
if (@stack) {
- &warning("At end of file some tags were still left unclosed, ".
- '<tt><'.join('></tt>, <tt><',reverse(@stack)).
+ &warning(&mt('At end of file some tags were still left unclosed:').
+ ' <tt><'.join('></tt>, <tt><',reverse(@stack)).
'></tt>');
}
if ($env{'request.uri'}) {
@@ -365,8 +398,12 @@ sub xmlparse {
$finaloutput .= join('',@script_var_displays);
undef(@script_var_displays);
}
-
+ &init_state();
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 $finaloutput;
@@ -470,10 +507,10 @@ sub inner_xmlparse {
while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
my $lasttag=$$stack[-1];
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;
} 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);
}
}
@@ -489,11 +526,11 @@ sub inner_xmlparse {
if (!$Apache::lonxml::usestyle) {
$extras=$Apache::lonxml::style_values;
}
- if ( $#$parstack > -1 ) {
- $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
- } else {
- $result= &Apache::run::evaluate($result,$safeeval,$extras);
- }
+ if ( $#$parstack > -1 ) {
+ $result=&Apache::run::evaluate($result,$safeeval,$extras.$$parstack[-1]);
+ } else {
+ $result= &Apache::run::evaluate($result,$safeeval,$extras);
+ }
}
$Apache::lonxml::post_evaluate=1;
@@ -619,14 +656,36 @@ sub callsub {
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 {
my ($request,$target)=@_;
$Apache::lonxml::request=$request;
$errorcount=0;
$warningcount=0;
+ $Apache::lonxml::internal_error=0;
$Apache::lonxml::default_homework_loaded=0;
$Apache::lonxml::usestyle=1;
&init_counter();
+ &clear_bubble_lines_for_part();
+ &init_state();
+ &set_state('target',$target);
@Apache::lonxml::pwd=();
@Apache::lonxml::extlinks=();
@script_var_displays=();
@@ -681,6 +740,7 @@ sub init_safespace {
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->permit("time");
+ $safeeval->permit("caller");
$safeeval->deny("rand");
$safeeval->deny("srand");
$safeeval->deny(":base_io");
@@ -690,15 +750,26 @@ sub init_safespace {
$safehole->wrap(\&Apache::chemresponse::chem_standard_order,$safeeval,
'&chem_standard_order');
$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_check,$safeeval,'&maxima_check');
$safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,
'&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,
'&capa_formula_fix');
+ $safehole->wrap(\&Apache::lonlocal::locallocaltime,$safeeval,
+ '&locallocaltime');
+
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
@@ -800,6 +871,7 @@ sub init_safespace {
$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_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::debug,$safeeval,'&LONCAPA_INTERNAL_DEBUG');
$safehole->wrap(\&Apache::lonnet::logthis,$safeeval,'&LONCAPA_INTERNAL_LOGTHIS');
@@ -908,6 +980,9 @@ sub endredirection {
}
pop @Apache::lonxml::outputstack;
}
+sub in_redirection {
+ return ($Apache::lonxml::redirection > 0)
+}
sub end_tag {
my ($tagstack,$parstack,$token)=@_;
@@ -969,7 +1044,7 @@ sub get_id {
my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
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; }
return $id;
@@ -1005,8 +1080,15 @@ sub get_all_text_unbalanced {
}
}
return $result
+
}
+#########################################################################
+# #
+# bubble line counter management #
+# #
+#########################################################################
+
=pod
For bubble grading mode and exam bubble printing mode, the tracking of
@@ -1022,16 +1104,32 @@ Increments the internal counter environm
Optional Arguments:
$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
sub increment_counter {
- my ($increment) = @_;
- if (defined($increment) && $increment gt 0) {
- $Apache::lonxml::counter+=$increment;
- } else {
- $Apache::lonxml::counter++;
+ my ($increment, $part_response) = @_;
+ if ($env{'form.grade_noincrement'}) { return; }
+ if (!defined($increment) || $increment le 0) {
+ $increment = 1;
+ }
+ $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;
}
@@ -1057,7 +1155,7 @@ sub init_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 '';
}
@@ -1078,7 +1176,7 @@ sub store_counter {
sub restore_problem_counter {
if (defined($state)) {
- &Apache::lonnet::appenv(('form.counter' => $state));
+ &Apache::lonnet::appenv({'form.counter' => $state});
}
}
sub get_problem_counter {
@@ -1088,6 +1186,73 @@ 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 {
my($tag,$pars,$style)= @_;
my $gotfullstack=1;
@@ -1248,7 +1413,7 @@ sub writeallows {
&Apache::lonnet::hreflocation($thisdir,&unescape($_))}=$thisurl;
}
@extlinks=();
- &Apache::lonnet::appenv(%httpref);
+ &Apache::lonnet::appenv(\%httpref);
}
sub register_ssi {
@@ -1315,7 +1480,7 @@ sub storefile {
$fh->close();
return 1;
} else {
- &warning("Unable to save file $file");
+ &warning(&mt('Unable to save file [_1]','<tt>'.$file.'</tt>'));
return 0;
}
}
@@ -1348,77 +1513,173 @@ SIMPLECONTENT
return $filecontents;
}
+sub createnewjs {
+ my $filecontents=(<<SIMPLECONTENT);
+<script type="text/javascript" language="Javascript">
+
+</script>
+SIMPLECONTENT
+ return $filecontents;
+}
+
+sub verify_html {
+ my ($filecontents)=@_;
+ if ($filecontents!~/(?:\<|\<\;)(?:html|xml)[^\<]*(?:\>|\>\;)/is) {
+ return &mt('File does not have [_1] or [_2] starting tag','<html>','<xml>');
+ }
+ if ($filecontents!~/(?:\<|\<\;)\/(?:html|xml)(?:\>|\>\;)/is) {
+ return &mt('File does not have [_1] or [_2] ending tag','<html>','<xml>');
+ }
+ if ($filecontents!~/(?:\<|\<\;)(?:body|frameset)[^\<]*(?:\>|\>\;)/is) {
+ return &mt('File does not have [_1] or [_2] starting tag','<body>','<frameset>');
+ }
+ if ($filecontents!~/(?:\<|\<\;)\/(?:body|frameset)[^\<]*(?:\>|\>\;)/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($_);
+ }
+ }
+ my $output;
+ unless ($env{'form.forceedit'}) {
+ $output .= '
+ <span class="LC_nobreak">'.
+ &mt('Language:').' '.
+ &Apache::loncommon::select_form($env{'form.languages'},'languages',
+ %langchoices).'
+ </span>';
+ }
+ $output .= '
+ <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>';
+ return $output;
+}
sub inserteditinfo {
- my ($result,$filecontents,$filetype)=@_;
+ my ($filecontents, $filetype, $filename)=@_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
-# my $editheader='<a href="#editsection">Edit below</a><hr />';
my $xml_help = '';
my $initialize='';
- if ($filetype eq 'html') {
- my $addbuttons=&Apache::lonhtmlcommon::htmlareaaddbuttons();
- $initialize=&Apache::lonhtmlcommon::spellheader();
- if (!&Apache::lonhtmlcommon::htmlareablocked() &&
- &Apache::lonhtmlcommon::htmlareabrowser()) {
- $initialize.=(<<FULLPAGE);
+ my $textarea_id = 'filecont';
+ my $dragmath_button;
+ my ($add_to_onload, $add_to_onresize);
+ $initialize=&Apache::lonhtmlcommon::spellheader();
+ if ($filetype eq 'html'
+ && (!&Apache::lonhtmlcommon::htmlareablocked() &&
+ &Apache::lonhtmlcommon::htmlareabrowser())) {
+ $textarea_id .= '___Frame';
+ my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
+ $initialize.=(<<FULLPAGE);
<script type="text/javascript">
-$addbuttons
-
- HTMLArea.loadPlugin("FullPage");
-
+lonca
function initDocument() {
- var editor=new HTMLArea("filecont",config);
- editor.registerPlugin(FullPage);
- editor.generate();
+ var oFCKeditor = new FCKeditor('filecont');
+ oFCKeditor.Config['CustomConfigurationsPath'] = '/fckeditor/loncapaconfig.js' ;
+ 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>
FULLPAGE
- } else {
- $initialize.=(<<FULLPAGE);
+ } else {
+ $initialize.=(<<FULLPAGE);
<script type="text/javascript">
-$addbuttons
function initDocument() {
+ resize_textarea('$textarea_id','LC_aftertextarea');
}
</script>
FULLPAGE
- }
- $result=~s/\<body([^\>]*)\>/\<body onload="initDocument()" $1\>/i;
+ if ($filetype eq 'html') {
+ $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
+ $dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1);
+ }
+ }
+
+ $add_to_onload = 'initDocument();';
+ $add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
+
+ if ($filetype eq 'html') {
$xml_help=&Apache::loncommon::helpLatexCheatsheet();
}
- my $cleanbut = '';
my $titledisplay=&display_title();
+ my $wysiwyglink;
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
'un' => 'undo',
'ed' => 'Edit');
- my $buttons=(<<BUTTONS);
-$cleanbut
-<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
-<input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" /><hr>
-<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
-<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
-BUTTONS
- $buttons.=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
+ my $spelllink .=&Apache::lonhtmlcommon::spelllink('xmledit','filecont');
+ my $textarea_events = &Apache::edit::element_change_detection();
+ my $form_events = &Apache::edit::form_change_detection();
+ my $htmlerror;
+ if ($filetype eq 'html') {
+ $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);
$initialize
-<hr />
<a name="editsection" />
-<form method="post" name="xmledit">
-$xml_help
-<input type="hidden" name="editmode" value="$lt{'ed'}" />
-$buttons<br />
-<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
-<br />$buttons
-<br />
+<form $form_events method="post" name="xmledit">
+ <div class="LC_edit_problem_editxml_header">
+ <table class="LC_edit_problem_header_title"><tr><td>
+ $filename
+ </td><td align="right">
+ $xml_help
+ </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'}" />
+ $dragmath_button $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">
+ $wysiwyglink
+ <br />
+ $titledisplay
+ </div>
</form>
-$titledisplay
</body>
ENDFOOTER
-# $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
- $result=~s/(\<\/body\>)/$editfooter/is;
- return $result;
+ return ($editfooter,$add_to_onload,$add_to_onresize);;
}
sub get_target {
@@ -1450,9 +1711,8 @@ sub get_target {
sub handler {
my $request=shift;
-
+
my $target=&get_target();
-
$Apache::lonxml::debug=$env{'user.debug'};
&Apache::loncommon::content_type($request,'text/html');
@@ -1461,6 +1721,21 @@ sub handler {
$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
'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;
return OK if $request->header_only;
@@ -1468,11 +1743,12 @@ sub handler {
my $file=&Apache::lonnet::filelocation("",$request->uri);
my $filetype;
- if ($file =~ /\.sty$/) {
- $filetype='sty';
+ if ($file =~ /\.(sty|css|js|txt)$/) {
+ $filetype=$1;
} else {
$filetype='html';
}
+
#
# Edit action? Save file.
#
@@ -1480,6 +1756,9 @@ sub handler {
if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
my $html_file=&Apache::lonnet::getfile($file);
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;
@@ -1488,17 +1767,22 @@ sub handler {
if ($filecontents eq -1) {
my $start_page=&Apache::loncommon::start_page('File Error');
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);
$start_page
-<b>$fnf: $file</b>
+$errormsg
$end_page
ENDNOTFOUND
$filecontents='';
if ($env{'request.state'} ne 'published') {
if ($filetype eq 'sty') {
$filecontents=&createnewsty();
- } else {
+ } elsif ($filetype eq 'js') {
+ $filecontents=&createnewjs();
+ } elsif (($filetype ne 'css') && ($filetype ne 'txt')) {
$filecontents=&createnewhtml();
}
$env{'form.editmode'}='Edit'; #force edit mode
@@ -1514,43 +1798,103 @@ ENDNOTFOUND
['editmode']);
}
if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
- &Apache::structuretags::reset_problem_globals();
- $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
- '',%mystyle);
+ if ($filetype eq 'html' || $filetype eq 'sty') {
+ &Apache::structuretags::reset_problem_globals();
+ $result = &Apache::lonxml::xmlparse($request,$target,
+ $filecontents,'',%mystyle);
# .html files may contain <problem> or <Task> need to clean
# up if it did
- &Apache::structuretags::reset_problem_globals();
- &Apache::lonhomework::finished_parsing();
+ &Apache::structuretags::reset_problem_globals();
+ &Apache::lonhomework::finished_parsing();
+ } else {
+ $result = $filecontents;
+ }
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['rawmode']);
if ($env{'form.rawmode'}) { $result = $filecontents; }
- }
+ if ($filetype ne 'html') {
+ my $nochgview = 1;
+ my $controls = '';
+ if ($env{'request.state'} eq 'construct') {
+ $controls = &Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .&Apache::londefdef::edit_controls($nochgview));
+ }
+ if ($filetype ne 'sty') {
+ $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' => 'Editor'}];
+ } 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;
+ }
+ }
+ }
}
-
+
#
# Edit action? Insert editing commands
#
unless ($env{'request.state'} eq 'published') {
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
- {
+ {
my $displayfile=$request->uri;
$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, });
+ my $header;
+ if ($env{'request.state'} eq 'construct') {
+ $options{'bread_crumbs'} = [{
+ 'href' => &Apache::loncommon::authorspace(),
+ 'text' => 'Construction Space'},
+ {'href' => '',
+ 'text' => 'HTML Editor'}];
+ $header = &Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader());
+ }
if ($env{'environment.remote'} ne 'off') {
$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);
- $result=$start_page.
- &Apache::lonxml::message_location().'<h3>'.
- $displayfile.
- '</h3>'.&Apache::loncommon::end_page();
- $result=&inserteditinfo($result,$filecontents,$filetype);
- }
+ $result = $start_page
+ .$header
+ .&Apache::lonxml::message_location()
+ .$edit_info
+ .&Apache::loncommon::end_page();
+ }
}
if ($filetype eq 'html') { &writeallows($request->uri); }
-
-
+
&Apache::lonxml::add_messages(\$result);
$request->print($result);
@@ -1565,7 +1909,8 @@ sub display_title {
$title = $env{'request.filename'};
$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;
}
@@ -1598,22 +1943,47 @@ sub show_error_warn_msg {
}
sub error {
+ my @errors = @_;
+
$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 printing in construction space, put the error inside <pre></pre>
push(@Apache::lonxml::error_messages,
- $Apache::lonxml::warnings_error_header.
- "<b>ERROR:</b>".join("<br />\n",@_)."<br />\n");
+ $Apache::lonxml::warnings_error_header
+ .'<div class="LC_error">'
+ .'<b>'.&mt('ERROR:').' </b>'.join("<br />\n",@errors)
+ ."</div>\n");
$Apache::lonxml::warnings_error_header='';
} else {
my $errormsg;
my ($symb)=&Apache::lonnet::symbread();
if ( !$symb ) {
#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 $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
&Apache::lonmsg::author_res_msg($env{'request.filename'},$msg);
#notify course
@@ -1644,9 +2014,9 @@ sub error {
}
}
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 {
- $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 />");
@@ -1659,8 +2029,11 @@ sub warning {
if ($env{'form.grade_target'} ne 'tex') {
if ( &show_error_warn_msg() ) {
push(@Apache::lonxml::warning_messages,
- $Apache::lonxml::warnings_error_header.
- "<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n");
+ $Apache::lonxml::warnings_error_header
+ .'<div class="LC_warning">'
+ .&mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)
+ ."</div>\n"
+ );
$Apache::lonxml::warnings_error_header='';
}
}
@@ -1885,7 +2258,109 @@ sub get_tag {
return $insertlist{"$tagnum.tag"};
}
+############################################################
+# PDF-FORM-METHODS
+
+=pod
+
+=item &print_pdf_radiobutton(fieldname, value, text)
+
+Returns a latexline to generate a PDF-Form-Radiobutton with Text.
+
+$fieldname: PDF internalname of the radiobutton
+$value: Value of radiobutton (read when dumping the PDF data)
+$text: Text on the rightside of the radiobutton
+
+=cut
+sub print_pdf_radiobutton {
+ my $result = '';
+ my ($fieldName, $value, $text) = @_;
+ $result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n";
+ $result .= '\radioButton[\symbolchoice{circle}]{'.
+ $fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n";
+ $result .= '\end{tabularx}' . "\n";
+ $result .= '\hspace{2mm}' . "\n";
+ return $result;
+}
+
+
+=pod
+
+=item &print_pdf_start_combobox(fieldname)
+
+Starts a latexline to generate a PDF-Form-Combobox with text.
+
+$fieldname: PDF internal name of the Combobox
+
+=cut
+sub print_pdf_start_combobox {
+ my $result;
+ my ($fieldName) = @_;
+ $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";
+ $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; #
+
+ return $result;
+}
+
+
+=pod
+
+=item &print_pdf_add_combobox_option(options)
+
+Generates a latexline to add Options to a PDF-Form-ComboBox.
+
+$option: PDF internal name of the Combobox-Option
+
+=cut
+sub print_pdf_add_combobox_option {
+
+ my $result;
+ my ($option) = @_;
+
+ $result .= '('.$option.')';
+
+ return $result;
+}
+
+
+=pod
+
+=item &print_pdf_end_combobox(text) {
+
+Returns latexcode to end a PDF-Form-Combobox with text.
+
+=cut
+sub print_pdf_end_combobox {
+ my $result;
+ my ($text) = @_;
+
+ $result .= '}&'.$text."\\\\\n";
+ $result .= '\end{tabularx}' . "\n";
+ $result .= '\hspace{2mm}' . "\n";
+ return $result;
+}
+
+
+=pod
+
+=item &print_pdf_hiddenField(fieldname, user, domain)
+
+Returns a latexline to generate a PDF-Form-hiddenField with userdata.
+
+$fieldname label for hiddentextfield
+$user: name of user
+$domain: domain of user
+
+=cut
+sub print_pdf_hiddenfield {
+ my $result;
+ my ($fieldname, $user, $domain) = @_;
+
+ $result .= '\textField [\F{\FHidden}\F{-\FPrint}\V{'.$domain.'&'.$user.'}]{'.$fieldname.'}{0in}{0in}'."\n";
+
+ return $result;
+}
+
1;
__END__
-