--- loncom/homework/structuretags.pm 2001/04/26 21:27:15 1.35 +++ loncom/homework/structuretags.pm 2001/10/30 19:18:15 1.71 @@ -1,17 +1,21 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # 2/19 Guy +# 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; sub BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); + &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')) } sub start_web { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); if ($target eq 'web') { return $bodytext; @@ -20,10 +24,11 @@ sub start_web { } sub end_web { + return ''; } sub start_tex { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); if ($target eq 'tex') { return $bodytext @@ -32,115 +37,314 @@ sub start_tex { } sub end_tex { + return ''; +} + +sub page_start { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + my $head_tag_start=''.&Apache::lonxml::registerurl(); + my $body_tag_start='The resource needs to be checked out +As a resource gets checked out, a unique timestamped ID is given to it, and a +permanent record is left in the system.

+ +Checking out resources is subject to course policies, and may exclude future +credit even if done erroneously.

+ +

+ +
+ENDCHECKOUT } sub start_problem { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); + &initialize_storage(); + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + if ($Apache::lonhomework::type eq '') { + my $uri=$ENV{'request.uri'}; + if ($uri=~/\.(\w+)$/) { + $Apache::lonhomework::type=$1; + &Apache::lonxml::debug("Using type of $1"); + } else { + $Apache::lonhomework::type='problem'; + &Apache::lonxml::debug("Using default type, problem, :$uri:"); + } + } -#adeed vars to the scripting enviroment + #added vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); my $status; - my $datemsg; - if ($target eq 'web' || $target eq 'grade') { - ($status,$datemsg) = &Apache::lonhomework::check_date('0'); + my $accessmsg; + + #should get back a or the neccesary stuff to start XML/MathML + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + + + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + #handle exam checkout + if ($Apache::lonhomework::type eq 'exam') { + my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; + if (($ENV{'form.doescheckout'}) && (!$token)) { + $token=&Apache::lonxml::maketoken(); + $Apache::lonhomework::history{"resource.0.outtoken"}=$token; + } + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + + #handle rand seed in construction space + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; + } + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + } + ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; &Apache::run::run($expression,$safeeval); - if ( $status eq 'CLOSED' ) { + if (( $status eq 'CLOSED' ) || + ( $status eq 'UNCHECKEDOUT') || + ( $status eq 'BANNED')) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Problem is not open to be viewed. The problem $datemsg
"; + $result.= $head_tag_start.''; + my $msg=$body_tag_start. + '

Not open to be viewed

