Diff for /loncom/homework/structuretags.pm between versions 1.41 and 1.45

version 1.41, 2001/06/05 16:32:18 version 1.45, 2001/06/26 21:43:30
Line 1 Line 1
 # The LearningOnline Network with CAPA   # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document  # definition of tags that give a structure to a document
 # 2/19 Guy  # 2/19 Guy
   # 6/26/2001 fixed extra web display at end of <web></web> tags
 package Apache::structuretags;   package Apache::structuretags; 
   
 use strict;  use strict;
Line 21  sub start_web { Line 22  sub start_web {
 }  }
   
 sub end_web {  sub end_web {
       return '';
 }  }
   
 sub start_tex {  sub start_tex {
Line 33  sub start_tex { Line 35  sub start_tex {
 }  }
   
 sub end_tex {  sub end_tex {
       return '';
 }  }
   
 sub start_problem {  sub start_problem {
Line 41  sub start_problem { Line 44  sub start_problem {
 #intialize globals  #intialize globals
   $Apache::inputtags::part='0';    $Apache::inputtags::part='0';
   @Apache::inputtags::responselist = ();    @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  #adeed vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';    my $expression='$external::part='.$Apache::inputtags::part.';';
   &Apache::run::run($expression,$safeeval);    &Apache::run::run($expression,$safeeval);
Line 364  sub end_startouttext { Line 371  sub end_startouttext {
   
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);      $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
     $result=      $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
       &Apache::edit::tag_start($target,$token).  <td>Delete:".
  &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);    &Apache::edit::deletelist($target,$token)
     ."</td>
   <td>".
     &Apache::edit::insertlist($target,$token).
       "</td>
   </tr><tr><td colspan=\"3\">\n".
    &Apache::edit::editfield($token->[1],$text,"",50,4);
   }    }
   if ($target eq 'modified') {    if ($target eq 'modified') {
     $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);      $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
Line 377  sub end_startouttext { Line 390  sub end_startouttext {
 sub start_endouttext {  sub start_endouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';    my $result='';
   if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }    if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
   if ($target eq "modified") { $result='<endouttext />'; }    if ($target eq "modified") { $result='<endouttext />'; }
   return $result;    return $result;
 }  }
Line 387  sub end_endouttext { Line 400  sub end_endouttext {
   if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }    if ($target eq "edit" || $target eq 'modified') { @result=('','no'); }
   return (@result);    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;  1;
 __END__  __END__

Removed from v.1.41  
changed lines
  Added in v.1.45


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>