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

Diff for /loncom/xml/scripttag.pm between versions 1.110 and 1.113

version 1.110, 2004/02/24 21:12:48 version 1.113, 2004/07/15 16:43:37
Line 137  sub start_script { Line 137  sub start_script {
  my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);   my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
     }      }
   } else {    } else {
     if ($target ne "meta") {  
       $result = $token->[4];  
       my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);        my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
       $result.=$bodytext;        if ($target ne "meta") {
     }    $result = $token->[4];
     $result.=$bodytext;
         }
   }    }
   return $result;    return $result;
 }  }
Line 482  sub end_comment { Line 482  sub end_comment {
   
 sub xmlparse {  sub xmlparse {
   my ($string) = @_;    my ($string) = @_;
 #  &Apache::lonxml::debug("Got $string");    &Apache::lonxml::debug("xmlparse recursion starting with $string");
     # Apache::run::evaluate does an 'eval' on the name of the subroutine
     # if it detects something that looks like a subroutine, this ends up calling
     # things without any arguments and since perl is nice enough to pass
     # along the default arguments when you don't explicitly say no arguments
     # if you call &xmlparse, it gets &xmlparse passed as it argument.
     # Same thing soccurs with &chemparse.
     if ($string eq '&xmlparse') { return '&xmlparse'; }
     if ($string eq '&chemparse') { return '&chemparse'; }
   my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=    my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
     @Apache::scripttag::parser_env;      @Apache::scripttag::parser_env;
   my @parser;    my @parser;
Line 490  sub xmlparse { Line 498  sub xmlparse {
   my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,    my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
      $parstack,\@parser,       $parstack,\@parser,
      $safeeval,$style);       $safeeval,$style);
     &Apache::lonxml::debug("xmlparse recursion ending with $result");
   return $result;    return $result;
 }  }
   
Removed from v.1.110  
changed lines
  Added in v.1.113

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