--- loncom/xml/scripttag.pm	2000/08/03 19:34:11	1.5
+++ loncom/xml/scripttag.pm	2001/02/19 20:43:00	1.33
@@ -8,33 +8,92 @@ use strict;
 use Apache::lonnet;
 
 sub BEGIN {
-  &Apache::lonxml::register('Apache::scripttag',('script','scriptlib','parserlib'));
+  &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
+						 'parserlib','import',
+                                                 'window','display'));
 }
 
 sub start_script {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  
-  my $result="";
-  my $bodytext=$$parser[$#$parser]->get_text("/script");
-  if ($target ne "edit" ) {
-    $result = &Apache::run::run($bodytext,$safeeval);
+  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 {
-    $result="<textarea>$bodytext</textarea>\n";
+    if ($target ne "meta") { $result = $token->[4]; }
+  }
+  return $result;
+}
+
+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.=&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 ="";
-  if ($target ne "edit" ) {
-    &Apache::run::run(&getfile($bodytext),$safeeval);
-    #print "ran $bodytext:<br>".&getfile($bodytext)."<br>";
-  } else {
-    $result="<textarea>$bodytext</textarea>\n";
+
+  $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);
   }
   return $result;
 }
@@ -43,22 +102,122 @@ sub end_scriptlib {}
 
 sub start_parserlib {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $bodytext="/home/httpd/html/".$$parser[$#$parser]->get_text("/parserlib");
-  %$style = ( %$style , &Apache::style::styleparser($target, &getfile($bodytext)));
+  my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+  my $result ="";
+
+  $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);
+  }
+  return $result;
 }
 
 sub end_parserlib {
 }
 
-sub getfile {
+sub start_window {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result = '';
+  if ($target eq 'web') {
+    $Apache::lonxml::redirection = 0;
+  } 
+  return $result;  
+}
+
+sub end_window {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'web') {
+    $Apache::lonxml::outputstack =~ s/\"/\&quot\;/g;
+    $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;
+  } 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 $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::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 />"
+  }
+  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)=@_;
+  
+  my $count=0;
+  my $maxlength=-1;
+  map { $count++;
+	if (length($_) > $maxlength) { $maxlength = length ($_); }
+      } split ("\n", $data);
+	  
+  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 getfilenothere {
   my ($filename) = @_;
   my $a="";
-  &Apache::lonnet::repcopy($filename);
-  {
-    my $fh=Apache::File->new($filename);
-    while (<$fh>) {
+  
+  $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
 }