--- loncom/interface/lonsearchcat.pm 2001/12/11 02:18:13 1.109 +++ loncom/interface/lonsearchcat.pm 2001/12/11 03:18:39 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.109 2001/12/11 02:18:13 harris41 Exp $ +# $Id: lonsearchcat.pm,v 1.110 2001/12/11 03:18:39 harris41 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -28,7 +28,7 @@ # YEAR=2001 # 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison # 3/20, 3/21, 3/22, 3/26, 3/27, 4/2, 8/15, 8/24, 8/25 Scott Harrison -# 10/12,10/14,10/15,10/16,11/28,11/29 Scott Harrison +# 10/12,10/14,10/15,10/16,11/28,11/29,12/10 Scott Harrison # ### @@ -122,8 +122,10 @@ sub BEGIN { my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. '/filetypes.tab'); while (<$fh>) { - $_=~/(\w+)\s+(\w+)\s+([\w\s\-]+)/; chomp; - $mimetag{$1}=".$1 $3"; + if (/^\S/ and !/^\#/) { + $_=~/(\S+)\s+(\S+)\s+([\S\s\-]+)/; chomp; + $mimetag{$1}=".$1 $3"; + } } } { @@ -231,7 +233,7 @@ END $scrout.=&searchphrasefield('Limit by abstract','abstract', $ENV{'form.abstract'}); - $ENV{'form.mime'}='notxxx' unless length($ENV{'form.mime'}); + $ENV{'form.mime'}='any' unless length($ENV{'form.mime'}); $scrout.=&selectbox('Limit by MIME type','mime', $ENV{'form.mime'},%mimetag);