--- loncom/homework/structuretags.pm 2002/04/25 21:38:09 1.92 +++ loncom/homework/structuretags.pm 2004/02/16 20:30:34 1.242 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.92 2002/04/25 21:38:09 sakharuk Exp $ +# $Id: structuretags.pm,v 1.242 2004/02/16 20:30:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,23 +29,28 @@ # 6/26/2001 fixed extra web display at end of tags # 8/17,8/18,8/20 Gerd Kortemeyer + package Apache::structuretags; use strict; use Apache::lonnet; +use Apache::File(); +use Apache::lonmenu; +use Apache::lonlocal; +use Apache::lonxml; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); -# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', +'simpleeditbutton','definetag')); } sub start_web { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); - if ($target eq 'web') { - return $bodytext; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + if ($target eq 'web') { + return $bodytext; + } + return ''; } sub end_web { @@ -53,12 +58,13 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); - if ($target eq 'tex') { - return $bodytext - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + if ($target eq 'tex') { + return $bodytext.' '; + } + return $result;; } sub end_tex { @@ -66,58 +72,219 @@ sub end_tex { } sub page_start { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my %found; - foreach my $taginside ($tagstack) { - foreach my $taglookedfor ('html','body','form') { - if ($taginside =~ /^$taglookedfor$/i) { $found{$taglookedfor} = 1; } - } - } - - my $result; - my $head_tag_start; - if (!defined($found{'html'})) { - $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, - $parser,$safeeval); - $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); - } - my $body_tag_start; - if (!defined($found{'body'})) { - $body_tag_start='"; + $body_tag_start.=$help; + } + } + } + my $form_tag_start; + if (!defined($found{'form'})) { + $form_tag_start='
'; + } + return ($result,$head_tag_start,$body_tag_start,$form_tag_start); +} + +#use Time::HiRes(); +sub get_resource_name { + my ($parstack,$safeeval)=@_; + if (defined($Apache::lonhomework::name)) { + return $Apache::lonhomework::name; + } + my $name=&Apache::lonnet::gettitle(); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + if ($name!~/\S+/) { + $name=$ENV{'request.uri'}; + $name=~s-.*/([^/]+)$-$1-; + } + $Apache::lonhomework::name=$name; + return $name; +} + +sub setup_rndseed { + my ($safeeval)=@_; + my $rndseed; + my ($symb)=&Apache::lonxml::whichuser(); + if ($ENV{'request.state'} eq "construct" || $symb eq '') { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=$Apache::lonhomework::history{'rndseed'}; + if (!$rndseed) { + $rndseed=time; + } + $ENV{'form.rndseed'}=$rndseed; + } + if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') || + $ENV{'form.newrandomization'} eq &mt('New Randomization')) { + srand(time); + $rndseed=int(rand(2100000000)); + $ENV{'form.rndseed'}=$rndseed; + delete($ENV{'form.resetdata'}); + delete($ENV{'form.newrandomization'}); + } + if (defined($rndseed) && $rndseed ne int($rndseed)) { + $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); + } + if ($safeeval) { + &Apache::lonxml::debug("Setting rndseed to $rndseed"); + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + } + } + return $rndseed; +} + +sub problem_edit_header { + return ' + + + +
+ +
'. + &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index', + 'Problem Editing Help').''. + &Apache::loncommon::help_open_faq(5). + &Apache::loncommon::help_open_bug('Authoring').'
'. + '
'; +} + +sub problem_edit_footer { + return '

+ '; +} + +sub option { + my ($value,$name) = @_; + my $result ="