--- loncom/xml/lonxml.pm 2008/10/27 19:15:35 1.488 +++ loncom/xml/lonxml.pm 2009/05/28 17:08:43 1.496 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.488 2008/10/27 19:15:35 raeburn Exp $ +# $Id: lonxml.pm,v 1.496 2009/05/28 17:08:43 bisitz 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,6 +109,7 @@ use Apache::lonfeedback(); use Apache::lonmsg(); use Apache::loncacc(); use Apache::lonmaxima(); +use Apache::lonr(); use Apache::lonlocal; #==================================== Main subroutine: xmlparse @@ -658,6 +678,7 @@ sub setup_globals { $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(); @@ -735,6 +756,11 @@ sub init_safespace { $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::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'); @@ -1484,6 +1510,15 @@ SIMPLECONTENT return $filecontents; } +sub createnewjs { + my $filecontents=(< + + +SIMPLECONTENT + return $filecontents; +} + sub verify_html { my ($filecontents)=@_; if ($filecontents!~/(?:\<|\<\;)(?:html|xml)[^\<]*(?:\>|\>\;)/is) { @@ -1531,6 +1566,7 @@ sub inserteditinfo { my $xml_help = ''; my $initialize=''; my $textarea_id = 'filecont'; + my $dragmath_button; my ($add_to_onload, $add_to_onresize); $initialize=&Apache::lonhtmlcommon::spellheader(); if ($filetype eq 'html' @@ -1568,6 +1604,10 @@ FULLPAGE } FULLPAGE + if ($filetype eq 'html') { + $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup'); + $dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1); + } } $add_to_onload = 'initDocument();'; @@ -1586,9 +1626,12 @@ FULLPAGE 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=&verify_html($filecontents); - if ($htmlerror) { - $htmlerror=''.$htmlerror.''; + my $htmlerror; + if ($filetype eq 'html') { + $htmlerror=&verify_html($filecontents); + if ($htmlerror) { + $htmlerror=''.$htmlerror.''; + } } my $editfooter=(< - $spelllink $htmlerror + $dragmath_button $spelllink $htmlerror
@@ -1651,9 +1694,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'); @@ -1669,11 +1711,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. # @@ -1692,17 +1735,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='

' + .&mt('File not found: [_1]' + ,''.$file.'') + .'

'; $result=(<$fnf: $file +$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 @@ -1718,28 +1766,57 @@ 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 or 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 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(); - } - } + 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 = ''. + '
'.$result.
+                              '
'; + } + 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; + } + } + } } # @@ -1756,8 +1833,14 @@ ENDNOTFOUND my %options = ('add_entries' => - {'onresize' => $add_to_onresize, - 'onload' => $add_to_onload, }); + {'onresize' => $add_to_onresize, + 'onload' => $add_to_onload, }); + + $options{'bread_crumbs'} = [{ + 'href' => &Apache::loncommon::authorspace(), + 'text' => 'Construction Space'}, + {'href' => '', + 'text' => 'HTML Editor'}]; if ($env{'environment.remote'} ne 'off') { $options{'bgcolor'} = '#FFFFFF'; @@ -1768,11 +1851,13 @@ ENDNOTFOUND &Apache::loncommon::resize_textarea_js(); my $start_page = &Apache::loncommon::start_page(undef,$js, \%options); - $result=$start_page. - &Apache::lonxml::message_location(). - $edit_info. - &Apache::loncommon::end_page(); - } + $result = $start_page + .&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()) + .&Apache::lonxml::message_location() + .$edit_info + .&Apache::loncommon::end_page(); + } } if ($filetype eq 'html') { &writeallows($request->uri); } @@ -1828,6 +1913,8 @@ sub error { $errorcount++; + $Apache::lonxml::internal_error=1; + if (defined($Apache::inputtags::part)) { if ( @Apache::inputtags::response ) { push(@errors,