--- loncom/lonnet/perl/lonnet.pm 2006/01/11 08:25:06 1.683.2.9 +++ loncom/lonnet/perl/lonnet.pm 2006/01/11 20:26:45 1.683.2.10 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.683.2.9 2006/01/11 08:25:06 albertel Exp $ +# $Id: lonnet.pm,v 1.683.2.10 2006/01/11 20:26:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4981,8 +4981,7 @@ sub metadata { # if it is a non metadata possible uri return quickly if (($uri eq '') || (($uri =~ m|^/*adm/|) && - ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|) - && ($uri !~ m|^adm/coursedocs/|) && ($uri !~ m|^adm/wrapper/|)) || + ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) || ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) || ($uri =~ m|home/[^/]+/public_html/|)) { return undef; @@ -6108,14 +6107,21 @@ sub clutter { } else { my ($ext) = ($thisfn =~ /\.(\w+)$/); my $embstyle=&Apache::loncommon::fileembstyle($ext); - if (($embstyle eq 'img') + if ($embstyle eq 'ssi' + || ($embstyle eq 'hdn') + || ($embstyle eq 'rat') + || ($embstyle eq 'prv') + || ($embstyle eq 'ign')) { + #do nothing with these + } elsif (($embstyle eq 'img') || ($embstyle eq 'emb') || ($embstyle eq 'wrp')) { $thisfn='/adm/wrapper'.$thisfn; - } elsif ($embstyle eq 'ssi') { - #do nothing with these - } elsif ($thisfn!~/\.(sequence|page)$/) { + } elsif ($embstyle eq 'unk' + && $thisfn!~/\.(sequence|page)$/) { $thisfn='/adm/coursedocs/showdoc'.$thisfn; + } else { + &logthis("Got a blank emb style"); } } }