--- loncom/xml/scripttag.pm	2001/07/30 22:24:56	1.48
+++ loncom/xml/scripttag.pm	2002/05/03 22:28:36	1.73
@@ -1,6 +1,32 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
+#
+# $Id: scripttag.pm,v 1.73 2002/05/03 22:28:36 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
 
 package Apache::scripttag;
 
@@ -13,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 {
@@ -30,8 +56,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 (($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= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
+	
+	$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 />";
@@ -39,7 +74,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;
 }
@@ -50,8 +89,13 @@ 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 (($target eq 'answer')) {
+    $Apache::lonxml::evaluate++;
+  }
   return '';
 }
 
@@ -63,9 +107,10 @@ sub start_display {
 
   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') {
     $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" ) {
@@ -90,7 +135,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]);
@@ -110,13 +155,14 @@ 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::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;
@@ -124,9 +170,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 {
@@ -134,7 +180,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]);
@@ -154,13 +200,14 @@ 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::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;
@@ -168,11 +215,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 {
@@ -208,7 +253,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);
@@ -221,25 +266,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 {
@@ -254,21 +313,22 @@ 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);
 
     %$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 "";
 }
 
@@ -276,6 +336,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");
