--- rat/lonuserstate.pm 2005/09/23 21:39:09 1.96 +++ rat/lonuserstate.pm 2005/11/15 18:27:52 1.98 @@ -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.96 2005/09/23 21:39:09 albertel Exp $ +# $Id: lonuserstate.pm,v 1.98 2005/11/15 18:27:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,6 @@ package Apache::lonuserstate; # ------------------------------------------------- modules used by this module use strict; -use Apache::Constants qw(:common :http); use HTML::TokeParser; use Apache::lonnet; use Apache::loncommon(); @@ -104,7 +103,7 @@ sub processversionfile { sub loadmap { my $uri=shift; - if ($hash{'map_pc_'.$uri}) { return OK; } + if ($hash{'map_pc_'.$uri}) { return; } $pc++; my $lpc=$pc; @@ -119,7 +118,7 @@ sub loadmap { unless (($fn=~/\.sequence$/) || ($fn=~/\.page$/)) { $errtext.="Invalid map: $fn\n"; - return OK; + return; } my $instr=&Apache::lonnet::getfile($fn); @@ -165,7 +164,10 @@ sub loadmap { if ($token->[2]->{'external'} eq 'true') { # external $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; } elsif ($turi=~/^\/*uploaded\//) { # uploaded - if (($embstyle eq 'img') || ($embstyle eq 'emb')) { + if (($embstyle eq 'img') + || ($embstyle eq 'emb') + || ($embstyle eq 'ign') + || ($embstyle eq 'unk')) { $turi='/adm/wrapper'.$turi; } elsif ($embstyle eq 'ssi') { #do nothing with these