--- loncom/xml/scripttag.pm	2000/12/21 18:12:12	1.28
+++ loncom/xml/scripttag.pm	2001/05/04 21:17:24	1.37
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
-
+# 2/21 Guy
 
 package Apache::scripttag; 
 
@@ -10,15 +10,13 @@ use Apache::lonnet;
 sub BEGIN {
   &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
 						 'parserlib','import',
-                                                 'footnote','display'));
+                                                 'window','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,13 +24,13 @@ sub start_script {
     my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
     
     if ( $target eq "modified" ) {
-      
+      $result=$token->[4].$bodytext;
     } 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);
+      $result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
+      $result.=&Apache::edit::editfield($token->[1],$bodytext);
     }
   } else {
     if ($target ne "meta") { $result = $token->[4]; }
@@ -43,7 +41,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 '';
 }
 
@@ -64,8 +67,8 @@ sub start_display {
   }
   if ($target eq "edit" ) {
     $result = 
-      "<br> &lt;$token->[1]&gt; output: <br>$bodytext<br>Source:<br>";
-    $result.=&editfield($token->[1],$bodytext);
+      "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
+    $result.=&Apache::edit::editfield($token->[1],$bodytext);
   }
   return $result;
 }
@@ -74,69 +77,121 @@ 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]);
-  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 "";
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $bodytext;
+  my $result ='';
+  my $error='';
+
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+    $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
+    $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) {
+      if ($target eq 'edit') {
+        $error='</tr><tr><td>Errors</td><td colspan="2"><b> Unable to find <i>'.$location.'</i></b></td>'."\n";
+      } else {
+	&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 />");
   }
-  &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);
+    $result=
+      &Apache::edit::tag_start($token->[1]).
+	&Apache::edit::editfield($token->[1],$bodytext,'New Script Functions').
+	  $error;
+  }
+  if ($target eq "modified" ) {
+    $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
   }
   return $result;
 }
 
-sub end_scriptlib {}
+sub end_scriptlib {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+#  if ($target eq "edit" ) { $result=" "; }
+  return $result;
+}
 
 sub start_parserlib {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+  my $bodytext;
   my $result ="";
+  my $error='';
 
-  $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 "";
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+    $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+    $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) {
+      if ($target eq 'edit') {
+	$error='</tr><tr><td>Errors</td><td colspan="2"><b> Unable to find <i>'.$location.'</i></b></td>'."\n";
+      } else {
+	&Apache::lonxml::error("<b> Unable to find <i>$location</i> for parserlib</b>");
+	return "";
+      }
+    }
+    %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
   }
-  %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
-
   if ($target eq "edit" ) {
-    $result=&editfield($token->[1],$bodytext);
+    $result=
+      &Apache::edit::tag_start($token->[1]).
+	&Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions").
+	  $error;
+  }
+  if ($target eq "modified" ) {
+    $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
   }
   return $result;
 }
 
 sub end_parserlib {
+  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my $result='';
+#  if ($target eq "edit" ) { 
+#    $result=&Apache::edit::tag_end($target,$token,$parstack,$parser,
+#				   $safeeval,$style);
+#  }
+  return $result;
 }
 
-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::startredirection;
+  }  elsif ($target eq 'tex') {
+       $result = '\footnote{';
+   }
   return $result;  
 }
 
-sub end_footnote {
+sub end_window {
   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;
+  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; 
 }
 
@@ -154,12 +209,13 @@ sub start_import {
   }
 
   my $dir=$location;
-  $dir=~s:/[^/]*$::;
+  $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.=&Apache::edit::editfield($token->[1],$bodytext);
+    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br />"
   }
   return '';
 }
@@ -167,16 +223,19 @@ sub start_import {
 sub end_import {
 }
 
-sub editfield {
-  my ($tag,$data)=@_;
-  
-  my $count=0;
-  my $maxlength=-1;
-  map { $count++;
-	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";
+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 getfilenothere {