--- loncom/interface/lonindexer.pm 2002/03/06 22:01:06 1.36 +++ loncom/interface/lonindexer.pm 2008/12/05 10:23:56 1.184 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.36 2002/03/06 22:01:06 matthew Exp $ +# $Id: lonindexer.pm,v 1.184 2008/12/05 10:23:56 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,25 +25,6 @@ # # http://www.lon-capa.org/ # -# YEAR=1999 -# 5/21/99, 5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer) -# 11/23 Gerd Kortemeyer -# YEAR=2000 -# 07/20-08/04 H.K. Ng -# YEAR=2001 -# 05/9-05/19/2001 H. K. Ng -# 05/21/2001 H. K. Ng -# 05/23/2001 H. K. Ng -# 5/31,6/1,6/2,6/15 Scott Harrison -# 6/26,7/8 H. K. Ng -# 8/6,8/7,8/10 Scott Harrison -# 8/14 H. K. Ng -# 8/28,10/15,11/28,11/29 Scott Harrison -# 11/30 Matthew Hall -# 12/11,12/13 Scott Harrison -# YEAR=2002 -# 1/17 Scott Harrison -# ### ############################################################################### @@ -63,32 +44,55 @@ package Apache::lonindexer; # ------------------------------------------------- modules used by this module use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonsequence(); use Apache::Constants qw(:common); +use Apache::lonmeta; use Apache::File; +use Apache::lonlocal; +use Apache::lonsource(); +use Apache::groupsort(); use GDBM_File; +use LONCAPA qw(:match); # ---------------------------------------- variables used throughout the module -my %hash; # tied to a user-specific gdbm file +my %hash; # global user-specific gdbm file my %dirs; # keys are directories, values are the open/close status my %language; # has the reference information present in language.tab - +my %dynhash; # hash of hashes for dynamic metadata +my %dynread; # hash of directories already read for dynamic metadata +my %fieldnames; # Metadata fieldnames # ----- Values which are set by the handler subroutine and are accessible to # ----- other methods. my $extrafield; # default extra table cell my $fnum; # file counter my $dnum; # directory counter +# ----- Used to include or exclude files with certain extensions. +my @Only = (); +my @Omit = (); + + + + # ----------------------------- Handling routine called via Apache and mod_perl sub handler { my $r = shift; - $r->content_type('text/html'); + my $c = $r->connection(); + &Apache::loncommon::content_type($r,'text/html'); + &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; $fnum=0; $dnum=0; - untie %hash; + + # Deal with stupid global variables (is there a way around making + # these global to this package? It is just so wrong....) + undef (@Only); + undef (@Omit); + %fieldnames=&Apache::lonmeta::fieldnames(); # ------------------------------------- read in machine configuration variables my $iconpath= $r->dir_config('lonIconsURL') . "/"; @@ -100,60 +104,103 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); - my $fileclr='#ffffe6'; +#SB my $fileclr='#ffffe6'; my $line; - my (@attrchk,@openpath); + my (@attrchk,@openpath,$typeselect); my $uri=$r->uri; # -------------------------------------- see if called from an interactive mode # Get the parameters from the query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['catalogmode','launch','acts','mode','form','element']); + ['catalogmode','launch','acts','mode','form','element', + 'only','omit','titleelement']); #------------------------------------------------------------------- my $closebutton=''; my $groupimportbutton=''; my $colspan=''; - + $extrafield=''; my $diropendb = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; - - if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { - if ($ENV{'form.launch'} eq '1') { - &start_fresh_session(); - } - -# -------------------- refresh environment with user database values (in %hash) - if ($hash{'mode_catalog'} eq 'interactive') { - $ENV{'form.catalogmode'}='interactive'; + "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db"; + %hash = (); + { + my %dbfile; + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRITER(),0640)) { + if ($env{'form.launch'} eq '1') { + &start_fresh_session(\%dbfile); + } + while(my($key,$value)=each(%dbfile)) { + $hash{$key}=$value; + } + untie(%dbfile); } - if ($hash{'mode_catalog'} eq 'groupimport') { - $ENV{'form.catalogmode'}='groupimport'; + } +# - Evaluate actions from previous page (both cumulatively and chronologically) + if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') { + &Apache::groupsort::update_actions_hash(\%hash); } + + { + #Hijack lonindexer to verify a title and be close down. + if ($env{'form.launch'} eq '2') { + &Apache::loncommon::content_type($r,'text/html'); + my $extra=''; + if (defined($env{'form.titleelement'}) && + $env{'form.titleelement'} ne '') { + my $verify_title = &Apache::lonnet::gettitle($env{'form.acts'}); +# &Apache::lonnet::logthis("Hrrm $env{'form.acts'} -- $verify_title"); + $verify_title=~s/'/\\'/g; + $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';'; + } + my $js = < + function load() { + window.opener.document.forms["$env{'form.form'}"] + .elements["$env{'form.element'}"] + .value='$env{'form.acts'}'; + $extra + window.close(); + } + +ENDSUBM + $r->print(&Apache::loncommon::start_page(undef,$js, + {'only_body' =>1, + 'add_entries' => + {'onload' => "load();"},} + ). + &Apache::loncommon::end_page()); + return OK; + } + +# -------------------- refresh environment with user database values (in %hash) + &setvalues(\%hash,'form.catalogmode',\%env,'form.catalogmode' ); # --------------------- define extra fields and buttons in case of special mode - if ($ENV{'form.catalogmode'} eq 'interactive') { - $hash{'mode_catalog'}='interactive'; - $extrafield=''. - ''; + if ($env{'form.catalogmode'} eq 'interactive') { +#SB $extrafield=''. + $extrafield=''. + ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); $closebutton=< + END } - elsif ($ENV{'form.catalogmode'} eq 'groupimport') { - $hash{'mode_catalog'}='groupimport'; - $extrafield=''. - ''; + elsif ($env{'form.catalogmode'} eq 'import') { +#SB $extrafield=''. + $extrafield=''. + ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); + my $gi=&mt('Import'); $closebutton=< + END $groupimportbutton=< + END } # Additions made by Matthew to make the browser a little easier to deal @@ -164,42 +211,54 @@ END # selection is made. # $element is the name of the element in $formname which receives # the URL. - &Apache::lonxml::debug('Checking mode, form, element'); - &setvalues(\%hash,'form_mode' ,\%ENV,'form.mode' ); - &setvalues(\%hash,'form_form' ,\%ENV,'form.form' ); - &setvalues(\%hash,'form_element',\%ENV,'form.element'); - - my $mode = $ENV{'form.mode'}; - my ($form,$element); - if ($mode eq 'edit') { - $form = $ENV{'form.form'}; - $element = $ENV{'form.element'}; + #&Apache::lonxml::debug('Checking mode, form, element'); + &setvalues(\%hash,'form.mode' ,\%env,'form.mode' ); + &setvalues(\%hash,'form.form' ,\%env,'form.form' ); + &setvalues(\%hash,'form.element' ,\%env,'form.element'); + &setvalues(\%hash,'form.titleelement',\%env,'form.titleelement'); + &setvalues(\%hash,'form.only' ,\%env,'form.only' ); + &setvalues(\%hash,'form.omit' ,\%env,'form.omit' ); + + # Deal with 'omit' and 'only' + if (exists $env{'form.omit'}) { + @Omit = split(',',$env{'form.omit'}); + } + if (exists $env{'form.only'}) { + @Only = split(',',$env{'form.only'}); + } + + my $mode = $env{'form.mode'}; + my ($form,$element,$titleelement); + if ($mode eq 'edit' || $mode eq 'parmset') { + $form = $env{'form.form'}; + $element = $env{'form.element'}; + $titleelement = $env{'form.titleelement'}; } - &Apache::lonxml::debug("mode=$mode form=$form element=$element"); + #&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement"); # ------ set catalogmodefunctions to have extra needed javascript functionality my $catalogmodefunctions=''; - if ($ENV{'form.catalogmode'} eq 'interactive' or - $ENV{'form.catalogmode'} eq 'groupimport') { + if ($env{'form.catalogmode'} eq 'interactive' or + $env{'form.catalogmode'} eq 'import') { # The if statement below sets us up to use the old version # by default (ie. if $mode is undefined). This is the easy # way out. Hopefully in the future I'll find a way to get # the calls dealt with in a more comprehensive manner. - if (!defined($mode) || $mode ne 'edit') { + +# +# There is now also mode "simple", which is for the simple version of the rat +# +# + if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) { + my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&"; + $location .= "mode=".$mode."&"; + $location .= "acts="; $catalogmodefunctions=<<"END"; -function select_data(title,url) { - changeTitle(title); +function select_data(url) { changeURL(url); self.close(); } function select_group() { - window.location="/adm/groupsort?catalogmode=groupimport&acts="+document.forms.fileattr.acts.value; -} -function changeTitle(val) { - if (opener.inf) { - if (opener.inf.document.forms.resinfo.elements.t) { - opener.inf.document.forms.resinfo.elements.t.value=val; - } - } + window.location="$location"+document.forms.fileattr.acts.value; } function changeURL(val) { if (opener.inf) { @@ -209,32 +268,79 @@ function changeURL(val) { } } END - } else { # we are in 'edit' mode + } elsif ($mode eq 'edit') { # we are in 'edit' mode + my $location = "/adm/groupsort?catalogmode=interactive&"; + $location .= "form=$form&element=$element&mode=edit&acts="; + $catalogmodefunctions=<print(< - -The LearningOnline Network With CAPA Directory Browser - + + my $js = <<"ENDHEADER"; - - - ENDHEADER -# - Evaluate actions from previous page (both cumulatively and chronologically) - if ($ENV{'form.catalogmode'} eq 'groupimport') { - my $acts=$ENV{'form.acts'}; - my @Acts=split(/b/,$acts); - my %ahash; - my %achash; - my $ac=0; - # some initial hashes for working with data - foreach (@Acts) { - my ($state,$ref)=split(/a/); - $ahash{$ref}=$state; - $achash{$ref}=$ac; - $ac++; - } - # sorting through the actions and changing the tied database hash - foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) { - my $key=$_; - if ($ahash{$key} eq '1') { - $hash{'store_'.$hash{'pre_'.$key.'_link'}}= - $hash{'pre_'.$key.'_title'}; - $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}= - $hash{'storectr'}+0; - $hash{'storectr'}++; - } - if ($ahash{$key} eq '0') { - if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) { - delete $hash{'store_'.$hash{'pre_'.$key.'_link'}}; - } - } - } - # deleting the previously cached listing - foreach (keys %hash) { - if ($_ =~ /^pre_/ && $_ =~/link$/) { - my $key = $_; - $key =~ s/^pre_//; - $key =~ s/_[^_]*$//; - delete $hash{'pre_'.$key.'_title'}; - delete $hash{'pre_'.$key.'_link'}; - } - } + my ($headerdom)=($uri=~m{^/res/($match_domain)/}); + $r->print(&Apache::loncommon::start_page('Browse Resources',$js, + {'domain' => $headerdom,})); +# ---------------------------------- get state of file types to be showing + if ($env{'form.only'}) { + $typeselect = $env{'form.only'}; + } else { + $typeselect = ''; } - -# ---------------------------------------------------------------- output title - $r->print('

