--- loncom/xml/scripttag.pm 2001/05/31 22:38:36 1.39 +++ loncom/xml/scripttag.pm 2001/06/02 03:59:59 1.40 @@ -14,7 +14,7 @@ sub BEGIN { } sub start_script { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval); &Apache::lonxml::debug("found type of $type"); @@ -37,7 +37,7 @@ sub start_script { } sub end_script { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; if ( $target eq "meta" ) { return ''; } my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); my $result=''; @@ -47,7 +47,7 @@ sub end_script { } sub start_display { - my ($target,$token,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]); @@ -71,7 +71,7 @@ sub end_display { } sub start_scriptlib { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $bodytext; my $result =''; my $error=''; @@ -109,14 +109,14 @@ sub start_scriptlib { } sub end_scriptlib { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; # if ($target eq "edit" ) { $result=" "; } return $result; } sub start_parserlib { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $bodytext; my $result =""; my $error=''; @@ -154,7 +154,7 @@ sub start_parserlib { } sub end_parserlib { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; # if ($target eq "edit" ) { # $result=&Apache::edit::tag_end($target,$token); @@ -163,7 +163,7 @@ sub end_parserlib { } sub start_window { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; if ($target eq 'web') { &Apache::lonxml::startredirection; @@ -174,7 +174,7 @@ sub start_window { } sub end_window { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'web') { my $output=&Apache::lonxml::endredirection; @@ -189,7 +189,7 @@ sub end_window { } sub start_import { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $bodytext=$$parser[$#$parser]->get_text("/import"); my $result =""; @@ -217,7 +217,7 @@ sub end_import { } sub start_meta { - my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; if ($target ne 'meta') { $result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); @@ -231,23 +231,5 @@ sub start_meta { sub end_meta { } -sub getfilenothere { - my ($filename) = @_; - my $a=""; - - $filename=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces - $filename="/home/httpd/html/res".$filename; - if (! -e $filename ) { - &Apache::lonnet::subscribe($filename); - &Apache::lonnet::repcopy($filename); - } - if (! -e $filename ) { return -1; }; - my $fh=Apache::File->new($filename); - while (<$fh>) { - $a .=$_; - } - return $a -} - 1; __END__