--- loncom/homework/structuretags.pm 2001/04/26 21:27:15 1.35 +++ loncom/homework/structuretags.pm 2001/05/31 22:37:56 1.39 @@ -8,6 +8,7 @@ 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_insert('problem','',('part','postanswerdate','preduedate')) } sub start_web { @@ -46,6 +47,9 @@ sub start_problem { &Apache::run::run($expression,$safeeval); my $status; my $datemsg; + + my $result=&Apache::londefdef::start_html($target,$token,$parstack,$parser,$safeeval); + if ($target eq 'web' || $target eq 'grade') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); push (@Apache::inputtags::status,$status); @@ -55,14 +59,12 @@ sub start_problem { if ( $status eq 'CLOSED' ) { 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
"; + return $result."
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 = ''; } @@ -70,17 +72,35 @@ sub start_problem { $Apache::lonhomework::name=$name; if ($status eq 'CAN_ANSWER') { # create a page header and exit - return "$name\n\n
".''; + $result.="$name\n + \n + ". + ''; + if ($ENV{'request.state'} eq "construct") { + $result.=' +
'; + } + return $result; } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return "$name\n\n"; + return $result."$name\n\n"; } } if ($target eq 'edit') { - return ' + $result.=' - + + +
'; + 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 ''; } @@ -109,7 +129,6 @@ sub end_problem { } if ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { - $result=&Apache::response::mandatory_part_meta; } } @@ -123,20 +142,23 @@ sub end_problem { sub start_block { my ($target,$token,$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') { + 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 { @@ -225,14 +247,12 @@ sub end_randomlist { 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 $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } else { + } elsif ($target eq 'web' || $target eq 'grade') { my ($status,$datemsg) = &Apache::lonhomework::check_date("OPEN_DATE",$id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -254,10 +274,13 @@ sub end_part { 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; } - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + if ($target eq 'web') { + return &Apache::inputtags::gradestatus($Apache::inputtags::part); + } + return ''; } sub start_preduedate { @@ -335,8 +358,8 @@ sub end_startouttext { 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"); + &Apache::edit::tag_start($target,$token). + &Apache::edit::editfield($token->[1],$text,"Text Block",50,5); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); @@ -347,7 +370,7 @@ sub end_startouttext { sub start_endouttext { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $result=''; - if ($target eq "edit" ) { $result=&Apache::edit::tag_end("outtext"); } + if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); } if ($target eq "modified") { $result=''; } return $result; }