The LearningOnline With CAPA '. - 'Network Directory Browser

'."\n"); + # ---------------------------------- get state of file attributes to be showing - if ($ENV{'form.attrs'} ne "") { - for (my $i=0; $i<=6; $i++) { + if ($env{'form.attrs'}) { + for (my $i=0; $i<=11; $i++) { delete $hash{'display_attrs_'.$i}; - if ($ENV{'form.attr'.$i} == 1) { - $attrchk[$i] = "checked"; + if ($env{'form.attr'.$i} == 1) { + $attrchk[$i] = 'checked'; $hash{'display_attrs_'.$i} = 1; } } } else { - for (my $i=0; $i<=6; $i++) { - $attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1; + for (my $i=0; $i<=11; $i++) { + $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } + # ------------------------------- output state of file attributes to be showing +# All versions has to the last item +# since it does not take an extra col + my %lt=&Apache::lonlocal::texthash( + 'ti' => 'Title', + 'si' => 'Size', + 'la' => 'Last access', + 'lm' => 'Last modified', + 'st' => 'Statistics', + 'au' => 'Author', + 'kw' => 'Keywords', + 'ln' => 'Language', + 'sa' => 'Source Available', + 'sr' => 'Show resource', + 'li' => 'Linked/Related Resources', + 'av' => 'All versions', + 'ud' => 'Update Display', + 'pr' => 'Problems', + 'gr' => 'Graphics', + 'at' => 'All types', + 'hd' => 'Display Options' + ); $r->print(<Display file attributes
+
+$lt{'hd'}
- - - - - - - - - + +
Size Last access Last modified All versions
Author Keywords Language
+ + + + + + + + + + + + + + + + -
 
