--- rat/lonuserstate.pm	2003/10/22 16:52:14	1.62
+++ rat/lonuserstate.pm	2003/10/23 21:01:54	1.63
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.62 2003/10/22 16:52:14 www Exp $
+# $Id: lonuserstate.pm,v 1.63 2003/10/23 21:01:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -161,11 +161,9 @@ sub loadmap {
 			}
 		    }
 		    &Apache::lonnet::do_cache(\%Apache::lonnet::titlecache,
-		       &Apache::lonnet::symbclean(
-                        &Apache::lonnet::declutter($uri).'___'.
-                        $token->[2]->{'id'}.'___'.
-		        &Apache::lonnet::declutter($turi)),
-					      $token->[2]->{'title'});
+		       &Apache::lonnet::encode_symb($uri,$token->[2]->{'id'},
+						    $turi),
+					      $token->[2]->{'title'},'title');
                     unless ($ispage) {
                         $turi=~/\.(\w+)$/;
                         my $embstyle=&Apache::loncommon::fileembstyle($1);
@@ -267,12 +265,17 @@ sub loadmap {
 # ------------------------------------------------------------------- Parameter
 
                     my $referid=$lpc.'.'.$token->[2]->{'to'};
-                    my $part=$token->[2]->{'part'};
-                    unless ($part) { $part=0; }
+		    my $name=$token->[2]->{'name'};
+		    my $part;
+		    if ($name=~/^parameter_(.*)_/) {
+			$part=$1;
+		    } else {
+			$part=0;
+		    }
+		    $name=~s/^.*_([^_]*)$/$1/;
                     my $newparam=
 			&Apache::lonnet::escape($token->[2]->{'type'}).':'.
-			&Apache::lonnet::escape($part.'.'.
-                         $token->[2]->{'name'}).'='.
+			&Apache::lonnet::escape($part.'.'.$name).'='.
 			&Apache::lonnet::escape($token->[2]->{'value'});
                     if (defined($hash{'param_'.$referid})) {
                         $hash{'param_'.$referid}.='&'.$newparam;