--- loncom/xml/scripttag.pm	2000/08/16 18:32:58	1.13
+++ loncom/xml/scripttag.pm	2000/10/10 18:18:26	1.20
@@ -9,39 +9,60 @@ use Apache::lonnet;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
-						 'parserlib','import'));
+						 'parserlib','import',
+                                                 'footnote'));
 }
 
+$Apache::scripttag::SCRIPT_RESULT='';
 sub start_script {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  my $result="";
-#  my $bodytext=$$parser[$#$parser]->get_text("/script");
-  my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
-
-  if ( $target eq "modified" ) {
+  my $args ='';
+  if ( $#$parstack > -1 ) {
+    $args=$$parstack[$#$parstack];
+  }
+  my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+  #&Apache::lonxml::debug("found type of $type");
+  $Apache::scripttag::SCRIPT_RESULT='';
+  if ($type eq "loncapa/perl") {
+    $safeeval->share('$SCRIPT_RESULT');
+    my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
     
+    if ( $target eq "modified" ) {
+    }
+    &Apache::run::run($bodytext,$safeeval);
+    
+    if ($target eq "edit" ) {
+      $Apache::scripttag::SCRIPT_RESULT = 
+	"<br> &lt;$token->[1]&gt; output: <br>$bodytext<br>Source:<br>";
+      $Apache::scripttag::SCRIPT_RESULT.=&editfield($token->[1],$bodytext);
+    }
+  } else {
+    $Apache::scripttag::SCRIPT_RESULT = $token->[4];
   }
-
-#  print "<br> script runs $bodytext</br>";
-  $result = &Apache::run::run($bodytext,$safeeval);
-
-  if ($target eq "edit" ) {
-    $result= "<br> &lt;$token->[1]&gt; output: <br>$bodytext<br>Source:<br>";
-    $result.=&editfield($token->[1],$bodytext);
-  }
-  return $result;
+  return $Apache::scripttag::SCRIPT_RESULT;
 }
 
-sub end_script {}
+sub end_script {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  return $token->[2]; 
+}
 
 sub start_scriptlib {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
   my $result ="";
 
-  $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
-  &Apache::run::run(&getfile($bodytext),$safeeval);
-  #print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
+  $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+				   $$parstack[$#$parstack]);
+  my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+					     $bodytext);
+  my $script=&Apache::lonnet::getfile($location);
+  if ($script == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$location</i> for scriptlib</b>");
+    return "";
+  }
+  &Apache::run::run($script,$safeeval);
+  #&Apache::lonxml::debug("ran $bodytext:<br>".&Apache::lonnet::getfile($bodytext)."<br>");
 
   if ($target eq "edit" ) {
     $result.=&editfield($token->[1],$bodytext);
@@ -56,9 +77,16 @@ sub start_parserlib {
   my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
   my $result ="";
 
-  $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
-  %$style = ( %$style , &Apache::style::styleparser($target, 
-		&getfile($bodytext)));
+  $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+				  $$parstack[$#$parstack]);
+  my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+					     $bodytext);
+  my $styletext=&Apache::lonnet::getfile($location);
+  if ($styletext == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$location</i> for parserlib</b>");
+    return "";
+  }
+  %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
 
   if ($target eq "edit" ) {
     $result=&editfield($token->[1],$bodytext);
@@ -69,15 +97,38 @@ sub start_parserlib {
 sub end_parserlib {
 }
 
+sub start_footnote {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  $Apache::lonxml::redirection = 0;
+  return $result;  
+}
+
+sub end_footnote {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  $Apache::lonxml::outputstack =~ s/\"/\&quot\;/g;
+  my $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $Apache::lonxml::outputstack </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
+   $Apache::lonxml::outputstack = "";
+   $Apache::lonxml::redirection = 1;
+  return $result; 
+}
+
 sub start_import {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/import");
   my $result ="";
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
-  my $file=&getfile($bodytext);
-  my $tempparser=HTML::TokeParser->new(\$file);
-  push (@$parser,$tempparser);
+  my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+  my $file=&Apache::lonnet::getfile($location);
+  if ($file == -1) {
+    &Apache::lonxml::error("<b> Unable to find <i>$bodytext $location</i> for import</b>");
+    return "";
+  }
+
+  my $dir=$location;
+  $dir=~s:/[^/]*$::;
+  &Apache::lonxml::newparser($parser,\$file,$dir);
 
   if ($target eq "edit" ) {
     $result.=&editfield($token->[1],$bodytext);
@@ -100,7 +151,7 @@ sub editfield {
   return "<br></br>\n&lt;$tag&gt;<br></br>\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br></br>\n&lt;/$tag&gt;<br></br>\n";
 }
 
-sub getfile {
+sub getfilenothere {
   my ($filename) = @_;
   my $a="";
   
@@ -110,6 +161,7 @@ sub getfile {
     &Apache::lonnet::subscribe($filename);
     &Apache::lonnet::repcopy($filename);
   }
+  if (! -e $filename ) { return -1; };
   my $fh=Apache::File->new($filename);
   while (<$fh>) {
       $a .=$_;