--- rat/lonuserstate.pm	2020/05/02 21:28:08	1.149.2.4
+++ rat/lonuserstate.pm	2017/11/16 12:44:48	1.154
@@ -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.149.2.4 2020/05/02 21:28:08 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.154 2017/11/16 12:44:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use Safe::Hole;
 use Opcode;
 use Apache::lonenc;
 use Fcntl qw(:flock);
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 use File::Basename;
 
  
@@ -255,9 +255,9 @@ sub loadmap {
 		push(@map_ids, $resource_id);
                 if ($hash{'src_'.$lpc.'.'.$resource_id}) {
                     $rescount{$lpc} ++;
-                    if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) ||
+                    if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) || 
                         ($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) {
-                        $mapcount{$lpc} ++;
+                        $mapcount{$lpc} ++; 
                     }
                 }
                 unless ($codechecked) {
@@ -292,7 +292,15 @@ sub loadmap {
     # Handle randomization and random selection
 
     if ($randomize) {
-        unless (&is_advanced($courseid)) {
+        my $advanced;
+        if ($env{'request.course.id'}) {
+            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+        } else {
+            $env{'request.course.id'} = $courseid;
+            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+            $env{'request.course.id'} = '';
+        }
+        unless ($advanced) {
             # Order of resources is not randomized if user has and advanced role in the course.
 	    my $seed;
 
@@ -375,18 +383,6 @@ sub loadmap {
     }
 }
 
-sub is_advanced {
-    my ($courseid) = @_;
-    my $advanced;
-    if ($env{'request.course.id'}) {
-        $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
-    } else {
-        $env{'request.course.id'} = $courseid;
-        $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
-        $env{'request.course.id'} = '';
-    }
-    return $advanced;
-}
 
 # -------------------------------------------------------------------- Resource
 #
@@ -473,11 +469,7 @@ sub parse_resource {
     # is not a page.  If the resource is a page then it must be
     # assembled (at fetch time?).
 
-    if ($ispage) {
-        if ($token->[2]->{'external'} eq 'true') { # external
-            $turi=~s{^http\://}{/ext/};
-        }
-    } else {
+    unless ($ispage) {
 	$turi=~/\.(\w+)$/;
 	my $embstyle=&Apache::loncommon::fileembstyle($1);
 	if ($token->[2]->{'external'} eq 'true') { # external
@@ -492,6 +484,8 @@ sub parse_resource {
 	    } elsif ($turi!~/\.(sequence|page)$/) {
 		$turi='/adm/coursedocs/showdoc'.$turi;
 	    }
+        } elsif ($turi=~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
+            $turi='/adm/wrapper'.$turi;
 	} elsif ($turi=~/\S/) { # normal non-empty internal resource
 	    my $mapdir=$uri;
 	    $mapdir=~s/[^\/]+$//;
@@ -567,9 +561,7 @@ sub parse_resource {
     if (($turi=~/\.sequence$/) ||
 	($turi=~/\.page$/)) {
 	$hash{'is_map_'.$rid}=1;
-	if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) {
-	    &loadmap($turi,$rid,$courseid);
-	}
+	&loadmap($turi,$rid,$courseid);
     } 
     return $token->[2]->{'id'};
 }
@@ -1235,13 +1227,8 @@ sub readmap {
         &unlink_tmpfiles($fn);
     }
     undef %randompick;
-    undef %randompickseed;
-    undef %randomorder;
-    undef %randomizationcode;
     undef %hiddenurl;
     undef %encurl;
-    undef %rescount;
-    undef %mapcount;
     $retfrid='';
     $errtext='';
     my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.
@@ -1383,13 +1370,8 @@ sub readmap {
             $lock=1;
         }
         undef %randompick;
-        undef %randompickseed;
-        undef %randomorder;
-        undef %randomizationcode;
         undef %hiddenurl;
         undef %encurl;
-        undef %rescount;
-        undef %mapcount;
         $errtext='';
         $retfrid='';
 	#