--- rat/lonuserstate.pm	2000/12/28 21:42:28	1.21
+++ rat/lonuserstate.pm	2001/11/29 19:23:49	1.25
@@ -1,6 +1,30 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
+# $Id: lonuserstate.pm,v 1.25 2001/11/29 19:23:49 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # (Server for RAT Maps
 #
 # (Edit Handler for RAT Maps
@@ -12,7 +36,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,08/30,08/31 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -55,6 +80,8 @@ sub loadmap {
        return OK; 
     }
 
+    my $ispage=($fn=~/\.page$/);
+
     unless (-e $fn) {
 	my $returned=Apache::lonnet::repcopy($fn);
         unless ($returned eq OK) {
@@ -98,6 +125,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 +145,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,11 +348,13 @@ sub accinit {
 	  map {
 	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
+            $uri=~s/^\/adm\/wrapper//;
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             my $uripath=join('/',@uriparts);
             $uripath=~s/^\/res\///;
+           if ($uripath) {
             my $uricond='0';
             if (defined($hash{'conditions_'.$resid})) {
  		$uricond=$captured{$hash{'conditions_'.$resid}};
@@ -331,10 +372,12 @@ sub accinit {
             } else {
                 $acchash{'acc.res.'.$short.'.'.$uripath}=
                  '&'.$urifile.':'.$uricond.'&';
-            } 
+            }
+           } 
          } split(/\,/,$hash{$_});
       }
     } keys %hash;
+    $acchash{'acc.res.'.$short.'.'}='&:0&';
     my $courseuri=$uri;
     $courseuri=~s/^\/res\///;
     &Apache::lonnet::delenv('(acc\.|httpref\.)');