--- rat/lonuserstate.pm	2004/04/23 15:43:41	1.74
+++ rat/lonuserstate.pm	2004/04/23 23:01:35	1.76
@@ -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.74 2004/04/23 15:43:41 www Exp $
+# $Id: lonuserstate.pm,v 1.76 2004/04/23 23:01:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -160,11 +160,8 @@ sub loadmap {
                         if ($token->[2]->{'external'} eq 'true') { # external
                             $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
                         } elsif ($turi=~/^\/*uploaded\//) { # uploaded
-			    if (($embstyle eq 'img') || ($embstyle eq 'emb')
-                             || ($embstyle eq 'ssi')) {
-                                unless ($turi =~/\.page$/) {
-                                    $turi='/adm/wrapper'.$turi;
-                                }
+			    if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+                                $turi='/adm/wrapper'.$turi;
                             } elsif ($turi!~/\.(sequence|page)$/) {
 				$turi='/adm/coursedocs/showdoc'.$turi;
                             }
@@ -279,21 +276,21 @@ sub loadmap {
                     } else {
                         $hash{'param_'.$referid}=''.$newparam;
                     }
-                    if ($token->[2]->{'name'} eq 'parameter_mapalias') {
+                    if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) {
 			$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
                     }
-                    if ($token->[2]->{'name'} eq 'parameter_randompick') {
+                    if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
 			$randompick{$referid}=$token->[2]->{'value'};
                     }
-                    if ($token->[2]->{'name'} eq 'parameter_randompickseed') {
+                    if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
 			$randompick{$referid}=$token->[2]->{'value'};
                     }
-                    if ($token->[2]->{'name'} eq 'parameter_encrypturl') {
+                    if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
 			if ($token->[2]->{'value'}=~/^yes$/i) {
 			    $encurl{$referid}=1;
 			}
                     }
-                    if ($token->[2]->{'name'} eq 'parameter_hiddenresource') {
+                    if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) {
 			if ($token->[2]->{'value'}=~/^yes$/i) {
 			    $hiddenurl{$referid}=1;
 			}