--- loncom/interface/lonindexer.pm	2004/01/27 16:35:37	1.88
+++ loncom/interface/lonindexer.pm	2004/02/17 02:43:40	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.88 2004/01/27 16:35:37 www Exp $
+# $Id: lonindexer.pm,v 1.92 2004/02/17 02:43:40 taceyjo1 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -164,7 +164,7 @@ END
 	#       selection is made.
 	# $element is the name of the element in $formname which receives
 	#       the URL.
-	# &Apache::lonxml::debug('Checking mode, 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');
@@ -187,8 +187,7 @@ END
 	    $element      = $ENV{'form.element'};
 	    $titleelement = $ENV{'form.titleelement'};
 	}
-	&Apache::lonxml::debug("mode=$mode form=$form element=$element
-                                titleelement=$titleelement");
+	#&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
@@ -562,14 +561,15 @@ sub scanDir {
     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) {
         return if ($c->aborted());
-	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
-	next if $strip =~ /.*\.meta$/;
+	#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_9'} != 1) {
 	    if (scalar(@fileparts) >= 3) {
@@ -694,7 +694,6 @@ sub display_line {
 
     my $tabtag='</td>';
     my $i=0;
-
     while ($i<=8) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if $hash{'display_attrs_'.$i} == 1;
@@ -722,9 +721,8 @@ sub display_line {
 	$r->print(&mt("Up")." $tabtag</tr></form>\n");
 	return OK;
     }
-# Do we have permission to look at this?
-
-    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
+# Do we have permission to look at this? 
+	if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0])); }
 
 # display domain
     if ($filecom[1] eq 'domain') {
@@ -782,7 +780,6 @@ sub display_line {
 # display file
     if ($fnptr == 0 and $filecom[3] ne '') {
 	my $filelink = $startdir.$filecom[0];
-	next if &Apache::lonnet::metadata($filelink,'obsolete');
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -813,8 +810,8 @@ sub display_line {
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $title=$listname;
-	    $title = &Apache::lonnet::metadata($filelink,'title')
-		if ($metafile == 1);
+	    #$title = &Apache::lonnet::metadata($filelink,'title')
+		#if ($metafile == 1);
 	    $title=$listname unless $title;
 	    my $titleesc=&HTML::Entities::encode($title);
 	    $r->print("<form name='form$fnum'>\n");
@@ -900,8 +897,20 @@ sub display_line {
             my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);
 	    if ($embstyle eq 'ssi') {
-	       $output=&Apache::lonnet::ssi_body($filelink);
-               $output='<font size="-2">'.$output.'</font>';
+		my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
+		    '.tmp';
+		if ((!$ENV{'form.updatedisplay'}) &&
+		    (-e $cache)) {
+		    open(FH,$cache);
+		    $output=join("\n",<FH>);
+		    close(FH);
+		} else {
+		    $output=&Apache::lonnet::ssi_body($filelink);
+		    open(FH,">$cache");
+		    print FH $output;
+		    close(FH);
+		}
+		$output='<font size="-2">'.$output.'</font>';
 	   } elsif ($embstyle eq 'img') {
                $output='<img src="'.$filelink.'" />';
            } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {