--- loncom/homework/structuretags.pm 2001/05/15 20:48:43 1.38 +++ loncom/homework/structuretags.pm 2001/08/06 18:33:58 1.52 @@ -1,18 +1,19 @@ # 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 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; @@ -21,10 +22,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 @@ -33,22 +35,53 @@ 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=' 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') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); @@ -59,14 +92,14 @@ sub start_problem { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); if ( $target eq "web" ) { - return $result."
Problem is not open to be viewed. The problem $datemsg
"; + $result.= $head_tag_start.''; + return $result . $body_tag_start . + "
Problem is not open to be viewed. The problem $datemsg
"; } - } + } } if ($target eq 'web') { - my $args =''; - if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } - my $name = &Apache::run::run("{$args;".'return $name}',$safeeval); + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); if ($name eq 'con_lost') { $name = ''; } @@ -74,8 +107,8 @@ sub start_problem { $Apache::lonhomework::name=$name; if ($status eq 'CAN_ANSWER') { # create a page header and exit - $result.="$name\n - \n + $result.="$head_tag_start$name\n + $body_tag_start\n
". ''; if ($ENV{'request.state'} eq "construct") { @@ -84,18 +117,19 @@ sub start_problem { } return $result; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return $result."$name\n\n"; + return $result.$head_tag_start."$name\n$body_tag_start\n"; } } if ($target eq 'edit') { - $result.=' - - - - -
-'; - my $temp=&Apache::edit::insertlist($token,$target); + $result.=$head_tag_start."".$body_tag_start. + ' + + + +
+
+ '; + my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; return $result; } @@ -108,10 +142,10 @@ sub start_problem { } 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' ) { 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 @@ -120,15 +154,16 @@ sub end_problem { # 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 ($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 ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; @@ -141,8 +176,41 @@ sub end_problem { 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') { + $result='
'; + } + return $result; +} + sub start_block { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade') { my $code = @$parstack[$#$parstack]; @@ -164,7 +232,7 @@ sub end_block { } sub start_while { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; @@ -181,7 +249,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); @@ -198,7 +266,7 @@ sub end_while { # ... # sub start_randomlist { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); my $b_parser= HTML::TokeParser->new(\$body); my $b_tok; @@ -237,6 +305,7 @@ sub start_randomlist { sub shuffle { my $a=shift; my $i; + &Apache::response::setrandomnumber(); for($i=@$a;--$i;) { my $j=int rand($i+1); next if $i == $j; @@ -245,19 +314,20 @@ sub shuffle { } 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; } elsif ($target eq 'web' || $target eq 'grade') { - my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); + my ($status,$datemsg) = &Apache::lonhomework::check_date($id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; @@ -273,7 +343,7 @@ 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; @@ -288,7 +358,7 @@ sub end_part { } sub start_preduedate { - 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 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { @@ -303,7 +373,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]); @@ -317,7 +387,7 @@ sub end_postanswerdate { } sub start_notsolved { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &Apache::lonxml::debug("not solved has :$gradestatus:"); @@ -334,7 +404,7 @@ sub end_notsolved { } sub start_solved { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ($target eq 'web' || $target eq 'grade') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { @@ -349,21 +419,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($target,$token). - &Apache::edit::editfield($token->[1],$text,"Text Block",50,5); + $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']); @@ -372,19 +448,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($target,$token); } + 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 $token=$$parser['-1']->get_token(); + &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext"); + &Apache::lonxml::end_tag($tagstack,$parstack,$token); + # Deleting 2 parallel tag pairs, but we need the numbers later to look like + # they did the last time round + &Apache::lonxml::increasedepth($token); + &Apache::lonxml::decreasedepth($token); + return 1; +} 1; __END__