--- loncom/xml/lonxml.pm	2001/06/12 21:10:22	1.91
+++ loncom/xml/lonxml.pm	2001/06/27 18:52:34	1.98
@@ -10,6 +10,8 @@
 # 5/26 Gerd Kortemeyer
 # 5/27 H. K. Ng
 # 6/2,6/3,6/8,6/9 Gerd Kortemeyer
+# 6/12,6/13 H. K. Ng
+# 6/16 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
@@ -146,6 +148,12 @@ ENDPARM
        (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
           menu.switchbutton
      (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+          menu.switchbutton
+                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()');
+          menu.switchbutton
+                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');
+          menu.switchbutton
+                               (9,3,'anot.gif','anno-','tations','annotate()');
           $hwkadd
     }
 
@@ -158,7 +166,8 @@ ENDPARM
           menu.clearbut(7,2);
           menu.clearbut(7,3);
           menu.menucltim=menu.setTimeout(
- 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);',
+ 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);',
 			  2000);
 
       }
@@ -215,29 +224,9 @@ sub printalltags {
 }
 
 sub xmlparse {
-#    $Apache::lonxml::debug=1;
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
- if ($target eq 'meta') {
-   $Apache::lonxml::redirection = 0;
-   $Apache::lonxml::metamode = 1;
-   $Apache::lonxml::evaluate = 1;
-   $Apache::lonxml::import = 0;
- } elsif ($target eq 'grade') {
-   &startredirection;
-   $Apache::lonxml::metamode = 0;
-   $Apache::lonxml::evaluate = 1;
-   $Apache::lonxml::import = 1;
- } elsif ($target eq 'modified') {
-   $Apache::lonxml::redirection = 0;
-   $Apache::lonxml::metamode = 0;
-   $Apache::lonxml::evaluate = 0;
-   $Apache::lonxml::import = 0;
- } else {
-   $Apache::lonxml::redirection = 0;
-   $Apache::lonxml::metamode = 0;
-   $Apache::lonxml::evaluate = 1;
-   $Apache::lonxml::import = 1;
- }
+
+ &setup_globals($target);
  #&printalltags();
  my @pars = ();
  @Apache::lonxml::pwd=();
@@ -289,7 +278,7 @@ sub xmlparse {
        #clear out any tags that didn't end
        while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) {
 	 &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");
-	 pop @stack;pop @parstack;&decreasedepth($token);
+	 &end_tag(\@stack,\@parstack,$token);
        }
        
        if (exists $style_for_target{'/'."$token->[1]"}) {
@@ -326,7 +315,7 @@ sub xmlparse {
        $result = '';
      } 
      if ($token->[0] eq 'E') { 
-       pop @stack;pop @parstack;&decreasedepth($token);
+       &end_tag(\@stack,\@parstack,$token);
      }
    }
    pop @pars;
@@ -374,7 +363,7 @@ sub recurse {
 	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 	       && ($#innerstack > -1)) {
 	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
-	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
+	  &end_tag(\@innerstack,\@innerparstack,$tokenpat);
 	}
 	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
 			       \@innerstack, \@innerparstack, \@pat,
@@ -417,11 +406,6 @@ sub callsub {
   {
     my $sub1;
     no strict 'refs';
-    if ($target eq 'edit' && $token->[0] eq 'S') {
-      $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
-						$parstack,$parser,
-						$safeeval,$style);
-    }
     my $tag=$token->[1];
     my $space=$Apache::lonxml::alltags{$tag};
     if (!$space) {
@@ -429,38 +413,47 @@ sub callsub {
 	$sub=~tr/A-Z/a-z/;
 	$space=$Apache::lonxml::alltags{$tag}
     }
-    if ($space) {
-      #&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
-      $sub1="$space\:\:$sub";
-      $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
-      ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
-					   $parstack,$parser,$safeeval,
-					   $style);
-    } else {
-      #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
-      if ($metamode <1) {
-	if (defined($token->[4]) && ($metamode < 1)) {
-	  $currentstring = $token->[4];
-	} else {
-	  $currentstring = $token->[2];
+
+    my $deleted=0;
+    $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
+    if (($token->[0] eq 'S') && ($target eq 'modified')) {
+      $deleted=&Apache::edit::handle_delete($space,$target,$token,$tagstack,
+					     $parstack,$parser,$safeeval,
+					     $style);
+    }
+    if (!$deleted) {
+      if ($space) {
+	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+	$sub1="$space\:\:$sub";
+	($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
+					     $parstack,$parser,$safeeval,
+					     $style);
+      } else {
+	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+	if ($metamode <1) {
+	  if (defined($token->[4]) && ($metamode < 1)) {
+	    $currentstring = $token->[4];
+	  } else {
+	    $currentstring = $token->[2];
+	  }
 	}
       }
-    }
-#    &Apache::lonxml::debug("nodefalt:$nodefault:");
-    if ($currentstring eq '' && $nodefault eq '') {
-      if ($target eq 'edit') {
-	&Apache::lonxml::debug("doing default edit for $token->[1]");
-	if ($token->[0] eq 'S') {
-	  $currentstring = &Apache::edit::tag_start($target,$token);
-	} elsif ($token->[0] eq 'E') {
-	  $currentstring = &Apache::edit::tag_end($target,$token);
-	}
-      } elsif ($target eq 'modified') {
-	if ($token->[0] eq 'S') {
-	  $currentstring = $token->[4];
-	  $currentstring.=&Apache::edit::handle_insert();
-	} else {
-	  $currentstring = $token->[2];
+      #    &Apache::lonxml::debug("nodefalt:$nodefault:");
+      if ($currentstring eq '' && $nodefault eq '') {
+	if ($target eq 'edit') {
+	  &Apache::lonxml::debug("doing default edit for $token->[1]");
+	  if ($token->[0] eq 'S') {
+	    $currentstring = &Apache::edit::tag_start($target,$token);
+	  } elsif ($token->[0] eq 'E') {
+	    $currentstring = &Apache::edit::tag_end($target,$token);
+	  }
+	} elsif ($target eq 'modified') {
+	  if ($token->[0] eq 'S') {
+	    $currentstring = $token->[4];
+	    $currentstring.=&Apache::edit::handle_insert();
+	  } else {
+	    $currentstring = $token->[2];
+	  }
 	}
       }
     }
@@ -469,6 +462,36 @@ sub callsub {
   return $currentstring;
 }
 
+sub setup_globals {
+  my ($target)=@_;
+  if ($target eq 'meta') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 1;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 0;
+  } elsif ($target eq 'grade') {
+    &startredirection;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 1;
+  } elsif ($target eq 'modified') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 0;
+    $Apache::lonxml::import = 0;
+  } elsif ($target eq 'edit') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 0;
+    $Apache::lonxml::import = 0;
+  } else {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 1;
+  }
+}
+
 sub init_safespace {
   my ($target,$safeeval,$safehole,$safeinit) = @_;
   $safeeval->permit("entereval");
@@ -507,7 +530,7 @@ sub init_safespace {
   $safehole->wrap(\&Math::Random::random_noncentral_f,$safeeval,'&math_random_noncentral_f');
   $safehole->wrap(\&Math::Random::random_normal,$safeeval,'&math_random_normal');
   $safehole->wrap(\&Math::Random::random_permutation,$safeeval,'&math_random_permutation');
-#  $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
+  $safehole->wrap(\&Math::Random::random_permuted_index,$safeeval,'&math_random_permuted_index');
   $safehole->wrap(\&Math::Random::random_uniform,$safeeval,'&math_random_uniform');
   $safehole->wrap(\&Math::Random::random_poisson,$safeeval,'&math_random_poisson');
   $safehole->wrap(\&Math::Random::random_uniform_integer,$safeeval,'&math_random_uniform_integer');
@@ -539,6 +562,13 @@ sub endredirection {
   pop @Apache::lonxml::outputstack;
 }
 
+sub end_tag {
+  my ($tagstack,$parstack,$token)=@_;
+  pop(@$tagstack);
+  pop(@$parstack);
+  &decreasedepth($token);
+}
+
 sub initdepth {
   @Apache::lonxml::depthcounter=();
   $Apache::lonxml::depth=-1;
@@ -806,7 +836,7 @@ ENDNOTFOUND
  
 sub debug {
   if ($Apache::lonxml::debug eq 1) {
-    print "DEBUG:".$_[0]."<br />\n";
+    print("DEBUG:".$_[0]."<br />\n");
   }
 }
 
@@ -855,11 +885,13 @@ sub register_insert {
     my $line = $data[$i];
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }
-    my ($tag,$descrip,$function,$show) = split(/,/, $line);
+    my ($tag,$descrip,$color,$function,$show) = split(/,/, $line);
     $insertlist{"$tagnum.tag"} = $tag;
     $insertlist{"$tagnum.description"} = $descrip;
+    $insertlist{"$tagnum.color"} = $color;
     $insertlist{"$tagnum.function"} = $function;
     $insertlist{"$tagnum.show"}= $show;
+    $insertlist{"$tag.num"}=$tagnum;
     $tagnum++;
   }
   $i++; #skipping TABLE line
@@ -878,6 +910,11 @@ sub register_insert {
     $tagnum++;
   }
 }
+
+sub description {
+  my ($token)=@_;
+  return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
+}
 1;
 __END__