--- loncom/xml/lonxml.pm	2001/08/20 14:53:12	1.119
+++ loncom/xml/lonxml.pm	2001/08/22 19:21:36	1.123
@@ -153,24 +153,45 @@ sub xmlend {
 }
 
 sub tokeninputfield {
-    my $defhost=$Apache::lonnet::perlvar{'lonhostID'};
+    my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
+    $defhost=~tr/a-z/A-Z/;
     return (<<ENDINPUTFIELD)
-<form method="post">
+<script>
+    function updatetoken() {
+	var comp=new Array;
+        var barcode=unescape(document.tokeninput.barcode.value);
+        comp=barcode.split('*');
+        if (typeof(comp[0])!="undefined") {
+	    document.tokeninput.codeone.value=comp[0];
+	}
+        if (typeof(comp[1])!="undefined") {
+	    document.tokeninput.codetwo.value=comp[1];
+	}
+        if (typeof(comp[2])!="undefined") {
+            comp[2]=comp[2].toUpperCase();
+	    document.tokeninput.codethree.value=comp[2];
+	}
+        document.tokeninput.barcode.value='';
+    }  
+</script>
+<form method="post" name="tokeninput">
 <table border="2" bgcolor="#FFFFBB">
 <tr><th>DocID Checkin</th></tr>
 <tr><td>
 <table>
 <tr>
 <td>Scan in Barcode</td>
-<td><input type="text" size="22" name="barcode" /></td>
+<td><input type="text" size="22" name="barcode" 
+onChange="updatetoken()"/></td>
 </tr>
 <tr><td><i>or</i> Type in DocID</td>
 <td>
 <input type="text" size="5" name="codeone" />
-<b><font size+"+2"*</font></b>
+<b><font size="+2">*</font></b>
 <input type="text" size="5" name="codetwo" />
-<b><font size+"+2"*</font></b>
-<input type="text" size="10" name="codethree" value="$defhost" />
+<b><font size="+2">*</font></b>
+<input type="text" size="10" name="codethree" value="$defhost" 
+onChange="this.value=this.value.toUpperCase()" />
 </td></tr>
 </table>
 </td></tr>
@@ -224,7 +245,7 @@ sub printtokenheader {
                '<br />DocID: '.$token.
                '<br />Time: '.localtime().'<hr />';
     } else {
-        return $token;                         
+        return $token;
     }
 }
 
@@ -414,7 +435,6 @@ sub htmlclean {
 
 sub inner_xmlparse {
   my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
-  &Apache::lonxml::debug('Reentrant parser starting, again?');
   my $finaloutput = '';
   my $result;
   my $token;
@@ -717,7 +737,10 @@ sub init_safespace {
 #need to inspect this class of ops
 # $safeeval->deny(":base_orig");
   $safeinit .= ';$external::target="'.$target.'";';
-  $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
+  my $rndseed;
+  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+  $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
+  $safeinit .= ';$external::randomseed='.$rndseed.';';
   &Apache::run::run($safeinit,$safeeval);
 }
 
@@ -1098,6 +1121,29 @@ sub description {
   my ($token)=@_;
   return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
 }
+
+# ----------------------------------------------------------------- whichuser
+# returns a list of $symb, $courseid, $domain, $name that is correct for
+# 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'};
+  if (defined($ENV{'form.grade_symb'})) {
+    my $tmp_courseid=$ENV{'form.grade_courseid'};
+    my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
+    if ($allowed) {
+      $symb=$ENV{'form.grade_symb'};
+      $courseid=$ENV{'form.grade_courseid'};
+      $domain=$ENV{'form.grade_domain'};
+      $name=$ENV{'form.grade_username'};
+    }
+  }
+  return ($symb,$courseid,$domain,$name);
+}
+
 1;
 __END__