[BACK]Return to scripttag.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/scripttag.pm between versions 1.73 and 1.77

version 1.73, 2002/05/03 22:28:36 version 1.77, 2002/09/23 17:25:24
Line 43  BEGIN { Line 43  BEGIN {
   &Apache::lonxml::register('Apache::scripttag',    &Apache::lonxml::register('Apache::scripttag',
     ('script','scriptlib','parserlib','import',      ('script','scriptlib','parserlib','import',
      'window','display','storetc','physnet',       'window','display','storetc','physnet',
      'standalone'));       'standalone','comment'));
 }  }
   
 sub start_script {  sub start_script {
Line 71  sub start_script { Line 71  sub start_script {
       #&Apache::run::run($bodytext,$safeeval);        #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";        #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
       $result=&Apache::edit::tag_start($target,$token,'Script');        $result=&Apache::edit::tag_start($target,$token,'Script');
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);        $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
     }      }
   } else {    } else {
     if ($target ne "meta") {      if ($target ne "meta") {
Line 118  sub start_display { Line 118  sub start_display {
     #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";      #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
     #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);      #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
     $result=&Apache::edit::tag_start($target,$token,'Script With Display');      $result=&Apache::edit::tag_start($target,$token,'Script With Display');
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1)      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
   }    }
   return $result;    return $result;
 }  }
Line 253  sub start_import { Line 253  sub start_import {
   
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);    $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
   
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||$target eq 'tex') {
     # FIXME this probably needs to be smart about construction vs.      # FIXME this probably needs to be smart about construction vs.
     # non construction space.      # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);      my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
Line 338  sub end_physnet { Line 338  sub end_physnet {
   
 sub start_standalone {  sub start_standalone {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   if ($target eq 'web'  && $ENV{'request.course.id'} ) {    my $result='';
     my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);    if ($target eq 'web' ) {
       if ( $ENV{'request.course.id'} ) {
         my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
       } else {
         $result='<table bgcolor="#E1E1E1" border="2"><tr><td>';
       }
   }    }
   return '';    return $result;
 }  }
   
 sub end_standalone {  sub end_standalone {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'web' ) {
       if ( $ENV{'request.course.id'} ) {
       } else {
         $result='</td></tr></table>';
       }
     }
     return $result;
   }
   
   sub start_comment {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'edit') {
       $result=&Apache::edit::tag_start($target,$token);
       my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4)
     } elsif ( $target eq 'modified') {
       $result=$token->[4].&Apache::edit::modifiedfield($token);
     } elsif ( $target eq 'web' || $target eq 'tex' ||
       $target eq 'grade' || $target eq 'answer' || $target eq 'meta') {
       #normally throw away comments
       my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]);
     }
     return $result;
   }
   
   sub end_comment {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
   return '';    return '';
 }  }
   
Removed from v.1.73  
changed lines
  Added in v.1.77

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