- + + + +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($type_element + .'
'); + $r->print(< + -  - -$closebutton -$groupimportbutton - +$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]; + $storeuri=~s/\/+/\//g; +# ---------------------------------------------------------------- Bread crumbs + $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', + (($env{'form.catalogmode'} eq 'import')? + 'document.forms.fileattr':'')). + &Apache::lonhtmlcommon::select_recent('residx','resrecent', +'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();')); +# -------------------------------------------------------- Resource Home Button + my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'}; + if ($reshome) { + $r->print("print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();'); + } else { + $r->print($reshome); + } + $r->print("'>".&mt('Home').''); + } + $r->print(''); +# ------------------------------------------------------ Remember where we were + &Apache::loncommon::storeresurl($storeuri); + &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); +# -------------------------------------------------- Check All and Uncheck all + if ($env{'form.catalogmode'} eq 'import') { + $r->print('
'); + $r->print(''); + } # ----------------- output starting row to the indexed file/directory hierarchy - my $titleclr="#ddffff"; - $r->print("
\n"); - $r->print("\n"); - $r->print("\n"); - $r->print("\n") if ($hash{'display_attrs_0'} == 1); - $r->print("\n") - if ($hash{'display_attrs_1'} == 1); - $r->print("\n") + #$r->print(&initdebug()); + #$r->print(&writedebug("Omit:@Omit")) if (@Omit); + #$r->print(&writedebug("Only:@Only")) if (@Only); + $r->print('

