--- loncom/xml/scripttag.pm 2000/12/21 18:12:12 1.28 +++ loncom/xml/scripttag.pm 2001/01/10 16:53:07 1.31 @@ -10,15 +10,13 @@ use Apache::lonnet; sub BEGIN { &Apache::lonxml::register('Apache::scripttag',('script','scriptlib', 'parserlib','import', - 'footnote','display')); + 'window','meta','display')); } sub start_script { my ($target,$token,$parstack,$parser,$safeeval)=@_; my $args =''; - if ( $#$parstack > -1 ) { - $args=$$parstack[$#$parstack]; - } + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } my $type = &Apache::run::run("{$args;".'return $type}',$safeeval); my $result=''; #&Apache::lonxml::debug("found type of $type"); @@ -26,7 +24,6 @@ sub start_script { my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]); if ( $target eq "modified" ) { - } elsif ( $target eq "web" || $target eq "grade" ) { &Apache::run::run($bodytext,$safeeval); } elsif ($target eq "edit" ) { @@ -43,7 +40,12 @@ sub start_script { sub end_script { my ($target,$token,$parstack,$parser,$safeeval)=@_; if ( $target eq "meta" ) { return ''; } -# return $token->[2]; + my $args =''; + if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; } + my $type = &Apache::run::run("{$args;".'return $type}',$safeeval); + my $result=''; + #other script blocks need to survive + if ($type ne "loncapa/perl") { return $token->[2]; } return ''; } @@ -124,19 +126,26 @@ sub start_parserlib { sub end_parserlib { } -sub start_footnote { +sub start_window { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - $Apache::lonxml::redirection = 0; + if ($target eq 'web') { + $Apache::lonxml::redirection = 0; + } return $result; } -sub end_footnote { +sub end_window { my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; - $Apache::lonxml::outputstack =~ s/\"/\"\;/g; - my $result = "newwindow $Apache::lonxml::outputstack \');newWindow.document.close();void(0);\">*"; - $Apache::lonxml::outputstack = ""; - $Apache::lonxml::redirection = 1; + my $result; + if ($target eq 'web') { + $Apache::lonxml::outputstack =~ s/\"/\"\;/g; + $result = "newwindow $Apache::lonxml::outputstack \');newWindow.document.close();void(0);\">*"; + $Apache::lonxml::outputstack = ""; + $Apache::lonxml::redirection = 1; + } else { + $result = ''; + } return $result; } @@ -154,7 +163,8 @@ sub start_import { } my $dir=$location; - $dir=~s:/[^/]*$::; + $dir=~s:/[^/]*$::; +# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); &Apache::lonxml::newparser($parser,\$file,$dir); if ($target eq "edit" ) { @@ -167,6 +177,27 @@ sub start_import { sub end_import { } +sub start_meta { + my ($target,$token,$parstack,$parser,$safeeval,$style)=@_; + my $result = ''; + if ($target ne 'meta') { + $result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); + $result = ''; + return $result; + } else { + return $result; + } +} + +sub end_meta { +} + + + + + + + sub editfield { my ($tag,$data)=@_;