--- loncom/xml/scripttag.pm	2001/07/06 21:54:10	1.43
+++ loncom/xml/scripttag.pm	2001/08/20 17:14:55	1.50
@@ -1,13 +1,19 @@
 # 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',
@@ -17,6 +23,7 @@ sub BEGIN {
 
 sub start_script {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  @Apache::scripttag::parser_env = @_;
   my $result='';
   my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
   &Apache::lonxml::debug("found type of $type");
@@ -52,25 +59,30 @@ sub end_script {
 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 "grade" ) {
+    $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 {
-  return ''
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+  if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+  return '';
 }
 
 sub start_scriptlib {
@@ -99,9 +111,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");
@@ -113,9 +126,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 {
@@ -123,7 +136,6 @@ sub start_parserlib {
   my $bodytext;
   my $result ="";
   my $error='';
-
   if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
     $bodytext=$$parser[$#$parser]->get_text("/parserlib");
     $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
@@ -144,9 +156,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");
@@ -158,11 +171,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 {
@@ -197,41 +208,39 @@ sub start_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') {
+    # 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.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
-    $result.="Click<a href=\"/res/$bodytext\">here</a> to edit<br />"
+    #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 />"
   }
-  return '';
+  if ($target eq 'modified') {
+    $bodytext=$$parser[$#$parser]->get_text("/import");
+    $result=&Apache::edit::modifiedfield($token);
+    &Apache::lonxml::debug($result);
+  }
+  return $result;
 }
 
 sub end_import {
-}
-
-sub start_meta {
-  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; 
-    }
-}
-
-sub end_meta {
+  return '';
 }
 
 sub start_storetc {
@@ -252,15 +261,34 @@ sub end_storetc {
 
 
 sub start_physnet {
-
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $cbistylefile = &Apache::lonnet::getfile('/home/httpd/res/msu/physnet/cbi.sty');
-    %$style = (%$style,&Apache::style::styleparser($target,$cbistylefile));
-    &Apache::lonxml::newparser($parser$$style{'physnet'});
-
+    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_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;
 __END__