--- loncom/xml/scripttag.pm	2001/10/13 06:00:04	1.54
+++ loncom/xml/scripttag.pm	2002/04/10 15:21:29	1.70
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
+#
+# $Id: scripttag.pm,v 1.70 2002/04/10 15:21:29 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 2/21 Guy
 # 8/20 Gerd Kortemeyer
 
@@ -14,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 {
@@ -34,13 +59,12 @@ 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 'web')) {
+      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;
+	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
 	$result.=$listing;
-	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a>";
+	$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />";
       }
     } elsif ($target eq "edit" ) {
       #&Apache::run::run($bodytext,$safeeval);
@@ -49,7 +73,11 @@ sub start_script {
       $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);
     }
   } else {
-    if ($target ne "meta") { $result = $token->[4]; }
+    if ($target ne "meta") {
+      $result = $token->[4];
+      my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+      $result.=$bodytext;
+    }
   }
   return $result;
 }
@@ -64,7 +92,7 @@ sub end_script {
     return $token->[2];
   } elsif ($target eq 'edit' ) {
     return &Apache::edit::end_table();
-  } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) {
+  } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'answer')) {
     $Apache::lonxml::evaluate++;
   }
   return '';
@@ -81,7 +109,7 @@ sub start_display {
   } elsif ( $target eq 'web' || $target eq 'tex' ||
 	    $target eq 'grade' || $target eq 'answer') {
     $result=&Apache::run::run($bodytext,$safeeval);
-    if ($target eq 'grade' ) {
+    if ($target eq 'grade' || $target eq 'answer' ) {
       $result=''; # grade should produce no output
     }
   } elsif ($target eq "edit" ) {
@@ -127,13 +155,13 @@ sub start_scriptlib {
   if ($target eq "edit" ) {
     $result=
       &Apache::edit::tag_start($target,$token,'New Script Functions').
-	&Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+	&Apache::edit::editline($token->[1],$bodytext,'',40).
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
-    $result=&Apache::edit::modifiedfield($token);
+    $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);
   }
   return $result;
@@ -172,13 +200,13 @@ sub start_parserlib {
   if ($target eq "edit" ) {
     $result=
       &Apache::edit::tag_start($target,$token,'New Tag Definitions').
-	&Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+	&Apache::edit::editline($token->[1],$bodytext,'',40).
 	  $error.'</td></tr>'.
 	    &Apache::edit::end_table();
   }
   if ($target eq "modified" ) {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
-    $result=&Apache::edit::modifiedfield($token);
+    $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);
   }
   return $result;
@@ -237,25 +265,39 @@ sub start_import {
     my $dir=$location;
     $dir=~s:/[^/]*$::;
     #  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
+    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    if (!$id) { $id=$Apache::lonxml::curdepth; }
+    push(@Apache::inputtags::import,$id);
     &Apache::lonxml::newparser($parser,\$file,$dir);
-  }
-  if ($target eq "edit" ) {
+  } elsif ($target eq "edit" ) {
     $result.=&Apache::edit::tag_start($target,$token);
-    $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+    $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
     #FIXME this need to convert $bodytext to be a contruction space reference
     #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
     #$result.="Click<a href=\"$location\">here</a> to edit<br />"
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     $bodytext=$$parser[$#$parser]->get_text("/import");
-    $result=&Apache::edit::modifiedfield($token);
+    $result=$token->[4].&Apache::edit::modifiedfield($token);
     &Apache::lonxml::debug($result);
+  } elsif ($target eq 'meta') {
+    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+    $result.='<import part="'.$Apache::inputtags::part;
+    if ($id) {
+      $result.='" id="'.$id;
+    }
+    $result.='">';
+    $result.=$bodytext;
+    $result.='</import>';
   }
   return $result;
 }
 
 sub end_import {
-  return '';
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  pop(@Apache::inputtags::import);
+  my $result;
+  if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); }
+  return $result;
 }
 
 sub start_storetc {
@@ -282,9 +324,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 "";
 }
 
@@ -292,6 +335,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");
