--- loncom/xml/scripttag.pm	2001/11/29 19:03:58	1.58
+++ loncom/xml/scripttag.pm	2002/01/17 16:51:07	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.58 2001/11/29 19:03:58 www Exp $
+# $Id: scripttag.pm,v 1.64 2002/01/17 16:51:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,11 +39,11 @@ use Apache::style;
 # so xmlparse can reenter the inner_xmlparse loop.
 
 @Apache::scripttag::parser_env = ();
-sub BEGIN {
-  &Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
-						 'parserlib','import',
-                                                 'window','display',
-                                                 'storetc','physnet'));
+BEGIN {
+  &Apache::lonxml::register('Apache::scripttag',
+			    ('script','scriptlib','parserlib','import',
+			     'window','display','storetc','physnet',
+			     'standalone'));
 }
 
 sub start_script {
@@ -59,11 +59,16 @@ sub start_script {
     } 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')) {
+      if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
 	$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;
+	$listing =~ s/\"/&quot;/g;
+	$listing =~ s/\'/&rsquo;/g;
+	$listing =~ s/</&lt;/g;
+	$listing =~ s/>/&gt;/g;
+	$listing =~ s/&/&amp;/g;
 	$result.=$listing;
 	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
       }
@@ -318,9 +323,10 @@ sub start_physnet {
     my $cbistyletext=&Apache::lonnet::getfile($location);
 
     %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
-    if ( defined($$style{'physnet'}) ) {
-        &Apache::lonxml::newparser($parser,\$$style{'physnet'});
-    }
+    $$parser['-1']->unget_token($token);
+#    if ( defined($$style{'physnet'}) ) {
+#        &Apache::lonxml::newparser($parser,\$$style{'physnet'});
+#    }
     return "";
 }
 
@@ -328,6 +334,19 @@ sub end_physnet {
   return '';
 }
 
+sub start_standalone {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  if ($target eq 'web'  && $ENV{'request.course.id'} ) {
+    my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+  }
+  return '';
+}
+
+sub end_standalone {
+  return '';
+}
+
+
 sub xmlparse {
   my ($string) = @_;
   &Apache::lonxml::debug("Got $string");
