--- rat/lonuserstate.pm	2003/12/15 15:49:23	1.70
+++ rat/lonuserstate.pm	2004/04/05 18:25:08	1.72
@@ -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.70 2003/12/15 15:49:23 www Exp $
+# $Id: lonuserstate.pm,v 1.72 2004/04/05 18:25:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -159,7 +159,9 @@ sub loadmap {
                         } elsif ($turi=~/^\/*uploaded\//) { # uploaded
 			    if (($embstyle eq 'img') || ($embstyle eq 'emb')
                              || ($embstyle eq 'ssi')) {
-                                $turi='/adm/wrapper'.$turi;
+                                unless ($turi =~/\.page$/) {
+                                    $turi='/adm/wrapper'.$turi;
+                                }
                             } elsif ($turi!~/\.(sequence|page)$/) {
 				$turi='/adm/coursedocs/showdoc'.$turi;
                             }
@@ -172,11 +174,13 @@ sub loadmap {
 			    }
                         }
 		    }
-
-                    if (defined($hash{'ids_'.$turi})) {
-                        $hash{'ids_'.$turi}.=','.$rid;
+# Store reverse lookup, remove query string
+		    my $idsuri=$turi;
+		    $idsuri=~s/\?.+$//;
+                    if (defined($hash{'ids_'.$idsuri})) {
+                        $hash{'ids_'.$idsuri}.=','.$rid;
                     } else {
-                        $hash{'ids_'.$turi}=''.$rid;
+                        $hash{'ids_'.$idsuri}=''.$rid;
                     }
                
                     if