--- loncom/interface/lonindexer.pm 2007/08/02 00:10:59 1.175
+++ loncom/interface/lonindexer.pm 2007/08/17 22:54:36 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Directory Indexer
#
-# $Id: lonindexer.pm,v 1.175 2007/08/02 00:10:59 banghart Exp $
+# $Id: lonindexer.pm,v 1.179 2007/08/17 22:54:36 banghart Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -106,7 +106,7 @@ sub handler {
my $fileclr='#ffffe6';
my $line;
- my (@attrchk,@openpath,%typechk);
+ my (@attrchk,@openpath,$typeselect);
my $uri=$r->uri;
# -------------------------------------- see if called from an interactive mode
@@ -411,16 +411,11 @@ ENDHEADER
{'domain' => $headerdom,}));
# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {
- if ($env{'form.only'} eq 'problem' ) {
- $typechk{'problem'} = 'selected';
- } elsif ($env{'form.only'} eq 'gif,jpg,jpeg' ) {
- $typechk{'graphic'} = 'selected';
- }
+ $typeselect = $env{'form.only'};
} else {
- $typechk{'all'} = 'selected';
+ $typeselect = '';
}
-
# ---------------------------------- get state of file attributes to be showing
if ($env{'form.attrs'}) {
for (my $i=0; $i<=11; $i++) {
@@ -482,17 +477,31 @@ ENDHEADER
-
+END
+ my @file_categories = &Apache::loncommon::filecategories();
+ my %select_file_categories;
+ my @select_form_order = ('');
+ $select_file_categories{''} = &mt('All file types');
+ foreach my $cat (@file_categories) {
+ my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+ $select_file_categories{$types} = $cat;
+ push(@select_form_order,$types);
+ }
+ $select_file_categories{'select_form_order'} = \@select_form_order;
+ my $type_element=
+ &Apache::loncommon::select_form($typeselect,'only',
+ %select_file_categories);
+ $type_element = '';
+ $r->print(<
$closebutton $groupimportbutton
END
$r->print(&Apache::loncommon::inhibit_menu_check('input'));
+
# -------------- Filter out sequence containment in crumbs and "recent folders"
my $storeuri=$uri;
$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
@@ -926,11 +935,11 @@ sub display_line {
my @file_ext = split (/\./,$listname);
my $curfext = $file_ext[-1];
if (@Omit) {
- foreach (@Omit) { return OK if ($curfext eq $_); }
+ foreach (@Omit) { return OK if (lc($curfext) eq $_); }
}
if (@Only) {
my $skip = 1;
- foreach (@Only) { $skip = 0 if ($curfext eq $_); }
+ foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
return OK if ($skip > 0);
}
# Set the icon for the file