--- rat/lonuserstate.pm 2018/03/29 20:10:47 1.149.2.1 +++ rat/lonuserstate.pm 2017/05/08 14:20:32 1.151 @@ -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.1 2018/03/29 20:10:47 raeburn Exp $ +# $Id: lonuserstate.pm,v 1.151 2017/05/08 14:20:32 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; @@ -475,6 +475,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/[^\/]+$//; @@ -1174,8 +1176,6 @@ sub readmap { &unlink_tmpfiles($fn); } undef %randompick; - undef %randompickseed; - undef %randomorder; undef %hiddenurl; undef %encurl; $retfrid=''; @@ -1319,8 +1319,6 @@ sub readmap { $lock=1; } undef %randompick; - undef %randompickseed; - undef %randomorder; undef %hiddenurl; undef %encurl; $errtext='';