--- loncom/xml/scripttag.pm	2000/09/19 18:05:21	1.15
+++ loncom/xml/scripttag.pm	2001/03/27 16:56:56	1.35
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
-
+# 2/21 Guy
 
 package Apache::scripttag; 
 
@@ -9,40 +9,88 @@ use Apache::lonnet;
 
 sub BEGIN {
   &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
-						 'parserlib','import'));
+						 'parserlib','import',
+                                                 'window','display'));
 }
 
 sub start_script {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  my $result="";
-  $safeeval->share($Apache::scripttag::start_script::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);
+  my $result='';
+  #&Apache::lonxml::debug("found type of $type");
+  if ($type eq "loncapa/perl") {
+    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" ) {
+      &Apache::run::run($bodytext,$safeeval);
+      $result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
+      $result.=&editfield($token->[1],$bodytext);
+    }
+  } else {
+    if ($target ne "meta") { $result = $token->[4]; }
   }
+  return $result;
+}
 
-#  print "<br> script runs $bodytext</br>";
-  &Apache::run::run($bodytext,$safeeval);
+sub end_script {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  if ( $target eq "meta" ) { return ''; } 
+  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 '';
+}
 
+sub start_display {
+  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my $args ='';
+  if ( $#$parstack > -1 ) {
+    $args=$$parstack[$#$parstack];
+  }
+  my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+  
+  if ( $target eq "modified" ) {
+  }
+  my $result=&Apache::run::run($bodytext,$safeeval);
+  if ($target eq 'grade' ) {
+    # grade should produce no output
+    $result='';
+  }
   if ($target eq "edit" ) {
-    $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.=&editfield($token->[1],$bodytext);
   }
   return $result;
 }
 
-sub end_script {}
+sub end_display {
+}
 
 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);
@@ -57,9 +105,17 @@ 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);
+  #&Apache::lonxml::debug("found :$bodytext: in :$location: with :$styletext:");
+  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);
@@ -70,29 +126,75 @@ sub start_parserlib {
 sub end_parserlib {
 }
 
+sub start_window {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  if ($target eq 'web') {
+    &Apache::lonxml::startredirection;
+  }  elsif ($target eq 'tex') {
+       $result = '\footnote{';
+   }
+  return $result;  
+}
+
+sub end_window {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web') {
+    my $output=&Apache::lonxml::endredirection;
+    $output =~ s/\"/\&quot\;/g;
+    $result = "<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor=&quot;#FFFFFF&quot;> $output </body></html>\');newWindow.document.close();void(0);\"><sup>*</sup></a>";
+  } elsif ($target eq 'tex') {
+      $result = '}';
+  } else {
+      $result = '';
+  }
+  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);
-  if ($file eq -1) {
-    return "<b> Unable to find <i>$bodytext</i> for import</b>";
+  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 $tempparser=HTML::TokeParser->new(\$file);
-  push (@$parser,$tempparser);
+  my $dir=$location;
+  $dir=~s:/[^/]*$::;  
+#  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
+  &Apache::lonxml::newparser($parser,\$file,$dir);
 
   if ($target eq "edit" ) {
     $result.=&editfield($token->[1],$bodytext);
-    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br></br>"
+    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br />"
   }
+  return '';
 }
 
 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)=@_;
   
@@ -102,10 +204,10 @@ sub editfield {
 	if (length($_) > $maxlength) { $maxlength = length ($_); }
       } split ("\n", $data);
 	  
-  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";
+  return "<br />\n&lt;$tag&gt;<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br />\n&lt;/$tag&gt;<br />\n";
 }
 
-sub getfile {
+sub getfilenothere {
   my ($filename) = @_;
   my $a="";