'; + if ($status eq 'CLOSED') { + $msg.='The problem '.$accessmsg; + } elsif ($status eq 'UNCHECKEDOUT') { + $msg.=&checkout_msg; + } + $result.=$msg.'
'; + } + } elsif ($target eq 'web') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + $result.="$head_tag_start$name\n + $body_tag_start\n +
". + ''; + if ($ENV{'request.state'} eq "construct") { + $result.= + ' + + Random Seed:
'; + } + # if we are viewing someone else preserve that info + if (defined $ENV{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } + } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'CLOSED') { + $result.=$head_tag_start. + "$name\n$body_tag_start\n"; } - } - } - if ($target eq 'web') { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; - if ($status eq 'CAN_ANSWER') { - # create a page header and exit - return "$name\n\n".''; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return "$name\n\n"; } + } elsif ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start. + ' + + + +
+
+ '; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; + } elsif ($target eq 'modified') { + $result=$token->[4]; + $result.=&Apache::edit::handle_insert(); + } else { + # page_start returned a starting result, delete it if we don't need it + $result = ''; } - if ($target eq 'edit') { - return ' - - - -'; - } - return ''; + return $result; } sub end_problem { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - if ($target eq 'grade' || $target eq'web' ) { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { 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 ($Apache::inputtags::part eq '0') { + } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need show the current # grading status $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); - } - if ($target eq 'web') { + } + if ( + ($target eq 'web' && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') + ) { if ($status eq 'CAN_ANSWER') { $result.="\n"; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { - $result.="\n"; - } + $result.="\n"; + } + $result.=&Apache::lonxml::xmlend(); } - } - if ($target eq 'meta') { + if ($target eq 'grade') { + &Apache::lonhomework::showhash(%Apache::lonhomework::results); + &finalize_storage(); + } + } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { - $result=&Apache::response::mandatory_part_meta; } + } elsif ($target eq 'edit') { + &Apache::lonxml::debug("in end_problem with $target, edit"); + $result='
'; } + return $result; +} + +sub start_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($result,$head_tag_start,$body_tag_start)= + &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start. + '
+ + + +
+ '; + my $temp=&Apache::edit::insertlist($target,$token); + $result.=$temp; + return $result; + } + if ($target eq 'modified') { + $result=$token->[4]; + $result.=&Apache::edit::handle_insert(); + return $result; + } + return ''; +} + +sub end_library { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; if ($target eq 'edit') { - &Apache::lonxml::debug("in end_problem with $target, edit"); $result='
'; } return $result; } sub start_block { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - 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]"); + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + 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]"); + } } return ""; } sub end_block { + return ''; } sub start_while { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; @@ -157,7 +361,7 @@ sub start_while { } sub end_while { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $code = pop @Apache::structuretags::whileconds; my $bodytext = pop @Apache::structuretags::whilebody; my $result = &Apache::run::run($code,$safeeval); @@ -174,66 +378,71 @@ sub end_while { # ... # sub start_randomlist { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); - my $b_parser= HTML::TokeParser->new(\$body); - my $b_tok; - my @randomlist; - my $list_item; - - while($b_tok = $b_parser->get_token() ) { - if($b_tok->[0] eq 'S') { # start tag - # get content of the tag until matching end tag - # get all text upto the matching tag - # and push the content into @randomlist - $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); - $list_item = "$b_tok->[4]"."$list_item"."[1]>"; - push(@randomlist,$list_item); - # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; - } - if($b_tok->[0] eq 'T') { # text - # what to do with text in between tags? - # print "TEXT $b_tok->[1]
"; - } - # if($b_tok->[0] eq 'E') { # end tag, should not happen + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { + my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); + my $b_parser= HTML::TokeParser->new(\$body); + my $b_tok; + my @randomlist; + my $list_item; + while($b_tok = $b_parser->get_token() ) { + if($b_tok->[0] eq 'S') { # start tag + # get content of the tag until matching end tag + # get all text upto the matching tag + # and push the content into @randomlist + $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); + $list_item = "$b_tok->[4]"."$list_item"."[1]>"; + push(@randomlist,$list_item); + # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; + } + if($b_tok->[0] eq 'T') { # text + # what to do with text in between tags? + # print "TEXT $b_tok->[1]
"; + } + # if($b_tok->[0] eq 'E') { # end tag, should not happen # print "END-TAG $b_tok->[1]
"; - # } - } - my @idx_arr = (0 .. $#randomlist); - &Apache::structuretags::shuffle(\@idx_arr); - my $bodytext = ''; - for(0 .. $#randomlist) { - $bodytext .= "$randomlist[ $idx_arr[$_] ]"; - } + # } + } - &Apache::lonxml::newparser($parser,\$bodytext); + my @idx_arr = (0 .. $#randomlist); + &Apache::structuretags::shuffle(\@idx_arr); + my $bodytext = ''; + for(0 .. $#randomlist) { + $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + } + &Apache::lonxml::newparser($parser,\$bodytext); + } return ""; } sub shuffle { my $a=shift; my $i; - for($i=@$a;--$i;) { - my $j=int rand($i+1); - next if $i == $j; - @$a[$i,$j] = @$a[$j,$i]; + if (defined(@$a)) { + &Apache::response::setrandomnumber(); + for($i=@$a;--$i;) { + my $j=int rand($i+1); + next if $i == $j; + @$a[$i,$j] = @$a[$j,$i]; + } } } sub end_randomlist { + return ''; } sub start_part { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $id = &Apache::run::run("{$args;".'return $id}',$safeeval); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); + @Apache::inputtags::previous=(); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } else { - my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); + } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { + 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"}.'";'; @@ -241,7 +450,7 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Part is not open to be viewed. It $datemsg
"; + return "
Part is not open to be viewed. It $accessmsg
"; } } } @@ -249,20 +458,23 @@ sub start_part { } sub end_part { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + 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 'grade' && $status eq 'CAN_ANSWER') { + return &Apache::inputtags::grade; + } + if ($target eq 'web') { + return &Apache::inputtags::gradestatus($Apache::inputtags::part); } - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + return ''; } sub start_preduedate { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); @@ -276,7 +488,7 @@ sub end_preduedate { } sub start_postanswerdate { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade') { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); @@ -290,8 +502,8 @@ sub end_postanswerdate { } sub start_notsolved { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { @@ -307,8 +519,8 @@ sub end_notsolved { } sub start_solved { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); @@ -322,21 +534,27 @@ sub end_solved { } sub start_startouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my @result=(''.''); if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); } return (@result); } sub end_startouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $text=''; if ($target eq 'edit') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); - $result= - &Apache::edit::tag_start("outtext"). - &Apache::edit::editfield($token->[1],$text,"Text Block"); + $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); + $result.=&Apache::edit::start_table($token)."Text Block +Delete:". + &Apache::edit::deletelist($target,$token) + ." +". + &Apache::edit::insertlist($target,$token). + " +\n". + &Apache::edit::editfield($token->[1],$text,"",50,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -345,19 +563,31 @@ sub end_startouttext { return $result; } sub start_endouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; - if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); } + if ($target eq "edit" ) { $result="".&Apache::edit::end_table()."\n"; } if ($target eq "modified") { $result=''; } return $result; } sub end_endouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my @result=('',''); if ($target eq "edit" || $target eq 'modified') { @result=('','no'); } return (@result); } - +sub delete_startouttext { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; +# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); + 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"); + &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken); + # Deleting 2 parallel tag pairs, but we need the numbers later to look like + # they did the last time round + &Apache::lonxml::increasedepth($ntoken); + &Apache::lonxml::decreasedepth($ntoken); + return 1; +} 1; __END__