--- loncom/interface/lonindexer.pm	2004/02/05 03:47:04	1.91
+++ loncom/interface/lonindexer.pm	2004/05/11 05:19:30	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.91 2004/02/05 03:47:04 taceyjo1 Exp $
+# $Id: lonindexer.pm,v 1.104 2004/05/11 05:19:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,6 +47,7 @@ use strict;
 use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::lonsequence();
 use Apache::Constants qw(:common);
 use Apache::lonmeta;
 use Apache::File;
@@ -442,16 +443,31 @@ $r->print(&Apache::loncommon::bodytag('B
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
 END
+# -------------- 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($uri,'','',
+        $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','',
 				(($ENV{'form.catalogmode'} eq 'groupimport')?
 				 'document.forms.fileattr':'')).
 		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
-'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();').
-		  '</form>');
+'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("<font size='+2'><a href='");
+	    if ($ENV{'form.catalogmode'} eq 'groupimport') {
+		$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
+	    } else {
+		$r->print($reshome);
+	    }
+	    $r->print("'>".&mt('Home').'</a></font>');
+	}
+	$r->print('</form>');
 # ------------------------------------------------------ Remember where we were
-	&Apache::loncommon::storeresurl($uri);
-	&Apache::lonhtmlcommon::store_recent('residx',$uri,$uri);
+	&Apache::loncommon::storeresurl($storeuri);
+	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
 #        $r->print(&initdebug());
@@ -568,10 +584,11 @@ sub scanDir {
     foreach my $line (@list) {
         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)=split(/\&/,$line,15); 
+	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 not all versions to be shown
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
@@ -590,7 +607,7 @@ sub scanDir {
 	    $curdir = $startdir;
 	}
 	my $diropen = 'closed';
-	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
+	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";
@@ -608,7 +625,7 @@ sub scanDir {
 # --------------- get complete matched list based on the uri (returns an array)
 sub get_list {
     my ($r,$uri)=@_;
-    my @list;
+    my @list=();
     (my $luri = $uri) =~ s/\//_/g;
     if ($ENV{'form.updatedisplay'}) {
 	foreach (keys %hash) {
@@ -618,7 +635,18 @@ sub get_list {
 
     if ($hash{'dirlist_files_'.$luri}) {
 	@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,$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);
     }
@@ -664,7 +692,7 @@ sub match_ext {
 	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) && 
@@ -681,6 +709,17 @@ sub match_ext {
 sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
     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=~/^\/res\//) {
+	$absolute=1;
+	$pathprefix='';
+    } else {
+	$absolute=0;
+	$pathprefix=$startdir;
+    }
     my $dirptr=16384;
     my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . '/';
@@ -704,9 +743,14 @@ sub display_line {
 
 # display uplink arrow
     if ($filecom[1] eq 'viewOneUp') {
+	my $updir=$startdir;
+# -------------- Filter out sequence containment in crumbs and "recent folders"
+	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
+	$updir=~s/\/+/\//g;
+
 	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
 	$r->print("<td>\n");
-	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
+	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
 		   'document.forms.fileattr.acts.value)" '.
@@ -723,7 +767,10 @@ sub display_line {
     }
 # Do we have permission to look at this?
 
-    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
+    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+
+# make absolute links appear on different background
+    if ($absolute) { $fileclr='#aaaa88'; }
 
 # display domain
     if ($filecom[1] eq 'domain') {
@@ -779,8 +826,8 @@ sub display_line {
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne '') {
-	my $filelink = $startdir.$filecom[0];
+    if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+	my $filelink = $pathprefix.$filecom[0];
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -794,27 +841,33 @@ sub display_line {
 	# Set the icon for the file
 	my $iconname = &Apache::loncommon::icon($listname);
 	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");
-	my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
+	
+	my $metafile = $Apache::lonnet::perlvar{'lonDocRoot'}.$pathprefix.
+	    $filecom[0].'.meta';
+	if (-e $metafile) {
+	    $metafile=1;
+	} else {
+	    $metafile=0;
+	}
 	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=HTML::Entities::encode($title);
+	    my $titleesc=HTML::Entities::encode($title,'<>&"');
 	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
             $r->print("<a href=\"javascript:select_data(\'",
                       $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
 	    $r->print("</td><td nowrap>");
-	}
-        elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	} 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);
+	    my $titleesc=&HTML::Entities::encode($title,'<>&"');
 	    $r->print("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -831,7 +884,15 @@ sub display_line {
 	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
 	}
-
+# Form to open or close sequences
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    my $anchor = $curdir;
+	    $anchor =~ s/\///g;
+	    &begin_form($r,$curdir);
+	    $indent--;
+	}
+# General indentation
 	if ($indent > 0 and $indent < 11) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indent,
 		      ".gif border='0' />\n");
@@ -847,20 +908,33 @@ sub display_line {
 	    $r->print("<img src=",$iconpath,"whitespace",$rem,
 		      ".gif border='0' />\n") if $rem > 0;
 	}
-
+# Sequence open/close icon
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    my $anchor = $curdir;
+	    $anchor =~ s/\///g;
+	    $r->print ('<input type="hidden" name="acts" value="">');
+	    $r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.
+		       'folder_pointer_'.$diropen.'.gif"');
+	    $r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
+		       "\n");
+	}
+# Filetype icons
 	$r->print("<img src='$iconname' border='0' />\n");
+# Close form to open/close sequence
+	if ($filelink=~/\.(page|sequence)$/) {
+	    $r->print('</form>');
+	}
 	$r->print (" <a href=\"javascript:openWindow('".$filelink.
 		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
 		   " TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
 		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
-		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
-
+		   "TARGET=_self>metadata</a>) ");
 	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title')
-		if ($metafile == 1);
+	    my $title = &Apache::lonnet::gettitle($filelink,'title');
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
@@ -875,21 +949,18 @@ sub display_line {
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
-	    my $author = &Apache::lonnet::metadata($filelink,'author')
-		if ($metafile == 1);
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
 	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
-	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
-		if ($metafile == 1);
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
 	    # $keywords = '&nbsp;' if (!$keywords);
 	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_6'} == 1) {
-	    my $lang = &Apache::lonnet::metadata($filelink,'language')
-		if ($metafile == 1);
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
 	    $lang = &Apache::loncommon::languagedescription($lang);
 	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
@@ -923,7 +994,7 @@ sub display_line {
 		      " </td>\n");
         }
 	if ($hash{'display_attrs_8'} == 1) {
-	    my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1);
+	    my (%stat) = &Apache::lonmeta::dynamicmeta($filelink);
 	    my $stat = (exists($stat{'course'}) ? $stat{'course'} : '').
 		((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : '').
 		(exists($stat{'count'}) ? $stat{'count'} : '');