--- loncom/homework/structuretags.pm 2001/04/05 00:10:23 1.34 +++ loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41 @@ -8,10 +8,11 @@ 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 { - 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; @@ -23,7 +24,7 @@ sub end_web { } 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 @@ -35,7 +36,7 @@ sub end_tex { } sub start_problem { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; #intialize globals $Apache::inputtags::part='0'; @@ -46,6 +47,14 @@ sub start_problem { &Apache::run::run($expression,$safeeval); my $status; my $datemsg; + + #should get back a or the neccesary stuff to start XML/MathML + my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); + + my $head_tag_start=''.&Apache::lonxml::registerurl(); + my $body_tag_start=''; if ($target eq 'web' || $target eq 'grade') { ($status,$datemsg) = &Apache::lonhomework::check_date('0'); push (@Apache::inputtags::status,$status); @@ -55,14 +64,14 @@ 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
"; + $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 = ''; } @@ -70,22 +79,44 @@ sub start_problem { $Apache::lonhomework::name=$name; if ($status eq 'CAN_ANSWER') { # create a page header and exit - return "$name\n\n
".''; + $result.="$head_tag_start$name\n + $body_tag_start\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.$head_tag_start."$name\n$body_tag_start\n"; } } if ($target eq 'edit') { - return "\n".''; + $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_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 @@ -94,18 +125,17 @@ 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"; + } } - } + } if ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { - $result=&Apache::response::mandatory_part_meta; } } @@ -117,26 +147,29 @@ sub end_problem { } 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') { + 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; @@ -153,7 +186,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); @@ -170,7 +203,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; @@ -220,15 +253,13 @@ 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 ($target,$token,$tagstack,$parstack,$parser,$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.'";'; @@ -245,19 +276,22 @@ 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; } - return &Apache::inputtags::gradestatus($Apache::inputtags::part); + if ($target eq 'web') { + return &Apache::inputtags::gradestatus($Apache::inputtags::part); + } + return ''; } 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' ) { @@ -272,7 +306,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]); @@ -286,7 +320,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:"); @@ -303,7 +337,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/) { @@ -318,31 +352,40 @@ sub end_solved { } sub start_startouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $result=''; - if ($target eq "edit" ) { $result=" "; } - return $result; + 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') { - $result=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); - $result=&Apache::edit::editfield($token->[1],$result); + $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); + } + if ($target eq 'modified') { + $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); + $result=''.&Apache::edit::modifiedfield(); } 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=" "; } + if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); } + if ($target eq "modified") { $result=''; } return $result; } sub end_endouttext { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $result=''; - if ($target eq "edit" ) { $result=" "; } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my @result=('',''); + if ($target eq "edit" || $target eq 'modified') { @result=('','no'); } + return (@result); }