--- loncom/xml/lonxml.pm	2001/09/28 18:20:06	1.131
+++ loncom/xml/lonxml.pm	2001/11/07 21:26:04	1.138
@@ -49,6 +49,7 @@ use Apache::scripttag;
 use Apache::edit;
 use Apache::lonnet;
 use Apache::File;
+use Apache::loncommon;
 
 #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler
@@ -219,16 +220,17 @@ sub maketoken {
 }
 
 sub printtokenheader {
-    my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;
+    my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
     unless ($token) { return ''; }
 
-    unless ($symb) {
-	$symb=&Apache::lonnet::symbread();
+    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    unless ($tsymb) {
+	$tsymb=$symb;
     }
     unless ($tuname) {
-	$tuname=$ENV{'user.name'};
-        $tudom=$ENV{'user.domain'};
-        $tcrsid=$ENV{'request.course.id'};
+	$tuname=$name;
+        $tudom=$domain;
+        $tcrsid=$courseid;
     }
 
     my %reply=&Apache::lonnet::get('environment',
@@ -1006,7 +1008,7 @@ sub handler {
   } else {
     $request->content_type('text/html');
   }
-  
+  &Apache::loncommon::no_cache($request); 
   $request->send_http_header;
   
   return OK if $request->header_only;
@@ -1105,6 +1107,20 @@ sub get_param {
   }
 }
 
+sub get_param_var {
+  my ($param,$parstack,$safeeval,$context) = @_;
+  if ( ! $context ) { $context = -1; }
+  my $args ='';
+  if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+  if ( $args !~ /my \$$param=\"/ ) { return undef; }
+  my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
+  if ($value =~ /^[\$\@\%]/) {
+    return &Apache::run::run("return $value",$safeeval,1);
+  } else {
+    return $value;
+  }
+}
+
 sub register_insert {
   my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
   my $i;
@@ -1115,13 +1131,16 @@ sub register_insert {
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }
     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++;
+    if ($tag) {
+      $insertlist{"$tagnum.tag"} = $tag;
+      $insertlist{"$tagnum.description"} = $descrip;
+      $insertlist{"$tagnum.color"} = $color;
+      $insertlist{"$tagnum.function"} = $function;
+      if (!defined($show)) { $show='yes'; }
+      $insertlist{"$tagnum.show"}= $show;
+      $insertlist{"$tag.num"}=$tagnum;
+      $tagnum++;
+    }
   }
   $i++; #skipping TABLE line
   $tagnum = 0;
@@ -1142,7 +1161,15 @@ sub register_insert {
 
 sub description {
   my ($token)=@_;
-  return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
+  my $tagnum;
+  my $tag=$token->[1];
+  foreach my $namespace (reverse @Apache::lonxml::namespace) {
+    my $testtag=$namespace.'::'.$tag;
+    $tagnum=$insertlist{"$testtag.num"};
+    if (defined($tagnum)) { last; }
+  }
+  if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
+  return $insertlist{$tagnum.'.description'};
 }
 
 # ----------------------------------------------------------------- whichuser
@@ -1150,10 +1177,7 @@ sub description {
 # calls to lonnet functions for this setup.
 # - looks for form.grade_ parameters
 sub whichuser {
-  my $symb=&Apache::lonnet::symbread();
-  my $courseid=$ENV{'request.course.id'};
-  my $domain=$ENV{'user.domain'};
-  my $name=$ENV{'user.name'};
+  my ($symb,$courseid,$domain,$name);
   if (defined($ENV{'form.grade_symb'})) {
     my $tmp_courseid=$ENV{'form.grade_courseid'};
     my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
@@ -1163,6 +1187,11 @@ sub whichuser {
       $domain=$ENV{'form.grade_domain'};
       $name=$ENV{'form.grade_username'};
     }
+  } else {
+    $symb=&Apache::lonnet::symbread();
+    $courseid=$ENV{'request.course.id'};
+    $domain=$ENV{'user.domain'};
+    $name=$ENV{'user.name'};
   }
   return ($symb,$courseid,$domain,$name);
 }