--- loncom/xml/lonxml.pm 2024/03/31 02:02:32 1.531.2.24.2.3 +++ loncom/xml/lonxml.pm 2015/02/22 18:40:18 1.552 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.531.2.24.2.3 2024/03/31 02:02:32 raeburn Exp $ +# $Id: lonxml.pm,v 1.552 2015/02/22 18:40:18 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,8 +69,6 @@ use Safe(); use Safe::Hole(); use Math::Cephes(); use Math::Random(); -use Math::Calculus::Expression(); -use Number::FormatEng(); use Opcode(); use POSIX qw(strftime); use Time::HiRes qw( gettimeofday tv_interval ); @@ -230,103 +228,8 @@ sub xmlend { return $discussion; } -sub tokeninputfield { - my $defhost=$Apache::lonnet::perlvar{'lonHostID'}; - $defhost=~tr/a-z/A-Z/; - return (< - function updatetoken() { - var comp=new Array; - var barcode=unescape(document.tokeninput.barcode.value); - comp=barcode.split('*'); - if (typeof(comp[0])!="undefined") { - document.tokeninput.codeone.value=comp[0]; - } - if (typeof(comp[1])!="undefined") { - document.tokeninput.codetwo.value=comp[1]; - } - if (typeof(comp[2])!="undefined") { - comp[2]=comp[2].toUpperCase(); - document.tokeninput.codethree.value=comp[2]; - } - document.tokeninput.barcode.value=''; - } - -
- - - - -
DocID Checkin
- - - - - - - -
Scan in Barcode
or Type in DocID - -* - -* - -
-
-
-ENDINPUTFIELD -} - -sub maketoken { - my ($symb,$tuname,$tudom,$tcrsid)=@_; - unless ($symb) { - $symb=&Apache::lonnet::symbread(); - } - unless ($tuname) { - $tuname=$env{'user.name'}; - $tudom=$env{'user.domain'}; - $tcrsid=$env{'request.course.id'}; - } - return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid); -} - -sub printtokenheader { - my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_; - unless ($token) { return ''; } - - my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser(); - unless ($tsymb) { - $tsymb=$symb; - } - unless ($tuname) { - $tuname=$name; - $tudom=$domain; - $tcrsid=$courseid; - } - - my $plainname=&Apache::loncommon::plainname($tuname,$tudom); - - if ($target eq 'web') { - my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); - return - ''. - &mt('Checked out for').' '.$plainname. - '
'.&mt('User').': '.$tuname.' at '.$tudom. - '
'.&mt('ID').': '.$idhash{$tuname}. - '
'.&mt('CourseID').': '.$tcrsid. - '
'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}. - '
'.&mt('DocID').': '.$token. - '
'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'
'; - } else { - return $token; - } -} - sub printalltags { - my $temp; - foreach $temp (sort keys %Apache::lonxml::alltags) { + foreach my $temp (sort(keys(%Apache::lonxml::alltags))) { &Apache::lonxml::debug("$temp -- ". join(',',@{ $Apache::lonxml::alltags{$temp} })); } @@ -442,9 +345,9 @@ sub latex_special_symbols { } else { $string=~s/\\/\\ensuremath{\\backslash}/g; $string=~s/\\\%|\%/\\\%/g; - $string=~s/\\\{|\{/\\{/g; + $string=~s/\\{|{/\\{/g; $string=~s/\\}|}/\\}/g; - $string=~s/\\ensuremath\\\{\\backslash\\}/\\ensuremath{\\backslash}/g; + $string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g; $string=~s/\\\$|\$/\\\$/g; $string=~s/\\\_|\_/\\\_/g; $string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g; @@ -465,8 +368,6 @@ sub inner_xmlparse { my $result; my $token; my $dontpop=0; - my $lastdontpop; - my $lastendtag; my $startredirection = $Apache::lonxml::redirection; while ( $#$pars > -1 ) { while ($token = $$pars['-1']->get_token) { @@ -562,29 +463,17 @@ sub inner_xmlparse { } $result = ''; - if ($token->[0] eq 'E') { - if ($dontpop) { - $lastdontpop = $token; - } else { - $lastendtag = $token->[1]; - &end_tag($stack,$parstack,$token); - } + if ($token->[0] eq 'E' && !$dontpop) { + &end_tag($stack,$parstack,$token); } $dontpop=0; - } + } if ($#$pars > -1) { pop @$pars; pop @Apache::lonxml::pwd; } } - if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') && - ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) { - if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) { - &end_tag($stack,$parstack,$lastdontpop); - } - } - # if ($target eq 'meta') { # $finaloutput.=&endredirection; # } @@ -916,9 +805,6 @@ sub init_safespace { $safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords'); $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength'); $safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle'); - $safehole->wrap(\&Math::Calculus::Expression::math_calculus_expression,$safeeval,'&math_calculus_expression'); - $safehole->wrap(\&Number::FormatEng::format_eng,$safeeval,'&number_format_eng'); - $safehole->wrap(\&Number::FormatEng::format_pref,$safeeval,'&number_format_pref'); # use Data::Dumper; # $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper'); @@ -1091,7 +977,7 @@ sub decreasedepth { sub get_id { my ($parstack,$safeeval)=@_; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); - if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\s\-])/) { + 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.'"')); } if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } @@ -1574,15 +1460,13 @@ SIMPLECONTENT sub verify_html { my ($filecontents)=@_; - my ($is_html,$is_xml,$is_physnet); + my ($is_html,$is_xml); if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) { $is_xml = 1; } elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) { $is_html = 1; - } elsif ($filecontents =~/(?:\<|\<\;)physnet[^\<]*(?:\>|\>\;)/is) { - $is_physnet = 1; } - unless ($is_xml || $is_html || $is_physnet) { + unless ($is_xml || $is_html) { return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>'); } if ($is_html) { @@ -1628,6 +1512,7 @@ sub renderingoptions { ('' => '', 'tth' => 'tth (TeX to HTML)', 'MathJax' => 'MathJax', + 'jsMath' => 'jsMath', 'mimetex' => 'mimetex (Convert to Images)')}). ''; return $output; @@ -1686,7 +1571,7 @@ FULLPAGE } } elsif ($symb || $folderpath) { $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n"; - $initialize .= + $initialize .= &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle, undef,$folderpath,$uri)."\n"; } @@ -1708,9 +1593,8 @@ FULLPAGE my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit', 'vi' => 'Save and View', 'dv' => 'Discard Edits and View', - 'un' => 'Undo', - 'ed' => 'Edit', - 'ew' => 'Edit with Daxe'); + 'un' => 'undo', + 'ed' => 'Edit'); my $spelllink = &Apache::lonhtmlcommon::spelllink('xmledit','filecont'); my $textarea_events = &Apache::edit::element_change_detection(); my $form_events = &Apache::edit::form_change_detection(); @@ -1718,7 +1602,7 @@ FULLPAGE if ($filetype eq 'html') { $htmlerror=&verify_html($filecontents); if ($htmlerror) { - $htmlerror=(' 'x3).' '.$htmlerror.''; + $htmlerror=''.$htmlerror.''; } if (&Apache::lonhtmlcommon::htmlareabrowser()) { unless ($textareaclass) { @@ -1726,30 +1610,14 @@ FULLPAGE } } } - my ($undo,$daxebutton,%onclick); - foreach my $item ('discard','undo','daxe') { - $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"'; - } - foreach my $item ('saveedit','saveview') { - $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"'; - } + my $undo; unless ($uri =~ m{^/uploaded/}) { - $undo = ''."\n"; - } - $initialize .= &setmode_javascript(); - if ($filetype eq 'html') { - my %editors = &Apache::loncommon::permitted_editors(); - if ($editors{'daxe'}) { - $daxebutton = ''."\n"; - } + $undo = ''."\n"; } my $editfooter=(<
-
$filename @@ -1757,13 +1625,13 @@ $initialize $xml_help
-
- - +
+ + $undo $htmlerror $deps_button $dragmath_button
-
- - $undo $deps_button $daxebutton $dragmath_button $htmlerror +
+ +

