--- loncom/homework/structuretags.pm 2002/10/01 21:04:34 1.121 +++ loncom/homework/structuretags.pm 2003/02/25 21:49:45 1.149 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.121 2002/10/01 21:04:34 sakharuk Exp $ +# $Id: structuretags.pm,v 1.149 2003/02/25 21:49:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,11 +29,13 @@ # 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; BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); @@ -42,7 +44,7 @@ BEGIN { sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); if ($target eq 'web') { return $bodytext; } @@ -55,7 +57,7 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); if ($target eq 'tex') { return $bodytext.' '; } @@ -80,12 +82,12 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, $parser,$safeeval); - $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); + $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); } my $body_tag_start; if (!defined($found{'body'})) { - $body_tag_start='ambiguous reference, submissions ignored $help
"; + $body_tag_start.=$help; + } + } } my $form_tag_start; if (!defined($found{'form'})) { @@ -109,10 +119,11 @@ sub page_start { return ($result,$head_tag_start,$body_tag_start,$form_tag_start); } +#use Time::HiRes(); sub get_resource_name { my ($parstack,$safeeval)=@_; - my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { + my $name=&Apache::lonnet::gettitle(); + if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); if ($name eq 'con_lost') { $name = ''; } } @@ -129,6 +140,7 @@ sub setup_rndseed { $rndseed=time; $ENV{'form.rndseed'}=$rndseed; } + &Apache::lonxml::debug("Setting rndseed to $rndseed"); &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); } return $rndseed; @@ -140,13 +152,13 @@ sub problem_edit_header {
- -
+ +

 

'; } sub problem_edit_footer { - return '
+ return '

'; } @@ -163,6 +175,12 @@ sub problem_web_to_edit_header { if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } $result.= ' /> Show All Foils
'; + my $numtoanalyze=$ENV{'form.numtoanalyze'}; + if (!$numtoanalyze) { $numtoanalyze=100; } + $result.= ' +
'; + return $result; } sub initialize_storage { @@ -228,7 +246,7 @@ sub start_problem { # won't get reset if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { &Apache::lonxml::error('Only one problem allowed in a .problem file'); - my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]); + my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); return ''; } #intialize globals @@ -265,6 +283,7 @@ sub start_problem { &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} + if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { #handle exam checkout if ($Apache::lonhomework::type eq 'exam') { @@ -283,14 +302,20 @@ sub start_problem { my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); + &Apache::lonxml::debug("Got $status"); if (( $status eq 'CLOSED' ) || ( $status eq 'UNCHECKEDOUT') || - ( $status eq 'BANNED')) { - my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); + ( $status eq 'BANNED') || + ( $status eq 'UNAVAILABLE')) { + my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); if ( $target eq "web" ) { $result.= $head_tag_start.''; - my $msg=$body_tag_start. - '

Not open to be viewed

'; + my $msg=$body_tag_start; + if ($status eq 'UNAVAILABLE') { + $result.='

Unable to determine if this resource is open due to network problems. Please try again later.

'; + } else { + $result.='

Not open to be viewed

