--- loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41 +++ loncom/homework/structuretags.pm 2001/07/18 20:08:34 1.48 @@ -1,13 +1,14 @@ # 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')) } @@ -21,6 +22,7 @@ sub start_web { } sub end_web { + return ''; } sub start_tex { @@ -33,6 +35,17 @@ 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=''; + return ($result,$head_tag_start,$body_tag_start); } sub start_problem { @@ -41,7 +54,11 @@ sub start_problem { #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); - + $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 '') { + $Apache::lonhomework::type='homework'; + } #adeed vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); @@ -49,12 +66,9 @@ sub start_problem { 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 ($result,$head_tag_start,$body_tag_start)= + &page_start($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); @@ -146,6 +160,39 @@ 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,$tagstack,$parstack,$parser,$safeeval)=@_; @@ -250,17 +297,19 @@ sub shuffle { } sub end_randomlist { + return ''; } sub start_part { 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 = (); 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"}.'";'; @@ -364,9 +413,15 @@ sub end_startouttext { 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']); @@ -377,7 +432,7 @@ sub end_startouttext { sub start_endouttext { 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; } @@ -387,7 +442,19 @@ sub end_endouttext { 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__