$spelllink @@ -1773,49 +1641,7 @@ $initialize
ENDFOOTER - return ($editfooter,$add_to_onload,$add_to_onresize); -} - -sub setmode_javascript { - return <<"ENDSCRIPT"; - -ENDSCRIPT -} - -sub seteditor_javascript { - return <<"ENDSCRIPT"; - -ENDSCRIPT + return ($editfooter,$add_to_onload,$add_to_onresize);; } sub get_target { @@ -1920,13 +1746,11 @@ sub handler { # Edit action? Save file. # if (!($env{'request.state'} eq 'published')) { - if (($env{'form.problemmode'} eq 'saveedit') || - ($env{'form.problemmode'} eq 'saveview') || - ($env{'form.problemmode'} eq 'undo')) { + 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.problemmode'} eq 'saveedit') { - $env{'form.editmode'}='edit'; #force edit mode + if ($env{'form.savethisfile'}) { + $env{'form.editmode'}='Edit'; #force edit mode } } } @@ -1955,7 +1779,7 @@ ENDNOTFOUND } elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') { $filecontents=&createnewhtml(); } - $env{'form.editmode'}='edit'; #force edit mode + $env{'form.editmode'}='Edit'; #force edit mode } } else { unless ($env{'request.state'} eq 'published') { @@ -1967,9 +1791,7 @@ ENDNOTFOUND &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['editmode']); } - if ((!$env{'form.editmode'}) || - ($env{'form.problemmode'} eq 'saveview') || - ($env{'form.problemmode'} eq 'discard')) { + if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) { if ($filetype eq 'html' || $filetype eq 'sty') { &Apache::structuretags::reset_problem_globals(); $result = &Apache::lonxml::xmlparse($request,$target, @@ -2037,9 +1859,8 @@ ENDNOTFOUND # Edit action? Insert editing commands # unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) { - if (($env{'form.editmode'}) && - (!($env{'form.problemmode'} eq 'saveview')) && - (!($env{'form.problemmode'} eq 'discard'))) { + if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) + { my ($displayfile,$url,$symb,$itemtitle,$action); $displayfile=$request->uri; if ($request->uri =~ m{^/uploaded/}) { @@ -2307,6 +2128,7 @@ sub add_messages { sub get_param { my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_; + if ( ! $context ) { $context = -1; } my $args =''; if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; } @@ -2314,13 +2136,16 @@ sub get_param { $args=$Apache::lonxml::style_values.$args; } + if ($noelide) { - $args =~ s/'\$/'\\\$/g; +# $args =~ s/\\'/'/g; + $args =~ s/'\$/'\\\$/g; } if ( ! $args ) { return undef; } if ( $case_insensitive ) { if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) { + return &Apache::run::run("{$args;".'return $'.$param.'}', $safeeval); #' } else { @@ -2328,6 +2153,7 @@ sub get_param { } } else { if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) { + return &Apache::run::run("{$args;".'return $'.$param.'}', $safeeval); #' } else { @@ -2431,7 +2257,7 @@ sub register_insert { sub dump_insertlist { my ($ext) = @_; - open(XML,">","/tmp/insertlist.xml.$ext"); + open(XML,">/tmp/insertlist.xml.$ext"); print XML (""); my $i=0;