'; + } if ($status eq 'CLOSED') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { @@ -298,8 +323,13 @@ sub start_problem { } $result.=$msg.'
'; } elsif ($target eq 'tex') { - $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; - } + $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm "; + if ($status eq 'UNAVAILABLE') { + $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm '; + } else { + $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; + } + } } elsif ($target eq 'web') { my $name= &get_resource_name($parstack,$safeeval); if ($status eq 'CAN_ANSWER') { @@ -318,7 +348,7 @@ sub start_problem { } } } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' - || $status eq 'CLOSED') { + || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') { $result.=$head_tag_start. "$name\n$body_tag_start\n"; } @@ -382,16 +412,14 @@ sub end_problem { my $result=''; my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && $status eq 'CAN_ANSWER' ) { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status - my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part); - #FIXME this is ugly we should just generate tex in inputtags - if ($target eq 'tex') { $gradestatus=&html_to_tex($gradestatus); } + my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} } if ( @@ -408,21 +436,25 @@ sub end_problem { $result.="\n"; } } - if ($target ne 'tex') { + if ($target eq 'web') { $result.=&Apache::lonxml::xmlend(); - } else { - $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; - if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\end{minipage}\end{document} '; - } else { - $result .= ''; - } + } elsif ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{minipage}\end{document} '; + } else { + $result .= ''; + } } } if ($target eq 'grade') { &Apache::lonhomework::showhash(%Apache::lonhomework::results); &finalize_storage(); } + if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) { + $result.=''; #normally we get it from xmlend, but in CSTR + # we always show answer mode too. + } } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; @@ -430,7 +462,7 @@ sub end_problem { } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result = &problem_edit_footer(); - } + } return $result; } @@ -476,21 +508,40 @@ sub end_library { } sub start_block { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - my $code = @$parstack[$#$parstack]; - $code =~ s/\"//g; - $code .=';return $condition;'; - # print "
$code
"; - my $result = &Apache::run::run($code,$safeeval); - &Apache::lonxml::debug("block :$code: returned :$result:"); - if ( ! $result ) { - my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); - &Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); + my $result; + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + my $code = @$parstack[$#$parstack]; + if ($code) { + $code =~ s/\"//g; + $code .=';return $condition;'; + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + $result = &Apache::run::run($code,$safeeval); + &Apache::lonxml::debug("block :$code: returned :$result:"); + } else { + $result='1'; + } + if ( ! $result ) { + my $skip=&Apache::lonxml::get_all_text("/block",$parser); + &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); + } + $result=''; + } elsif ($target eq 'edit') { + $result .=&Apache::edit::tag_start($target,$token); + $result .=&Apache::edit::text_arg('Test Condition:','condition', + $token,40); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'condition'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - } - return ""; + return $result; } sub end_block { @@ -505,6 +556,9 @@ sub start_while { $code .=';return $condition;'; push( @Apache::structuretags::whileconds, $code); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } my $result = &Apache::run::run($code,$safeeval); my $bodytext=$$parser[$#$parser]->get_text("/while"); push( @Apache::structuretags::whilebody, $bodytext); @@ -535,8 +589,8 @@ sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || - $target eq 'tex') { - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); + $target eq 'tex' || $target eq 'analyze') { + my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; my @randomlist; @@ -612,26 +666,48 @@ sub start_part { $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { - my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); - push (@Apache::inputtags::status,$status); - my $expression='$external::datestatus="'.$status.'";'; - $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; - &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { - my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); - if ( $target eq "web" ) { - $result="
Part is not open to be viewed. It $accessmsg
"; - } elsif ( $target eq 'tex' ) { - $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + } elsif ($target eq 'web' || $target eq 'grade' || + $target eq 'answer' || $target eq 'tex') { + if ($hidden) { + my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); + } else { + my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); + push (@Apache::inputtags::status,$status); + my $expression='$external::datestatus="'.$status.'";'; + $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; + &Apache::run::run($expression,$safeeval); + if ( $status eq 'CLOSED' ) { + my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); + if ( $target eq "web" ) { + $result="
Part is not open to be viewed. It $accessmsg
"; + } elsif ( $target eq 'tex' ) { + $result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; + } + } else { + if ($target eq 'tex') { + if ($$tagstack[-2] ne 'problem') { + $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; + } + } + } } - } else { - if ($target eq 'tex') { - $result='\vskip 0 mm'; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Part ID:','id',$token). + &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help"). + &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'id'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); } - } } return $result; } @@ -640,25 +716,29 @@ sub end_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; &Apache::lonxml::debug("in end_part $target "); my $status=$Apache::inputtags::status['-1']; - pop @Apache::inputtags::status; - if ( $target eq 'meta' ) { return ''; } - if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { - return &Apache::inputtags::grade; - } - if ($target eq 'web' || $target eq 'tex' ) { - my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); + my $result=''; + if ( $target eq 'meta' ) { + $result=''; + } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) { + $result=&Apache::inputtags::grade; + } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, + $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} - return $gradestatus; + $result=$gradestatus; } - return ''; + pop @Apache::inputtags::status; + return $result; } sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && - $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { - &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); + $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && + $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { + &Apache::lonxml::get_all_text("/preduedate",$parser); } } return ''; @@ -672,7 +752,7 @@ sub start_postanswerdate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { - &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/postanswerdate",$parser); } } elsif ($target eq 'tex') { return '\vskip 0 mm \noindent'; @@ -691,7 +771,7 @@ sub start_notsolved { &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { &Apache::lonxml::debug("skipping"); - &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/notsolved",$parser); } } return ''; @@ -706,7 +786,7 @@ sub start_solved { if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { - &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); + &Apache::lonxml::get_all_text("/solved",$parser); } } return ''; @@ -728,7 +808,7 @@ sub end_startouttext { my $text=''; if ($target eq 'edit') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); + $text=&Apache::lonxml::get_all_text("endouttext",$parser); $result.=&Apache::edit::start_table($token)."Text Block Delete:". &Apache::edit::deletelist($target,$token) @@ -739,7 +819,7 @@ sub end_startouttext { &Apache::edit::editfield($token->[1],$text,"",80,4); } if ($target eq 'modified') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); + $text=&Apache::lonxml::get_all_text("endouttext",$parser); $result=''.&Apache::edit::modifiedfield(); } if ($target eq 'tex') { @@ -751,7 +831,9 @@ sub start_endouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } - if ($target eq "modified") { $result=''; } + if ($target eq "modified") { + $result=''. + &Apache::edit::handle_insertafter('startouttext'); } return $result; } sub end_endouttext { @@ -762,7 +844,7 @@ sub end_endouttext { } sub delete_startouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; -# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); +# my $text=&Apache::lonxml::get_all_text("endouttext",$parser); my $text=$$parser['-1']->get_text("/endouttext"); my $ntoken=$$parser['-1']->get_token(); &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");