--- loncom/xml/scripttag.pm 2006/03/29 04:32:19 1.134.2.1 +++ loncom/xml/scripttag.pm 2010/06/02 21:27:50 1.156 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; - } - return ('','no'); -} - -sub end_LONCAPA_INTERNAL_LONHTTPD_PORT { - return ('','no'); -} - sub start_script { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @Apache::scripttag::parser_env = @_; @@ -116,18 +101,32 @@ sub start_script { ($env{'form.answer_output_mode'} ne 'tex') && ($Apache::lonhomework::viewgrades == 'F')) { $Apache::lonxml::evaluate--; - my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser(); + my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); - $result.="Script Vars
"; +".&mt('Script Vars')."
"; + &Apache::lonxml::add_script_result($script_var); } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); @@ -140,7 +139,7 @@ sub start_script { } } else { my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); - if ($target ne "meta" && $target ne 'tex') { + if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { $result = $token->[4]; $result.=$bodytext; } @@ -214,7 +213,7 @@ sub start_scriptlib { if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -223,7 +222,7 @@ sub start_scriptlib { my $script=&Apache::lonnet::getfile($location); if ($script == -1) { if ($target eq 'edit') { - $error='Errors Unable to find '.$location.''."\n"; + $error=''.&mt('Errors').''.&mt(' Unable to find [_1]',''.$location.'').''."\n"; } else { &Apache::lonxml::error(" Unable to find $location for scriptlib"); return ""; @@ -260,7 +259,7 @@ sub start_parserlib { my $error=''; if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/parserlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -301,7 +300,7 @@ sub end_parserlib { sub start_window { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { &Apache::lonxml::startredirection; } elsif ($target eq 'tex') { $result = '\unskip\footnote{'; @@ -310,11 +309,13 @@ sub start_window { $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); $result.=&Apache::edit::text_arg('Height:','height',$token,5); $result.=&Apache::edit::text_arg('Width:','width',$token,5); + $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5); $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'linktext', - 'width','height'); + 'width','height', + 'mimetype'); if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } } return $result; @@ -323,7 +324,7 @@ sub start_window { sub end_window { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { my $output=&Apache::lonxml::endredirection; $output =~ s/[\n\r]/ /g; # $output = &HTML::Entities::encode($output,'<>&"\''); @@ -334,7 +335,30 @@ sub end_window { if (!$width) { $width='500'; } my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); if (!$height) { $height='200'; } - $result = "$linktext"; + my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval) + || 'text/html'; + + my ($start_page,$end_page); + if ($mimetype eq 'text/html') { + $start_page = + &Apache::loncommon::start_page($linktext, undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF', + 'js_ready' => 1,}); + $end_page = + &Apache::loncommon::end_page({'js_ready' => 1,}); + } + $result = "$linktext"; } elsif ($target eq 'tex') { $result = '}'; } else { @@ -348,7 +372,7 @@ sub start_import { my $bodytext=$$parser[$#$parser]->get_text("/import"); my $result =""; - $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); + $bodytext=&Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) { @@ -360,33 +384,63 @@ sub start_import { &Apache::lonxml::error(" Unable to find $bodytext as $location for import"); return ""; } - + my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval); + if (($importmode eq 'problem') || ($importmode eq 'part')) { +# We are using import to import published problems + if (($importmode eq 'problem') || ($file=~//s)) { +# We explicitly don't want this to be a separate part or the problem already has parts + $file=~s/^\s*//s; + $file=~s/<\/problem>\s*$/<\/library>/s; + } else { +# We want this to be a separate part, but it currently is not + $file=~s/^\s*//s; + $file=~s/<\/problem>\s*$/<\/part><\/library>/s; + } + } my $dir=$location; $dir=~s:/[^/]*$::; # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + my $id= &Apache::lonxml::get_id($parstack,$safeeval); if (!$id) { $id=$Apache::lonxml::curdepth; } push(@Apache::inputtags::import,$id); push(@Apache::inputtags::importlist,$id); - &Apache::lonxml::newparser($parser,\$file,$dir); + &Apache::lonxml::newparser($parser,\$file,$dir); } elsif ($target eq "edit" ) { $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::editline($token->[1],$bodytext,'',40); + my $location=$token->[1]; + $location=~s/^\s*//s; + $location=~s/\s*$//s; + $result.=&Apache::edit::editline($location,$bodytext,'',40); $result.=&Apache::edit::browse(undef,'textnode'); + $result.= ' '; #FIXME this need to convert $bodytext to be a contruction space reference #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); #$result.="Clickhere to edit
" } elsif ($target eq 'modified') { - $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser); + &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode'); + $result=''; + $result.=&Apache::edit::modifiedfield("/import",$parser); } elsif ($target eq 'meta') { - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + my $id= &Apache::lonxml::get_id($parstack,$safeeval); $result.=''; + $result.='" importmode="'.$token->[2]{'importmode'}.'">'; $result.=$bodytext; $result.=''; } @@ -440,7 +494,7 @@ sub end_physnet { sub start_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'webgrade') { if ( $env{'request.course.id'} ) { my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); } else { @@ -453,7 +507,7 @@ sub start_standalone { sub end_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { + if ($target eq 'web' || $target eq 'webgrade' ) { if ( $env{'request.course.id'} ) { } else { $result=''; @@ -471,8 +525,9 @@ sub start_comment { $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) } elsif ( $target eq 'modified') { $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); - } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || - $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { + } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'answer' || $target eq 'meta' || $target eq 'analyze' || + $target eq 'webgrade') { #normally throw away comments my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); } @@ -514,7 +569,7 @@ sub start_num { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = ''; my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser); - if ($target eq 'tex' || $target eq 'web') { + if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') { $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); @@ -535,9 +590,9 @@ sub end_num { sub start_parse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = ''; - if ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || - $target eq 'analyze') { + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze'|| $target eq 'webgrade') { my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); if (!$Apache::lonxml::default_homework_loaded) { @@ -565,14 +620,14 @@ sub end_parse { sub start_algebra { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $result = ''; - if ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || - $target eq 'analyze') { + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze' || $target eq 'webgrade') { my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval); - $result=&Apache::lontexconvert::algebra($inside,$target,$style); + $result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval); } $Apache::lonxml::post_evaluate=0; } @@ -587,3 +642,20 @@ sub end_algebra { 1; __END__ + +=pod + +=head1 NAME + +Apache::scripttag.pm + +=head1 SYNOPSIS + +implements