--- rat/lonuserstate.pm	2020/03/05 22:39:57	1.149.2.3
+++ rat/lonuserstate.pm	2018/11/13 03:59:17	1.157
@@ -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.3 2020/03/05 22:39:57 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.157 2018/11/13 03:59:17 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;
 
  
@@ -62,6 +62,7 @@ my %randomorder; # maps to order content
 my %randomizationcode; # code used to grade folder for bubblesheet exam 
 my %encurl; # URLs in this folder are supposed to be encrypted
 my %hiddenurl; # this URL (or complete folder) is supposed to be hidden
+my %deeplinkonly; # this URL (or complete folder) is deep-link only
 my %rescount; # count of unhidden items in each map
 my %mapcount; # count of unhidden maps in each map
 
@@ -255,9 +256,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) {
@@ -469,11 +470,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
@@ -488,6 +485,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/[^\/]+$//;
@@ -919,6 +918,14 @@ sub traceroute {
 	    && ($hash{'src_'.$rid}!~/\.sequence$/)) {
 	    $retfrid=$rid;
 	}
+        my @deeplink=&Apache::lonnet::EXT('resource.0.deeplink',$symb);
+        unless ((@deeplink == 0) || ($deeplink[0] eq 'full')) {
+            $deeplinkonly{$rid}=join(':',@deeplink);
+            if ($deeplink[1] eq 'map') {
+                my $parent = (split(/\,/,$hash{'map_hierarchy_'.$mapid}))[-1];
+                $deeplinkonly{"$parent.$mapid"}=$deeplinkonly{$rid};
+            }
+        }
 
 	if (defined($hash{'conditions_'.$rid})) {
 	    $hash{'conditions_'.$rid}=simplify(
@@ -1234,6 +1241,7 @@ sub readmap {
     undef %randomizationcode;
     undef %hiddenurl;
     undef %encurl;
+    undef %deeplinkonly;
     undef %rescount;
     undef %mapcount;
     $retfrid='';
@@ -1382,6 +1390,7 @@ sub readmap {
         undef %randomizationcode;
         undef %hiddenurl;
         undef %encurl;
+        undef %deeplinkonly;
         undef %rescount;
         undef %mapcount;
         $errtext='';
@@ -1520,6 +1529,10 @@ sub build_tmp_hashes {
 #           $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id});
         $hash{'encrypted_'.$id}=1;
     }
+# ------------------------------------------------------------ Deep-linked URLs
+    foreach my $id (keys(%deeplinkonly)) {
+        $hash{'deeplinkonly_'.$id}=$deeplinkonly{$id};
+    }
 # ----------------------------------------------- Close hashes to finally store
 # --------------------------------- Routine must pass this point, no early outs
     $hash{'first_rid'}=$retfrid;