--- loncom/xml/lonxml.pm 2010/10/01 14:21:55 1.494.4.5 +++ loncom/xml/lonxml.pm 2009/12/02 18:33:43 1.504 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.494.4.5 2010/10/01 14:21:55 raeburn Exp $ +# $Id: lonxml.pm,v 1.504 2009/12/02 18:33:43 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -111,6 +111,7 @@ use Apache::loncacc(); use Apache::lonmaxima(); use Apache::lonr(); use Apache::lonlocal; +use Apache::lonhtmlcommon(); #==================================== Main subroutine: xmlparse @@ -243,7 +244,7 @@ sub tokeninputfield { document.tokeninput.barcode.value=''; } -
+ +onChange="updatetoken()"/>* +onChange="this.value=this.value.toUpperCase()" />
DocID Checkin
@@ -251,7 +252,7 @@ sub tokeninputfield {
Scan in Barcode
or Type in DocID @@ -260,7 +261,7 @@ onchange="updatetoken()"/>
@@ -1043,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 -",''.$id.'')); + &error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"'.$id.'"')); } if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } return $id; @@ -1523,25 +1524,17 @@ SIMPLECONTENT sub verify_html { my ($filecontents)=@_; - my ($is_html,$is_xml); - if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { - $is_xml = 1; - } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) { - $is_html = 1; - } - unless ($is_xml || $is_html) { - return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>'); - } - if ($is_html) { - if ($filecontents!~/(?:\<|\<\;)\/html(?:\>|\>\;)/is) { - return &mt('File does not have [_1] ending tag','<html>'); - } - 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>'); - } + 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 ''; } @@ -1624,7 +1617,7 @@ FULLPAGE } FULLPAGE - if ($filetype eq 'html') { + if ($filetype eq 'html' || $filetype eq 'tex') { $initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup'); $dragmath_button = &Apache::lonhtmlcommon::dragmath_button('filecont',1); } @@ -1638,6 +1631,7 @@ FULLPAGE } my $titledisplay=&display_title(); + my $wysiwyglink; my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', 'vi' => 'Save and View', 'dv' => 'Discard Edits and View', @@ -1652,6 +1646,13 @@ FULLPAGE if ($htmlerror) { $htmlerror=''.$htmlerror.''; } + if (&Apache::lonhtmlcommon::htmlareabrowser()) { + if (&Apache::lonhtmlcommon::htmlareablocked()) { + $wysiwyglink = &Apache::lonhtmlcommon::enablelink($textarea_id); + } else { + $wysiwyglink = &Apache::lonhtmlcommon::disablelink($textarea_id); + } + } } my $editfooter=(<
+ $wysiwyglink
$titledisplay
@@ -1724,8 +1726,8 @@ sub handler { $request->set_last_modified(&Apache::lonnet::metadata($request->uri, 'lastrevisiondate')); } - # Embedded Flash movies (e.g., from Camtasia) served from https will not display in IE - # if XML config file has expired from cache. + # 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) = @@ -1745,12 +1747,25 @@ sub handler { my $file=&Apache::lonnet::filelocation("",$request->uri); - my $filetype; - if ($file =~ /\.(sty|css|js|txt)$/) { + my ($filetype,$breadcrumbtext); + if ($file =~ /\.(sty|css|js|txt|tex)$/) { $filetype=$1; } else { $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. @@ -1770,10 +1785,13 @@ 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=''; @@ -1782,7 +1800,7 @@ ENDNOTFOUND $filecontents=&createnewsty(); } elsif ($filetype eq 'js') { $filecontents=&createnewjs(); - } elsif (($filetype ne 'css') && ($filetype ne 'txt')) { + } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') { $filecontents=&createnewhtml(); } $env{'form.editmode'}='Edit'; #force edit mode @@ -1806,18 +1824,31 @@ ENDNOTFOUND # up if it did &Apache::structuretags::reset_problem_globals(); &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(''.$result.'')) { + $errorcount++; + } + $result = "$errorcount:$warningcount"; + } } 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 = - ($env{'request.state'} eq 'construct') ? &Apache::londefdef::edit_controls($nochgview) - : ''; - if ($filetype ne 'sty') { + if (($filetype ne 'html') && + (!$env{'form.return_only_error_and_warning_counts'})) { + 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' && $filetype ne 'tex') { $result =~ s//>/g; $result = ''. @@ -1825,17 +1856,27 @@ ENDNOTFOUND '
'; } if ($env{'environment.remote'} eq 'off') { - my %options = ('bgcolor' => '#FFFFFF'); - $result = - &Apache::loncommon::start_page(undef,undef,\%options). - $controls. - $result. - &Apache::loncommon::end_page(); + 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; } } - } + } } # @@ -1852,9 +1893,18 @@ ENDNOTFOUND my %options = ('add_entries' => - {'onresize' => $add_to_onresize, - 'onload' => $add_to_onload, }); - + {'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' => $breadcrumbtext}]; + $header = &Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()); + } if ($env{'environment.remote'} ne 'off') { $options{'bgcolor'} = '#FFFFFF'; $options{'only_body'} = 1; @@ -1864,14 +1914,15 @@ 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 + .$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);