--- loncom/xml/scripttag.pm	2001/03/27 16:56:56	1.35
+++ loncom/xml/scripttag.pm	2001/10/05 22:29:10	1.53
@@ -1,35 +1,51 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 # 2/21 Guy
+# 8/20 Gerd Kortemeyer
 
-package Apache::scripttag; 
+package Apache::scripttag;
 
 use strict;
 use Apache::lonnet;
+use Apache::style;
 
+#Globals
+# this used to pass around the standard callsub arguments to a tag func
+# 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'));
+                                                 'window','display',
+                                                 'storetc','physnet'));
 }
 
 sub start_script {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  @Apache::scripttag::parser_env = @_;
   my $result='';
-  #&Apache::lonxml::debug("found type of $type");
+  my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
+  &Apache::lonxml::debug("found type of $type");
   if ($type eq "loncapa/perl") {
     my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
-    
     if ( $target eq "modified" ) {
-    } elsif ( $target eq "web" || $target eq "grade" ) {
+      $result=$token->[4].&Apache::edit::modifiedfield();
+    } elsif ( $target eq "web" || $target eq "grade" || $target eq 'answer') {
       &Apache::run::run($bodytext,$safeeval);
+      if (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) {
+	$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>";
+      }
     } 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);
+      #&Apache::run::run($bodytext,$safeeval);
+      #$result="<br /> &lt;$token->[1]&gt; output: <br />$bodytext<br />Source:<br />";
+      $result=&Apache::edit::tag_start($target,$token,'Script');
+      $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,4);
     }
   } else {
     if ($target ne "meta") { $result = $token->[4]; }
@@ -38,107 +54,154 @@ sub start_script {
 }
 
 sub end_script {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ( $target eq "meta" ) { return ''; } 
-  my $args ='';
-  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
-  my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+  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 ($type ne "loncapa/perl") {
+    return $token->[2];
+  } elsif ($target eq 'edit' ) {
+    return &Apache::edit::end_table();
+  } elsif (($ENV{'request.state'} eq 'construct') && ($target eq 'web')) {
+    $Apache::lonxml::evaluate++;
+  }
   return '';
 }
 
 sub start_display {
-  my ($target,$token,$parstack,$parser,$safeeval)=@_;
-  my $args ='';
-  if ( $#$parstack > -1 ) {
-    $args=$$parstack[$#$parstack];
-  }
+  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.=&editfield($token->[1],$bodytext);
+    $result=$token->[4].&Apache::edit::modifiedfield();
+  } elsif ( $target eq "web" || $target eq "grade" || $target eq 'answer') {
+    $result=&Apache::run::run($bodytext,$safeeval);
+    if ($target eq 'grade' ) {
+      $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 {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+  return '';
 }
 
 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,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $bodytext;
+  my $result ='';
+  my $error='';
+
+  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]);
+    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($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");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
   }
   return $result;
 }
 
-sub end_scriptlib {}
+sub end_scriptlib {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my @result;
+  if ($target eq "edit" ) { $result[1]='no'; }
+  return @result;
+}
 
 sub start_parserlib {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
-  my $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $bodytext;
   my $result ="";
-
-  $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 "";
+  my $error='';
+  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]);
+    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($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");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
   }
   return $result;
 }
 
 sub end_parserlib {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my @result;
+  if ($target eq "edit" ) { $result[1]='no'; }
+  return @result;
 }
 
 sub start_window {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';
   if ($target eq 'web') {
     &Apache::lonxml::startredirection;
   }  elsif ($target eq 'tex') {
-       $result = '\footnote{';
+       $result = '\unskip\footnote{';
    }
   return $result;  
 }
 
 sub end_window {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;
   if ($target eq 'web') {
     my $output=&Apache::lonxml::endredirection;
@@ -153,76 +216,91 @@ sub end_window {
 }
 
 sub start_import {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $bodytext=$$parser[$#$parser]->get_text("/import");
   my $result ="";
 
   $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
-  my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
-  my $file=&Apache::lonnet::getfile($location);
-  if ($file == -1) {
-    &Apache::lonxml::error("<b> Unable to find <i>$bodytext $location</i> for import</b>");
-    return "";
-  }
 
-  my $dir=$location;
-  $dir=~s:/[^/]*$::;  
-#  &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n");
-  &Apache::lonxml::newparser($parser,\$file,$dir);
+  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);
+    my $file=&Apache::lonnet::getfile($location);
+    if ($file == -1) {
+      &Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>");
+      return "";
+    }
 
+    my $dir=$location;
+    $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 />"
+    $result.=&Apache::edit::tag_start($target,$token);
+    $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+    #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') {
+    $bodytext=$$parser[$#$parser]->get_text("/import");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
   }
-  return '';
+  return $result;
 }
 
 sub end_import {
+  return '';
 }
 
-sub start_meta {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+sub start_storetc {
+  my ($target,$token,$tagstack,$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; 
+  &Apache::lonxml::startredirection;
+  return $result; 
+}
+
+sub end_storetc {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    my $output=&Apache::lonxml::endredirection;
+    $output =~ s/\"/\&quot\;/g;
+    $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 = '/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'});
     }
+    return "";
 }
 
-sub end_meta {
-}
-
-sub editfield {
-  my ($tag,$data)=@_;
-  
-  my $count=0;
-  my $maxlength=-1;
-  map { $count++;
-	if (length($_) > $maxlength) { $maxlength = length ($_); }
-      } split ("\n", $data);
-	  
-  return "<br />\n&lt;$tag&gt;<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br />\n&lt;/$tag&gt;<br />\n";
-}
-
-sub getfilenothere {
-  my ($filename) = @_;
-  my $a="";
-  
-  $filename=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
-  $filename="/home/httpd/html/res".$filename;
-  if (! -e $filename ) {
-    &Apache::lonnet::subscribe($filename);
-    &Apache::lonnet::repcopy($filename);
-  }
-  if (! -e $filename ) { return -1; };
-  my $fh=Apache::File->new($filename);
-  while (<$fh>) {
-      $a .=$_;
-  }
-  return $a
+sub end_physnet {
+  return '';
+}
+
+sub xmlparse {
+  my ($string) = @_;
+  &Apache::lonxml::debug("Got $string");
+  my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
+    @Apache::scripttag::parser_env;
+  my @parser;
+  &Apache::lonxml::newparser(\@parser,\$string);
+  my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
+					     $parstack,\@parser,
+					     $safeeval,$style);
+  return $result;
 }
 
 1;