'); + $r->print(&Apache::loncommon::start_data_table() + .&Apache::loncommon::start_data_table_header_row()); + $r->print("\n"); + $r->print("\n") + if ($hash{'display_attrs_0'} == 1); + $r->print('\n") if ($hash{'display_attrs_1'} == 1); + $r->print("\n") if ($hash{'display_attrs_2'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print(""); + $r->print("\n") + if ($hash{'display_attrs_6'} == 1); + $r->print("\n") + if ($hash{'display_attrs_8'} == 1); + $r->print("\n") + if ($hash{'display_attrs_10'} == 1); + $r->print("\n") + if ($hash{'display_attrs_11'} == 1); + $r->print("\n") + if ($hash{'display_attrs_7'} == 1); + $r->print(&Apache::loncommon::end_data_table_header_row()); # ----------------- read in what directories have previously been set to "open" foreach (keys %hash) { @@ -389,8 +580,8 @@ END } } - if ($ENV{'form.openuri'}) { # take care of review and refresh options - my $uri=$ENV{'form.openuri'}; + if ($env{'form.openuri'}) { # take care of review and refresh options + my $uri=$env{'form.openuri'}; if (exists($hash{'diropen_status_'.$uri})) { my $cursta = $hash{'diropen_status_'.$uri}; $dirs{$uri} = 'open'; @@ -405,21 +596,19 @@ END } } - my $bredir = $ENV{'form.dirPointer'}; my $toplevel; my $indent = 0; $uri = $uri.'/' if $uri !~ /.*\/$/; - if ($bredir ne "on") { - $hash{'top.level'} = $uri; - $toplevel = $uri; - - } else { - $toplevel = $hash{'top.level'}; - } + if ($env{'form.dirPointer'} ne 'on') { + $hash{'top.level'} = $uri; + $toplevel = $uri; + } else { + $toplevel = $hash{'top.level'}; + } # -------------------------------- if not at top level, provide an uplink arrow - if ($toplevel ne "/res/"){ + if ($toplevel ne '/res/'){ my (@uri_com) = split(/\//,$uri); pop @uri_com; my $upone = join('/',@uri_com); @@ -430,67 +619,78 @@ END # -------- recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); - -# ---------------------------- embed hidden information useful for group import - $r->print(""); - $r->print(""); # -------------------------------------------------------------- end the tables - $r->print("
NameSize (bytes) ". - "Last accessedLast modified".&mt('Name')."".&mt('Title')."'.&mt("Size")." (".&mt("bytes").") ". + "".&mt("Last accessed")."Author(s)".&mt("Last modified")."Keywords".&mt("Author(s)")."Language".&mt("Keywords")."
".&mt("Language")."".&mt("Usage Statistics")."
(". + &mt("Courses/Network Hits").") ".&mt('updated periodically')."		".&mt("Source Available")."".&mt("Linked/Related Resources")."".&mt("Resource")."
"); - $r->print("
"); + $r->print(&Apache::loncommon::end_data_table()); + +# ---------------------------- embed hidden information useful for group import + $r->print("
"); + $r->print("
"); # --------------------------------------------------- end the output and return - $r->print("\n"); - untie(%hash); - } else { - $r->print('Unable to tie hash to db '. - 'file'); - return OK; + $r->print(&Apache::loncommon::end_page()."\n"); + } + if(! $c->aborted()) { +# write back into the temporary file + my %dbfile; + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) { + while (my($key,$value) = each(%hash)) { + $dbfile{$key}=$value; + } + untie(%dbfile); + } } + return OK; } # ----------------------------------------------- recursive scan of a directory sub scanDir { my ($r,$startdir,$indent,$hashref)=@_; + my $c = $r->connection(); my ($compuri,$curdir); my $dirptr=16384; + my $obs; $indent++; - my %dupdirs = %dirs; my @list=&get_list($r,$startdir); foreach my $line (@list) { - my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); - next if $strip =~ /.*\.meta$/; + return if ($c->aborted()); + #This is a kludge, sorry aboot this + my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + next if($strip =~ /.*\.meta$/ | $obs eq '1'); my (@fileparts) = split(/\./,$strip); - if ($hash{'display_attrs_6'} != 1) { + if ($hash{'display_attrs_9'} != 1) { + # if not all versions to be shown if (scalar(@fileparts) >= 3) { my $fext = pop @fileparts; my $ov = pop @fileparts; my $fname = join ('.',@fileparts,$fext); - next if (grep /$fname/,@list and $ov =~ /\d+/); + next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/); } } - if ($dom eq "domain") { - $compuri = join('',$strip,"/"); # dom list has /res/ - $curdir = $compuri; + if ($dom eq 'domain') { + # dom list has full path /res// already + $curdir=''; + $compuri = (split(/\&/,$line))[0]; } else { # user, dir & file have name only, i.e., w/o path - $compuri = join('',$startdir,$strip,"/"); + $compuri = join('',$startdir,$strip,'/'); $curdir = $startdir; } - my $diropen = "closed"; - if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) { + my $diropen = 'closed'; + if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) { while (my ($key,$val)= each %dupdirs) { if ($key eq $compuri and $val eq "open") { $diropen = "opened"; - delete $dupdirs{key},$dirs{$key}; + delete($dupdirs{$key}); + delete($dirs{$key}); } } } &display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list); - &scanDir ($r,$compuri,$indent) if $diropen eq "opened"; + &scanDir ($r,$compuri,$indent) if $diropen eq 'opened'; } $indent--; } @@ -498,23 +698,83 @@ sub scanDir { # --------------- get complete matched list based on the uri (returns an array) sub get_list { my ($r,$uri)=@_; - my @list; - my $luri = $uri; - $luri =~ s/\//_/g; - - if ($ENV{'form.attrs'} eq "Refresh") { + my @list=(); + (my $luri = $uri) =~ s/\//_/g; + if ($env{'form.updatedisplay'}) { foreach (keys %hash) { delete $hash{$_} if ($_ =~ /^dirlist_files_/); - } + delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/); + } } - if ($hash{'dirlist_files'.$luri}) { + if (defined($hash{'dirlist_files_'.$luri}) && + $hash{'dirlist_timestamp_files_'.$luri}+600 > (time)) { @list = split(/\n/,$hash{'dirlist_files_'.$luri}); + } elsif ($uri=~/\.(page|sequence)\/$/) { +# is a page or a sequence + $uri=~s/\/$//; + $uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; + $uri=~s/\/+/\//g; + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { + my @ratpart=split(/\:/,$_); + push(@list,&LONCAPA::map::qtescape($ratpart[1])); + } + $hash{'dirlist_files_'.$luri} = join("\n",@list); } else { +# is really a directory @list = &Apache::lonnet::dirlist($uri); - $hash{'dirlist_files_'.$luri} = join('\n',@list); + $hash{'dirlist_files_'.$luri} = join("\n",@list); + $hash{'dirlist_timestamp_files_'.$luri} = time; } - return @list=&match_ext($r,@list); + return @list=&match_ext($r,@list); +} + +sub dynmetaread { + my $uri=shift; + if (($hash{'display_attrs_8'}==1) || ($hash{'display_attrs_11'}==1)) { +# We don't want the filename + $uri=~s/\/[^\/]+$//; +# Did we already see this? + my $builddir=$uri; + while ($builddir) { + if ($dynread{$builddir}) { + return 0; + } + $builddir=~s/\/[^\/]+$//; + } +# Actually get the data + %dynhash= + (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri.'/')); +# Remember that we got it + $dynread{$uri}=1; + } +} + +sub initdebug { + my $start_page= + &Apache::loncommon::start_page('Debug',undef, + {'only_body' => 1,}); + $start_page =~ s/\n/ /g; + return < +var debugging = true; +if (debugging) { + var debuggingWindow = window.open('','Debug','width=400,height=300',true); +} + +function output(text) { + if (debugging) { + debuggingWindow.document.writeln(text); + } +} +output('$start_page
');   
+
+ENDJS
+}
+
+sub writedebug {
+    my ($text) = @_;
+    return "";
 }
 
 # -------------------- filters out files based on extensions (returns an array)
