--- rat/lonuserstate.pm	2000/12/28 21:42:28	1.21
+++ rat/lonuserstate.pm	2001/07/05 18:14:17	1.22
@@ -12,7 +12,8 @@
 #
 # 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,
 # 9/2,9/4,9/29,9/30,10/2,10/11,10/30,10/31,
-# 11/1,11/2,11/14,11/16,11/22,12/28 Gerd Kortemeyer
+# 11/1,11/2,11/14,11/16,11/22,12/28,
+# 07/05/01 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -55,6 +56,8 @@ sub loadmap {
        return OK; 
     }
 
+    my $ispage=($fn=~/\.page$/);
+
     unless (-e $fn) {
 	my $returned=Apache::lonnet::repcopy($fn);
         unless ($returned eq OK) {
@@ -98,6 +101,18 @@ sub loadmap {
                     $hash{'kind_'.$rid}='res';
                     $hash{'title_'.$rid}=$token->[2]->{'title'};
                     my $turi=$token->[2]->{'src'};
+                    unless ($ispage) {
+                        $turi=~/\.(\w+)$/;
+                        my $embstyle=&Apache::lonnet::fileembstyle($1);
+                        if ($token->[2]->{'external'} eq 'true') {
+                            $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
+                        } else {
+                           my $embstyle=&Apache::lonnet::fileembstyle($1);
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+			       $turi='/adm/wrapper'.$turi;
+                           }
+                        }
+		    }
                     $hash{'src_'.$rid}=$turi;
 
                     if (defined($hash{'ids_'.$turi})) {
@@ -106,7 +121,7 @@ sub loadmap {
                         $hash{'ids_'.$turi}=''.$rid;
                     }
 
-                    if ($token->[2]->{'src'}=~/\/\//) {
+                    if ($token->[2]->{'external'} eq 'true') {
                         $hash{'ext_'.$rid}='true:';
                     } else {
                         $hash{'ext_'.$rid}='false:';
@@ -309,6 +324,7 @@ sub accinit {
 	  map {
 	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
+            $uri=~s/^\/adm\/wrapper//;
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;