--- loncom/xml/scripttag.pm	2001/07/12 15:53:44	1.47
+++ loncom/xml/scripttag.pm	2001/10/14 05:08:09	1.55
@@ -1,6 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 # 2/21 Guy
+# 8/20 Gerd Kortemeyer
 
 package Apache::scripttag;
 
@@ -30,8 +31,17 @@ sub start_script {
     my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
     if ( $target eq "modified" ) {
       $result=$token->[4].&Apache::edit::modifiedfield();
-    } elsif ( $target eq "web" || $target eq "grade" ) {
+    } elsif ( $target eq 'web' || $target eq 'tex' ||
+	      $target eq 'grade' || $target eq 'answer') {
       &Apache::run::run($bodytext,$safeeval);
+      if (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {
+	$Apache::lonxml::evaluate--;
+	$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;><pre>";
+	my $listing= &Apache::run::dump($target,$safeeval);
+	$listing =~ s/\n/\\n/g;
+	$result.=$listing;
+	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
+      }
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
       #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
@@ -50,33 +60,44 @@ sub end_script {
   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
   my $result='';
   #other script blocks need to survive
-  if ($type ne "loncapa/perl") { return $token->[2]; }
-  if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+  if ($type ne "loncapa/perl") {
+    return $token->[2];
+  } elsif ($target eq 'edit' ) {
+    return &Apache::edit::end_table();
+  } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {
+    $Apache::lonxml::evaluate++;
+  }
   return '';
 }
 
 sub start_display {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
+  my $result;
   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.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+    $result=$token->[4].&Apache::edit::modifiedfield();
+  } elsif ( $target eq 'web' || $target eq 'tex' ||
+	    $target eq 'grade' || $target eq 'answer') {
+    $result=&Apache::run::run($bodytext,$safeeval);
+    if ($target eq 'grade' || $target eq 'answer' ) {
+      $result=''; # grade should produce no output
+    }
+  } elsif ($target eq "edit" ) {
+    #$result = 
+    #  "<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
+    #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+    $result=&Apache::edit::tag_start($target,$token,'Script With Display');
+    $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1)
   }
   return $result;
 }
 
 sub end_display {
-  return ''
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+  return '';
 }
 
 sub start_scriptlib {
@@ -85,7 +106,7 @@ sub start_scriptlib {
   my $result ='';
   my $error='';
 
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -105,9 +126,10 @@ sub start_scriptlib {
   }
   if ($target eq "edit" ) {
     $result=
-      &Apache::edit::tag_start($target,$token).
-	&Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
-	  $error;
+      &Apache::edit::tag_start($target,$token,'New Script Functions').
+	&Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+	  $error.'</td></tr>'.
+	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
@@ -119,9 +141,9 @@ sub start_scriptlib {
 
 sub end_scriptlib {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result='';
-#  if ($target eq "edit" ) { $result=" "; }
-  return $result;
+  my @result;
+  if ($target eq "edit" ) { $result[1]='no'; }
+  return @result;
 }
 
 sub start_parserlib {
@@ -129,7 +151,7 @@ sub start_parserlib {
   my $bodytext;
   my $result ="";
   my $error='';
-  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
 				     $$parstack[$#$parstack]);
@@ -149,9 +171,10 @@ sub start_parserlib {
   }
   if ($target eq "edit" ) {
     $result=
-      &Apache::edit::tag_start($target,$token).
-	&Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
-	  $error;
+      &Apache::edit::tag_start($target,$token,'New Tag Definitions').
+	&Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+	  $error.'</td></tr>'.
+	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
@@ -163,11 +186,9 @@ sub start_parserlib {
 
 sub end_parserlib {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result='';
-#  if ($target eq "edit" ) { 
-#    $result=&Apache::edit::tag_end($target,$token);
-#  }
-  return $result;
+  my @result;
+  if ($target eq "edit" ) { $result[1]='no'; }
+  return @result;
 }
 
 sub start_window {
@@ -203,7 +224,7 @@ sub start_import {
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
 
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     # FIXME this probably needs to be smart about construction vs.
     # non construction space.
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
@@ -249,14 +270,14 @@ sub end_storetc {
     my $result;
     my $output=&Apache::lonxml::endredirection;
     $output =~ s/\"/\&quot\;/g;
-    $result = "{\bf $output.}}\write\tcfile{\protect\tcpc{ $output.}{\the\value{relpage}}}";
-    return $result; 
+    $result = '{\bf '.$output.'.}}\write\tcfile{\protect\tcpc{ '.$output.'.}{\the\value{relpage}}}';
+    return $result;
 }
 
 
 sub start_physnet {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $bodytext = '/msu/physnet/cbi.sty';
+    my $bodytext = '/adm/includes/physnet.sty';
     my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     my $cbistyletext=&Apache::lonnet::getfile($location);
 