@@ -529,11 +789,11 @@ sub match_ext {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
 	my @unpackline = split (/\&/,$line);
-	next if ($unpackline[0] eq ".");
-	next if ($unpackline[0] eq "..");
+	next if ($unpackline[0] eq '.');
+	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
-	my $fnptr = $unpackline[3]&$dirptr;
+	my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/);
  	if ($fnptr == 0 and $unpackline[3] ne "") {
 	    my $embstyle = &Apache::loncommon::fileembstyle($fext);
             push @trimlist,$line if (defined($embstyle) && 
@@ -542,276 +802,511 @@ sub match_ext {
 	    push @trimlist,$line;
 	}
     }
-    @trimlist = sort (@trimlist);
+    @trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
     return @trimlist;
 }
 
 # ------------------------------- displays one line in appropriate table format
 sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
-    my (@pathfn, $fndir, $fnptr);
+    my (@pathfn, $fndir);
+# there could be relative paths (files actually belonging into this directory)
+# or absolute paths (for example, from sequences)
+    my $absolute;
+    my $pathprefix;
+    if ($line=~m|^/res/| && $startdir ne '') {
+	$absolute=1;
+	$pathprefix='';
+    } else {
+	$absolute=0;
+	$pathprefix=$startdir;
+    }
     my $dirptr=16384;
-    my $fileclr="#ffffe6";
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+#SB my $fileclr="#ffffe6";
+    my $iconpath= $r->dir_config('lonIconsURL') . '/';
 
     my @filecom = split (/\&/,$line);
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
-    my $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen eq "opened";
+    my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
+    $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
 
-    my $tabtag="";
+    my $tabtag='';
     my $i=0;
-
-    while ($i<=5) {
-	$tabtag=join('',$tabtag," ")
-	    if $hash{'display_attrs_'.$i} == 1;
+    while ($i<=11) {
+	$tabtag=join('',$tabtag," ")
+	    if ($i != 9 &&
+		$hash{'display_attrs_'.$i} == 1);
 	$i++;
     }
+    my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
 
 # display uplink arrow
-    if ($filecom[1] eq "viewOneUp") {
-	$r->print("$extrafield");
-	$r->print("\n");
-	$r->print ('
print("$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
+        $r->print($extrafield);
+	$r->print("\n");
+	$r->print (''."\n");
+	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
 	$r->print (''."\n");
-	$r->print (''."\n");
+		   $startdir.'" />'."\n");
+	$r->print (''."\n");
 	$r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
-	$r->print("Up $tabtag
\n");
+	$r->print(&mt("Up")."$tabtag");
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
+# Do we have permission to look at this?
+
+    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+
+# make absolute links appear on different background
+#SB    if ($absolute) { $fileclr='#ccdd99'; }
 
 # display domain
-    if ($filecom[1] eq "domain") {
-	$r->print (''."\n")
-	    if ($ENV{'form.dirPointer'} eq "on");
-	$r->print("$extrafield");
-	$r->print("");
-	&begin_form ($r,$filecom[0].'/');
-	my $anchor = $filecom[0].'/';
-	$anchor =~ s/\///g;
-	$r->print ('');
-	$r->print ('');
+    if ($filecom[1] eq 'domain') {
+ 	$r->print (''."\n")
+ 	    if ($env{'form.dirPointer'} eq "on");
+#SB	$r->print("$extrafield");
+	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+        $r->print($extrafield);
+	$r->print("");
+	&begin_form ($r,$filecom[0]);
+	my $anchor = $filecom[0];
+	$anchor =~ s/\W//g;
+	$r->print ('');
+	$r->print ('');
 	$r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
-	$r->print ('print (' border="0" />'."\n");
-	$r->print("Domain - $listname $tabtag\n");
+	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
+	$r->print ('print (' class="LC_icon" />'."\n");
+	$r->print (&mt("Domain")." - $listname ");
+	if (&Apache::lonnet::domain($listname,'description')) {
+	    $r->print("(".&Apache::lonnet::domain($listname,'description').
+		      ")");
+	}
+	$r->print("$tabtag");
+         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
 
 # display user directory
     }
-    if ($filecom[1] eq "user") {
-	$r->print("$extrafield");
-	$r->print("\n");
+    if ($filecom[1] eq 'user') {
+	# $r->print("$extrafield");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
+	$anchor =~ s/\W//g;
+#SB	$r->print("$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .$extrafield.'');
 	&begin_form ($r,$curdir);
-	$r->print (''."\n");
-	$r->print ('');
+	$r->print (''."\n");
+	$r->print ('');
 	$r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
-	$r->print ('');
-	$r->print ($listname.$tabtag.''."\n");
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
+	$r->print (''.$msg.'');
+	my $domain=(split(m|/|,$startdir))[2];
+	my $plainname=&Apache::loncommon::plainname($listname,$domain);
+	$r->print ($listname);
+	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+	$r->print(''.$tabtag);
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne "") {
+    if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+        my $title;
+	my $filelink = $pathprefix.$filecom[0];
+	if ($hash{'display_attrs_0'} == 1) {
+	    $title = &Apache::lonnet::gettitle($filelink);
+	}
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
+        if (@Omit) {
+            foreach (@Omit) { return OK if (lc($curfext) eq $_); }
+        }
+        if (@Only) {
+            my $skip = 1;
+            foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
+            return OK if ($skip > 0);
+        }
 	# Set the icon for the file
-	my $iconname = "unknown.gif";
-	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
-	# The unless conditional that follows is a bit of overkill
-	$iconname = $curfext.".gif" unless
-	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
-	#
-	my $filelink = $startdir.$filecom[0];
-	$r->print("");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
-	my $title;
-        if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    $title=$listname;
-	    $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
-	    $title=$listname unless $title;
-	    my $titleesc=$title;
-	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote
+	my $iconname = &Apache::loncommon::icon($listname);
+#SB	$r->print(");
+	$r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+        $r->print('');
+	
+        if ($env{'form.catalogmode'} eq 'interactive') {
+	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("");
-	    $r->print("".
+                      $quotable_filelink,"')\">");
+	    $r->print("\"\"".
 		      "\n");
-	    $r->print("");
-	}
-        elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $title=$listname;
-	    $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
-	    $title=$listname unless $title;
-	    $r->print("
\n");
+	    $r->print('');
+	} elsif ($env{'form.catalogmode'} eq 'import') {
+	    $r->print("\n");
 	    $r->print("print("checked");
 	    }
-	    $r->print(">\n");
-	    $r->print("\n");
-	    $r->print("\n");
-	    $r->print("");
+	    $r->print(" />\n");
+	    $r->print('
');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
+	    if (!$hash{"pre_${fnum}_title"}) {
+	        $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+	    }
   	    $fnum++;
 	}
-
+# Form to open or close sequences
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    &begin_form($r,$curdir);
+	    $indent--;
+	}
+# General indentation
 	if ($indent > 0 and $indent < 11) {
-	    $r->print("\n");
+	    $r->print("\"\"\n");
 	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
 	    my $rem = $indent%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print("\n");
+		$r->print("\"\"\n");
 	    $count++;
 	    }
-	    $r->print("\n") if $rem > 0;
+	    $r->print("\"\"\n") if $rem > 0;
 	}
-
-	$r->print("\n");
-	$r->print (" $listname ");
-
-	$r->print (" (metadata) ") if ($metafile == 1);
-
-	$r->print("\n");
-	$r->print(" ",
+# Sequence open/close icon
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    my $anchor = $curdir;
+	    $anchor =~ s/\W//g;
+	    $r->print ('');
+	    $r->print ('print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
+		       "\n");
+	}
+# Filetype icons
+	$r->print("\"\"\n");
+	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
+
+	$r->print (" $listname ");
+	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
+	$r->print (" (".&mt('metadata').") ");
+# Close form to open/close sequence
+	if ($filelink=~/\.(page|sequence)$/) {
+	    $r->print('');
+	}
+	$r->print("\n");
+	if ($hash{'display_attrs_0'} == 1) {
+	    $r->print(' '.($title eq '' ? ' ' : $title).
+		      ' '."\n");
+	}
+	$r->print(' ',
 		  $filecom[8]," \n") 
-	    if $hash{'display_attrs_0'} == 1;
-	$r->print(" ".
-		  (localtime($filecom[9]))." \n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print(" ".
-		  (localtime($filecom[10]))." \n") 
+	$r->print(' '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
 	    if $hash{'display_attrs_2'} == 1;
+	$r->print(' '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
+	    if $hash{'display_attrs_3'} == 1;
 
-	if ($hash{'display_attrs_3'} == 1) {
-	    my $author = &Apache::lonnet::metadata($filelink,'author')
-		if ($metafile == 1);
-	    $author = ' ' if (!$author);
-	    $r->print(" ".$author.
-		      " \n");
-	}
 	if ($hash{'display_attrs_4'} == 1) {
-	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
-		if ($metafile == 1);
-	    $keywords = ' ' if (!$keywords);
-	    $r->print(" ".$keywords.
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print(' '.($author eq '' ? ' ' : $author).
 		      " \n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
-	    my $lang = &Apache::lonnet::metadata($filelink,'language')
-		if ($metafile == 1);
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+	    # $keywords = ' ' if (!$keywords);
+	    $r->print(' '.($keywords eq '' ? ' ' : $keywords).
+		      " \n");
+	}
+#'
+
+	if ($hash{'display_attrs_6'} == 1) {
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $lang = ' ' if (!$lang);
-	    $r->print(" ".$lang.
+	    $r->print(' '.($lang eq '' ? ' ' : $lang).
 		      " \n");
 	}
-	$r->print("\n");
+	if ($hash{'display_attrs_8'} == 1) {
+# statistics
+	    &dynmetaread($filelink);
+	    $r->print("");
+	    &dynmetaprint($r,$filelink,'count');
+	    &dynmetaprint($r,$filelink,'course');
+	    &dynmetaprint($r,$filelink,'stdno');
+	    &dynmetaprint($r,$filelink,'avetries');
+	    &dynmetaprint($r,$filelink,'difficulty');
+	    &dynmetaprint($r,$filelink,'disc');
+	    &dynmetaprint($r,$filelink,'clear');
+	    &dynmetaprint($r,$filelink,'technical');
+	    &dynmetaprint($r,$filelink,'correct');
+	    &dynmetaprint($r,$filelink,'helpful');
+	    &dynmetaprint($r,$filelink,'depth');
+	    $r->print(" \n");
+
+	}
+	if ($hash{'display_attrs_10'} == 1) {
+	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
+	    if($source eq 'open') {
+		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
+		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+		&Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
+		$r->print(''."".&mt('Source Code')." "."\n");
+	    } else { #A cuddled else. :P
+		$r->print(" \n");
+	    }
+	}
+	if ($hash{'display_attrs_11'} == 1) {
+# links
+	   &dynmetaread($filelink);
+	   $r->print('');
+	   &coursecontext($r,$filelink);
+	   &dynmetaprint($r,$filelink,'goto_list');
+	   &dynmetaprint($r,$filelink,'comefrom_list');
+	   &dynmetaprint($r,$filelink,'sequsage_list');
+	   &dynmetaprint($r,$filelink,'dependencies');
+           &dynmetaprint($r,$filelink,'course_list');
+	   $r->print('');
+        }
+        if ($hash{'display_attrs_7'} == 1) {
+# Show resource
+	   my $output=&showpreview($filelink);
+           $r->print(' '.($output eq '' ? ' ':$output).
+		      " \n");
+        }
+        $r->print(&Apache::loncommon::end_data_table_row());
     }
 
 # -- display directory
     if ($fnptr == $dirptr) {
-	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
-	$r->print("$extrafield");
+	$anchor =~ s/\W//g;
+#SB	$r->print("$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
+#	$r->print('');
+        $r->print($extrafield.'');
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
-	    $r->print("\n");
+	    $r->print("\"\"\n");
 	} else {
 	    my $ten = int($indentm1/10.);
 	    my $rem = $indentm1%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print ("\n");
+		$r->print ("\"\"\n");
 		$count++;
 	    }
-	    $r->print ("\n") if $rem > 0;
+	    $r->print ("\"\"\n") if $rem > 0;
 	}
-	$r->print ('');
-	$r->print ('');
+	$r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
-	$r->print (''.
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
+	$r->print (''
+		   .''.&mt('Open Folder').''.
 		   "\n");
-	$r->print ("$listname$tabtag\n");
+	$r->print ("$listname\n");
+# Attributes
+	my $filelink = $startdir.$filecom[0].'/default';
+
+	if ($hash{'display_attrs_0'} == 1) {
+	    my $title = &Apache::lonnet::gettitle($filelink);
+	    $r->print(' '.($title eq '' ? ' ' : $title).
+		      ' '."\n");
+	}
+	$r->print(' ',
+		  $filecom[8]," \n") 
+	    if $hash{'display_attrs_1'} == 1;
+	$r->print(' '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." \n")
+	    if $hash{'display_attrs_2'} == 1;
+	$r->print(' '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." \n")
+	    if $hash{'display_attrs_3'} == 1;
+
+	if ($hash{'display_attrs_4'} == 1) {
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print(' '.($author eq '' ? ' ' : $author).
+		      " \n");
+	}
+	if ($hash{'display_attrs_5'} == 1) {
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+	    # $keywords = ' ' if (!$keywords);
+	    $r->print(' '.($keywords eq '' ? ' ' : $keywords).
+		      " \n");
+	}
+	if ($hash{'display_attrs_6'} == 1) {
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
+	    $lang = &Apache::loncommon::languagedescription($lang);
+	    $r->print(' '.($lang eq '' ? ' ' : $lang).
+		      " \n");
+	}
+	if ($hash{'display_attrs_8'} == 1) {
+	   $r->print(' ');
+	}
+ 	if ($hash{'display_attrs_10'} == 1) {
+	   $r->print(' ');
+	}
+	if ($hash{'display_attrs_11'} == 1) {
+	   $r->print(' ');
+	}
+	if ($hash{'display_attrs_7'} == 1) {
+	   $r->print(' ');
+        }
+        $r->print(&Apache::loncommon::end_data_table_row());
+    }
+
+}
+
+sub coursecontext {
+    my ($r,$filelink)=@_;
+    my $filesymb=&Apache::lonnet::symbread($filelink);
+    if ($filesymb) {
+	my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
+	$r->print(&mt('Already in this course:
[_1] in folder/map [_2].
',
+	      &Apache::lonnet::gettitle($resource),
+	      &Apache::lonnet::gettitle($map)));
     }
+}
+
+sub showpreview {
+    my ($filelink)=@_;
+    if ($filelink=~m-^(/ext/|http://)-) {
+	return &mt('External Resource, preview not enabled');
+    }
+    my ($curfext)=($filelink=~/\.(\w+)$/);
+    my $output='';
+    my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+    if ($embstyle eq 'ssi') {
+       my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
+                    '.tmp';
+       if ((!$env{'form.updatedisplay'}) &&
+                    (-e $cache)) {
+          open(FH,$cache);
+          $output=join("\n",);
+          close(FH);
+       } else {
+# In update display mode, remove old cache. This is done to retroactively
+# clean up course context renderings.
+	  if (-e $cache) {
+	       unlink($cache);
+	  }
+          $output=&Apache::lonnet::ssi_body($filelink);
+# Is access denied? Don't render, don't store
+          if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
+             $output='';
+# Was this rendered in course content? Don't store
+          } elsif (!&Apache::lonnet::symbread($filelink)) {
+             open(FH,">$cache");
+             print FH $output;
+             close(FH);
+          }
+       }
+       $output=''.$output.'';
+    } elsif ($embstyle eq 'img') {
+       $output=''.&mt('Preview').'';
+    } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
+       $output=''.&mt('Preview').'';
+    }
+    return $output;
+}
 
+sub dynmetaprint {
+    my ($r,$filelink,$item)=@_;
+    if ($dynhash{$filelink}->{$item}) {
+	$r->print("\n
".$fieldnames{$item}.': '.
+		  &Apache::lonmeta::prettyprint($item,
+						$dynhash{$filelink}->{$item},
+		  (($env{'form.catalogmode'} ne 'import')?'preview':''),
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
+    }
 }
 
 # ------------------- prints the beginning of a form for directory or file link
 sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
-    $anchor =~ s/\///g;
+    $anchor =~ s/\W//g;
+    $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('
'."\n");
-    $r->print (''.
+    $r->print (''.
 	       "\n");
-    $r->print (''."\n");
+    $r->print (''."\n");
+    $r->print(&Apache::loncommon::inhibit_menu_check('input'));
     $dnum++;
 }
 
 # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {
-    delete $hash{'mode_catalog'};
-    delete $hash{'form_mode'};
-    delete $hash{'form_form'};
-    delete $hash{'form_element'};
-    foreach (keys %hash) {
-	if ($_ =~ /^pre_/) {
-	    delete $hash{$_};
-	}
-	if ($_ =~ /^store/) {
-	    delete $hash{$_};
-	}
+    my ($hash) = @_;
+    delete $hash->{'form.catalogmode'};
+    delete $hash->{'form.mode'};
+    delete $hash->{'form.form'};
+    delete $hash->{'form.element'};
+    delete $hash->{'form.omit'};
+    delete $hash->{'form.only'};
+    foreach (keys %{$hash}) {
+        delete $hash->{$_} if (/^(pre_|store)/);
     }
 }
 
@@ -830,6 +1325,17 @@ sub setvalues {
 
 1;
 
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup indexer: hash');
+    }
+    return OK;
+}
+
+
+
+
+
 =head1 NAME
 
 Apache::lonindexer - mod_perl module for cross server filesystem browsing