loncom/interface/lonindexer.pm - diff

Return to lonindexer.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonindexer.pm between versions 1.75 and 1.104

version 1.75, 2003/08/21 21:57:36	version 1.104, 2004/05/11 05:19:30
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# 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
# 6/26,7/8 H. K. Ng
# 8/14 H. K. Ng
# 11/30 Matthew Hall
# YEAR=2002
# 6/29/2002 H. K. Ng
#
###	###

###############################################################################	###############################################################################
Line 61 package Apache::lonindexer;	Line 46 package Apache::lonindexer;
use strict;	use strict;
use Apache::lonnet();	use Apache::lonnet();
use Apache::loncommon();	use Apache::loncommon();
	use Apache::lonhtmlcommon();
	use Apache::lonsequence();
use Apache::Constants qw(:common);	use Apache::Constants qw(:common);
use Apache::lonmeta;	use Apache::lonmeta;
use Apache::File;	use Apache::File;
	use Apache::lonlocal;
use GDBM_File;	use GDBM_File;

# ---------------------------------------- variables used throughout the module	# ---------------------------------------- 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 %dirs; # keys are directories, values are the open/close status
my %language; # has the reference information present in language.tab	my %language; # has the reference information present in language.tab

Line 86 my @Omit = ();	Line 74 my @Omit = ();
sub handler {	sub handler {
my $r = shift;	my $r = shift;
my $c = $r->connection();	my $c = $r->connection();
$r->content_type('text/html');	&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);	&Apache::loncommon::no_cache($r);
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;
Line 117 sub handler {	Line 105 sub handler {
# Get the parameters from the query string	# Get the parameters from the query string
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element',	['catalogmode','launch','acts','mode','form','element',
'only','omit']);	'only','omit','titleelement']);
#-------------------------------------------------------------------	#-------------------------------------------------------------------
my $closebutton='';	my $closebutton='';
my $groupimportbutton='';	my $groupimportbutton='';
Line 129 sub handler {	Line 117 sub handler {
%hash = ();	%hash = ();
{	{
my %dbfile;	my %dbfile;
if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) {
while(my($key,$value)=each(%dbfile)) {	while(my($key,$value)=each(%dbfile)) {
$hash{$key}=$value;	$hash{$key}=$value;
}	}
Line 149 sub handler {	Line 137 sub handler {
'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.	'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
' border="0" /></td>';	' border="0" /></td>';
$colspan=" colspan='2' ";	$colspan=" colspan='2' ";
	my $cl=&mt('Close');
$closebutton=<<END;	$closebutton=<<END;
<input type="button" name="close" value='CLOSE' onClick="self.close()">	<input type="button" name="close" value='$cl' onClick="self.close()">
END	END
}	}
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
Line 158 END	Line 147 END
'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.	'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
' border="0" /></td>';	' border="0" /></td>';
$colspan=" colspan='2' ";	$colspan=" colspan='2' ";
	my $cl=&mt('Close');
	my $gi=&mt('Group Import');
$closebutton=<<END;	$closebutton=<<END;
<input type="button" name="close" value='CLOSE' onClick="self.close()">	<input type="button" name="close" value='$cl' onClick="self.close()">
END	END
$groupimportbutton=<<END;	$groupimportbutton=<<END;
<input type="button" name="groupimport" value='GROUP IMPORT'	<input type="button" name="groupimport" value='$gi'
onClick="javascript:select_group()">	onClick="javascript:select_group()">
END	END
}	}
Line 174 END	Line 165 END
# selection is made.	# selection is made.
# $element is the name of the element in $formname which receives	# $element is the name of the element in $formname which receives
# the URL.	# 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.mode' ,\%ENV,'form.mode' );
&setvalues(\%hash,'form.form' ,\%ENV,'form.form' );	&setvalues(\%hash,'form.form' ,\%ENV,'form.form' );
&setvalues(\%hash,'form.element',\%ENV,'form.element');	&setvalues(\%hash,'form.element' ,\%ENV,'form.element');
&setvalues(\%hash,'form.only' ,\%ENV,'form.only' );	&setvalues(\%hash,'form.titleelement',\%ENV,'form.titleelement');
&setvalues(\%hash,'form.omit' ,\%ENV,'form.omit' );	&setvalues(\%hash,'form.only' ,\%ENV,'form.only' );
	&setvalues(\%hash,'form.omit' ,\%ENV,'form.omit' );

# Deal with 'omit' and 'only'	# Deal with 'omit' and 'only'
if (exists $ENV{'form.omit'}) {	if (exists $ENV{'form.omit'}) {
Line 190 END	Line 182 END
}	}

my $mode = $ENV{'form.mode'};	my $mode = $ENV{'form.mode'};
my ($form,$element);	my ($form,$element,$titleelement);
if ($mode eq 'edit' \|\| $mode eq 'parmset') {	if ($mode eq 'edit' \|\| $mode eq 'parmset') {
$form = $ENV{'form.form'};	$form = $ENV{'form.form'};
$element = $ENV{'form.element'};	$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	# ------ set catalogmodefunctions to have extra needed javascript functionality
my $catalogmodefunctions='';	my $catalogmodefunctions='';
if ($ENV{'form.catalogmode'} eq 'interactive' or	if ($ENV{'form.catalogmode'} eq 'interactive' or
Line 244 END	Line 237 END
// mode = $mode	// mode = $mode
function select_data(title,url) {	function select_data(title,url) {
changeURL(url);	changeURL(url);
	changeTitle(title);
self.close();	self.close();
}	}

Line 258 function changeURL(val) {	Line 252 function changeURL(val) {
alert("The file you selected is: "+val);	alert("The file you selected is: "+val);
}	}
}	}

END	END
	if (!$titleelement) {
	$catalogmodefunctions.='function changeTitle(val) {}';
	} else {
	$catalogmodefunctions.=<<END;
	function changeTitle(val) {
	if (window.opener.document) {
	window.opener.document.forms["$form"].elements["$titleelement"].value=val;
	} else {
	alert("The title of the file you selected is: "+val);
	}
	}
	END
	}
} elsif ($mode eq 'parmset') {	} elsif ($mode eq 'parmset') {
my $location = "/adm/groupsort?catalogmode=interactive&";	my $location = "/adm/groupsort?catalogmode=interactive&";
$location .= "form=$form&element=$element&mode=parmset&acts=";	$location .= "form=$form&element=$element&mode=parmset&acts=";
Line 354 $r->print(&Apache::loncommon::bodytag('B	Line 360 $r->print(&Apache::loncommon::bodytag('B
$achash{$ref}=$ac;	$achash{$ref}=$ac;
$ac++;	$ac++;
}	}
# sorting through the actions and changing the tied database hash	# sorting through the actions and changing the global database hash
foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {	foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
my $key=$_;	my $key=$_;
if ($ahash{$key} eq '1') {	if ($ahash{$key} eq '1') {
Line 383 $r->print(&Apache::loncommon::bodytag('B	Line 389 $r->print(&Apache::loncommon::bodytag('B
}	}

# ---------------------------------- get state of file attributes to be showing	# ---------------------------------- get state of file attributes to be showing
if ($ENV{'form.attrs'} ne '') {	if ($ENV{'form.attrs'}) {
for (my $i=0; $i<=9; $i++) {	for (my $i=0; $i<=9; $i++) {
delete $hash{'display_attrs_'.$i};	delete $hash{'display_attrs_'.$i};
if ($ENV{'form.attr'.$i} == 1) {	if ($ENV{'form.attr'.$i} == 1) {
Line 396 $r->print(&Apache::loncommon::bodytag('B	Line 402 $r->print(&Apache::loncommon::bodytag('B
$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;	$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}	}
}	}

# ------------------------------- output state of file attributes to be showing	# ------------------------------- output state of file attributes to be showing
# All versions has to the last item	# All versions has to the last item
# since it does not take an extra col	# 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',
	'sr' => 'Show resource',
	'av' => 'All versions',
	'ud' => 'Update Display'
	);
	my $Displayfileattributes=&mt('Display file attributes');
$r->print(<<END);	$r->print(<<END);
<form method="post" name="fileattr" action="$uri"	<form method="post" name="fileattr" action="$uri"
enctype="application/x-www-form-urlencoded">	enctype="application/x-www-form-urlencoded">
<b><font color="#666666">Display file attributes</font></b><br />	<b><font color="#666666">$Displayfileattributes</font></b><br />
<table border=0><tr>	<table border=0><tr>
<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Title</td>	<td><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</td>
<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>	<td><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</td>
<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>	<td><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</td>
<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>	<td><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</td>
<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Statistics</td></tr><tr>	<td><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</td>
<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>	</tr><tr>
<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>	<td><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</td>
<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>	<td><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</td>
<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> Show Resource</td>	<td><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</td>
<td><input type="checkbox" name="attr9" value="1" $attrchk[9] /> All versions</td>	<td><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</td>
	<td><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</td>
<td> </td>	<td> </td>
</tr></table>	</tr></table>
<input type="hidden" name="dirPointer" value="on" />	<input type="hidden" name="attrs" value="1" />
	<input type="submit" name="updatedisplay" value="$lt{'ud'}" />
<input type="hidden" name="acts" value="" />	<input type="hidden" name="acts" value="" />
<input type="submit" name="attrs" value="Update Display" />	$closebutton $groupimportbutton
$closebutton
$groupimportbutton
</form>
END	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($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();'));
	# -------------------------------------------------------- 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($storeuri);
	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
# ----------------- output starting row to the indexed file/directory hierarchy	# ----------------- output starting row to the indexed file/directory hierarchy
my $titleclr="#ddffff";	my $titleclr="#ddffff";
# $r->print(&initdebug());	# $r->print(&initdebug());
Line 431 END	Line 475 END
# $r->print(&writedebug("Only:@Only")) if (@Only);	# $r->print(&writedebug("Only:@Only")) if (@Only);
$r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");	$r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");
$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");	$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");
$r->print("<td $colspan><b>Name</b></td>\n");	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
$r->print("<td><b>Title</b></td>\n")	$r->print("<td><b>".&mt('Title')."</b></td>\n")
if ($hash{'display_attrs_0'} == 1);	if ($hash{'display_attrs_0'} == 1);
$r->print("<td align=right><b>Size (bytes) ".	$r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".
"</b></td>\n") if ($hash{'display_attrs_1'} == 1);	"</b></td>\n") if ($hash{'display_attrs_1'} == 1);
$r->print("<td><b>Last accessed</b></td>\n")	$r->print("<td><b>".&mt("Last accessed")."</b></td>\n")
if ($hash{'display_attrs_2'} == 1);	if ($hash{'display_attrs_2'} == 1);
$r->print("<td><b>Last modified</b></td>\n")	$r->print("<td><b>".&mt("Last modified")."</b></td>\n")
if ($hash{'display_attrs_3'} == 1);	if ($hash{'display_attrs_3'} == 1);
$r->print("<td><b>Author(s)</b></td>\n")	$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")
if ($hash{'display_attrs_4'} == 1);	if ($hash{'display_attrs_4'} == 1);
$r->print("<td><b>Keywords</b></td>\n")	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
if ($hash{'display_attrs_5'} == 1);	if ($hash{'display_attrs_5'} == 1);
$r->print("<td><b>Language</b></td>\n")	$r->print("<td><b>".&mt("Language")."</b></td>\n")
if ($hash{'display_attrs_6'} == 1);	if ($hash{'display_attrs_6'} == 1);
$r->print("<td><b>Resource</b></td>\n")	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
if ($hash{'display_attrs_7'} == 1);	if ($hash{'display_attrs_7'} == 1);
$r->print("<td><b>Usage Statistics <br />(Courses/Network Hits)</b></td>\n")	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
	&mt("Courses/Network Hits").")</b></td>\n")
if ($hash{'display_attrs_8'} == 1);	if ($hash{'display_attrs_8'} == 1);
$r->print('</tr>');	$r->print('</tr>');

Line 477 END	Line 522 END
}	}
}	}

my $bredir = $ENV{'form.dirPointer'};
my $toplevel;	my $toplevel;
my $indent = 0;	my $indent = 0;
$uri = $uri.'/' if $uri !~ /.*\/$/;	$uri = $uri.'/' if $uri !~ /.*\/$/;

if ($bredir ne 'on') {	if ($ENV{'form.dirPointer'} ne 'on') {
$hash{'top.level'} = $uri;	$hash{'top.level'} = $uri;
$toplevel = $uri;	$toplevel = $uri;
	} else {
} else {	$toplevel = $hash{'top.level'};
$toplevel = $hash{'top.level'};	}
}

# -------------------------------- if not at top level, provide an uplink arrow	# -------------------------------- if not at top level, provide an uplink arrow
if ($toplevel ne '/res/'){	if ($toplevel ne '/res/'){
Line 513 END	Line 556 END

# --------------------------------------------------- end the output and return	# --------------------------------------------------- end the output and return
$r->print('</body></html>'."\n");	$r->print('</body></html>'."\n");
# } else {
# $r->print('<html><head></head><body>Unable to tie hash to db '.
# 'file</body></html>');
# return OK;
}	}
if(! $c->aborted()) {	if(! $c->aborted()) {
	# write back into the temporary file
my %dbfile;	my %dbfile;
if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) {	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) {
while (my($key,$value) = each(%hash)) {	while (my($key,$value) = each(%hash)) {
Line 537 sub scanDir {	Line 577 sub scanDir {
my $c = $r->connection();	my $c = $r->connection();
my ($compuri,$curdir);	my ($compuri,$curdir);
my $dirptr=16384;	my $dirptr=16384;
	my $obs;
$indent++;	$indent++;

my %dupdirs = %dirs;	my %dupdirs = %dirs;
my @list=&get_list($r,$startdir);	my @list=&get_list($r,$startdir);
foreach my $line (@list) {	foreach my $line (@list) {
return if ($c->aborted());	return if ($c->aborted());
my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5);	#This is a kludge, sorry aboot this
next if $strip =~ /.*\.meta$/;	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);	my (@fileparts) = split(/\./,$strip);
if ($hash{'display_attrs_9'} != 1) {	if ($hash{'display_attrs_9'} != 1) {
	# if not all versions to be shown
if (scalar(@fileparts) >= 3) {	if (scalar(@fileparts) >= 3) {
my $fext = pop @fileparts;	my $fext = pop @fileparts;
my $ov = pop @fileparts;	my $ov = pop @fileparts;
Line 565 sub scanDir {	Line 607 sub scanDir {
$curdir = $startdir;	$curdir = $startdir;
}	}
my $diropen = 'closed';	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) {	while (my ($key,$val)= each %dupdirs) {
if ($key eq $compuri and $val eq "open") {	if ($key eq $compuri and $val eq "open") {
$diropen = "opened";	$diropen = "opened";
Line 583 sub scanDir {	Line 625 sub scanDir {
# --------------- get complete matched list based on the uri (returns an array)	# --------------- get complete matched list based on the uri (returns an array)
sub get_list {	sub get_list {
my ($r,$uri)=@_;	my ($r,$uri)=@_;
my @list;	my @list=();
(my $luri = $uri) =~ s/\//_/g;	(my $luri = $uri) =~ s/\//_/g;
	if ($ENV{'form.updatedisplay'}) {
if ($ENV{'form.attrs'} eq 'Update Display') {
foreach (keys %hash) {	foreach (keys %hash) {
delete $hash{$_} if ($_ =~ /^dirlist_files_/);	delete $hash{$_} if ($_ =~ /^dirlist_files_/);
}	}
}	}

if ($hash{'dirlist_files'.$luri}) {	if ($hash{'dirlist_files_'.$luri}) {
@list = split(/\n/,$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 {	} else {
	# is really a directory
@list = &Apache::lonnet::dirlist($uri);	@list = &Apache::lonnet::dirlist($uri);
$hash{'dirlist_files_'.$luri} = join('\n',@list);	$hash{'dirlist_files_'.$luri} = join("\n",@list);
}	}
return @list=&match_ext($r,@list);	return @list=&match_ext($r,@list);
}	}
Line 640 sub match_ext {	Line 692 sub match_ext {
next if ($unpackline[0] eq '..');	next if ($unpackline[0] eq '..');
my @filecom = split (/\./,$unpackline[0]);	my @filecom = split (/\./,$unpackline[0]);
my $fext = pop(@filecom);	my $fext = pop(@filecom);
my $fnptr = $unpackline[3]&$dirptr;	my $fnptr = ($unpackline[3]&$dirptr) \|\| ($fext=~/\.(page\|sequence)$/);
if ($fnptr == 0 and $unpackline[3] ne "") {	if ($fnptr == 0 and $unpackline[3] ne "") {
my $embstyle = &Apache::loncommon::fileembstyle($fext);	my $embstyle = &Apache::loncommon::fileembstyle($fext);
push @trimlist,$line if (defined($embstyle) &&	push @trimlist,$line if (defined($embstyle) &&
Line 649 sub match_ext {	Line 701 sub match_ext {
push @trimlist,$line;	push @trimlist,$line;
}	}
}	}
@trimlist = sort (@trimlist);	@trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
return @trimlist;	return @trimlist;
}	}

Line 657 sub match_ext {	Line 709 sub match_ext {
sub display_line {	sub display_line {
my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;	my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
my (@pathfn, $fndir);	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 $dirptr=16384;
my $fileclr="#ffffe6";	my $fileclr="#ffffe6";
my $iconpath= $r->dir_config('lonIconsURL') . '/';	my $iconpath= $r->dir_config('lonIconsURL') . '/';
Line 665 sub display_line {	Line 728 sub display_line {
my @pathcom = split (/\//,$filecom[0]);	my @pathcom = split (/\//,$filecom[0]);
my $listname = $pathcom[scalar(@pathcom)-1];	my $listname = $pathcom[scalar(@pathcom)-1];
my $fnptr = $filecom[3]&$dirptr;	my $fnptr = $filecom[3]&$dirptr;
my $msg = 'View '.$filecom[0].' resources';	my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
$msg = 'Close '.$filecom[0].' directory' if $diropen eq 'opened';	$msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';

my $tabtag='</td>';	my $tabtag='</td>';
my $i=0;	my $i=0;

while ($i<=8) {	while ($i<=8) {
$tabtag=join('',$tabtag,"<td> </td>")	$tabtag=join('',$tabtag,"<td> </td>")
if $hash{'display_attrs_'.$i} == 1;	if $hash{'display_attrs_'.$i} == 1;
Line 681 sub display_line {	Line 743 sub display_line {

# display uplink arrow	# display uplink arrow
if ($filecom[1] eq 'viewOneUp') {	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("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
$r->print("<td>\n");	$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\','.	'onSubmit="return rep_dirpath(\'UP\','.
'document.forms.fileattr.acts.value)" '.	'document.forms.fileattr.acts.value)" '.
Line 695 sub display_line {	Line 762 sub display_line {
$r->print ('<input src="'.$iconpath.'arrow_up.gif"');	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
"\n");	"\n");
$r->print("Up $tabtag</tr></form>\n");	$r->print(&mt("Up")." $tabtag</tr></form>\n");
return OK;	return OK;
}	}
# Do we have permission to look at this?	# 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	# display domain
if ($filecom[1] eq 'domain') {	if ($filecom[1] eq 'domain') {
$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")	$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
if ($ENV{'form.dirPointer'} eq "on");	if ($ENV{'form.dirPointer'} eq "on");
$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
$r->print("<td>");	$r->print("<td>");
&begin_form ($r,$filecom[0]);	&begin_form ($r,$filecom[0]);
Line 720 sub display_line {	Line 790 sub display_line {
$r->print ('<a href="javascript:gothere(\''.$filecom[0].	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
'\')"><img src="'.$iconpath.'server.gif"');	'\')"><img src="'.$iconpath.'server.gif"');
$r->print (' border="0" /></a>'."\n");	$r->print (' border="0" /></a>'."\n");
$r->print ("Domain - $listname ");	$r->print (&mt("Domain")." - $listname ");
if ($Apache::lonnet::domaindescription{$listname}) {	if ($Apache::lonnet::domaindescription{$listname}) {
$r->print("(".$Apache::lonnet::domaindescription{$listname}.	$r->print("(".$Apache::lonnet::domaindescription{$listname}.
")");	")");
Line 756 sub display_line {	Line 826 sub display_line {
}	}

# display file	# display file
if ($fnptr == 0 and $filecom[3] ne '') {	if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
my $filelink = $startdir.$filecom[0];	my $filelink = $pathprefix.$filecom[0];
my @file_ext = split (/\./,$listname);	my @file_ext = split (/\./,$listname);
my $curfext = $file_ext[-1];	my $curfext = $file_ext[-1];
if (@Omit) {	if (@Omit) {
Line 769 sub display_line {	Line 839 sub display_line {
return OK if ($skip > 0);	return OK if ($skip > 0);
}	}
# Set the icon for the file	# Set the icon for the file
my $iconname = "unknown.gif";	my $iconname = &Apache::loncommon::icon($listname);
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');
#
$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap>");	$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;	my $title;
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
$title=$listname;	$title=$listname;
$title = &Apache::lonnet::metadata($filelink,'title')	$title = &Apache::lonnet::metadata($filelink,'title')
if ($metafile == 1);	if ($metafile == 1);
$title=$listname unless $title;	$title=$listname unless $title;
my $titleesc=HTML::Entities::encode($title);	my $titleesc=HTML::Entities::encode($title,'<>&"');
$titleesc=~s/\'/\\'/; #' (clean up this spare quote)	$titleesc=~s/\'/\\'/; #' (clean up this spare quote)
$r->print("<a href=\"javascript:select_data(\'",	$r->print("<a href=\"javascript:select_data(\'",
$titleesc,"','",$filelink,"')\">");	$titleesc,"','",$filelink,"')\">");
$r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".	$r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
"\n");	"\n");
$r->print("</td><td nowrap>");	$r->print("</td><td nowrap>");
}	} elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
$title=$listname;	$title=$listname;
$title = &Apache::lonnet::metadata($filelink,'title')	$title = &Apache::lonnet::metadata($filelink,'title')
if ($metafile == 1);	if ($metafile == 1);
$title=$listname unless $title;	$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("<form name='form$fnum'>\n");
$r->print("<input type='checkbox' name='filelink"."' ".	$r->print("<input type='checkbox' name='filelink"."' ".
"value='$filelink' onClick='".	"value='$filelink' onClick='".
Line 813 sub display_line {	Line 884 sub display_line {
$hash{"pre_${fnum}_title"}=$titleesc;	$hash{"pre_${fnum}_title"}=$titleesc;
$fnum++;	$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) {	if ($indent > 0 and $indent < 11) {
$r->print("<img src=",$iconpath,"whitespace",$indent,	$r->print("<img src=",$iconpath,"whitespace",$indent,
".gif border='0' />\n");	".gif border='0' />\n");
Line 829 sub display_line {	Line 908 sub display_line {
$r->print("<img src=",$iconpath,"whitespace",$rem,	$r->print("<img src=",$iconpath,"whitespace",$rem,
".gif border='0' />\n") if $rem > 0;	".gif border='0' />\n") if $rem > 0;
}	}
	# Sequence open/close icon
$r->print("<img src=$iconpath$iconname border='0' />\n");	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.	$r->print (" <a href=\"javascript:openWindow('".$filelink.
"', 'previewfile', '450', '500', 'no', 'yes','yes')\";".	"', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
" TARGET=_self>$listname</a> ");	" TARGET=_self>$listname</a> ");

$r->print (" (<a href=\"javascript:openWindow('".$filelink.	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".	".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
"TARGET=_self>metadata</a>) ") if ($metafile == 1);	"TARGET=_self>metadata</a>) ");

$r->print("</td>\n");	$r->print("</td>\n");
if ($hash{'display_attrs_0'} == 1) {	if ($hash{'display_attrs_0'} == 1) {
my $title = &Apache::lonnet::gettitle($filelink,'title')	my $title = &Apache::lonnet::gettitle($filelink,'title');
if ($metafile == 1);
$r->print('<td> '.($title eq '' ? ' ' : $title).	$r->print('<td> '.($title eq '' ? ' ' : $title).
' </td>'."\n");	' </td>'."\n");
}	}
Line 857 sub display_line {	Line 949 sub display_line {
if $hash{'display_attrs_3'} == 1;	if $hash{'display_attrs_3'} == 1;

if ($hash{'display_attrs_4'} == 1) {	if ($hash{'display_attrs_4'} == 1) {
my $author = &Apache::lonnet::metadata($filelink,'author')	my $author = &Apache::lonnet::metadata($filelink,'author');
if ($metafile == 1);
$r->print('<td> '.($author eq '' ? ' ' : $author).	$r->print('<td> '.($author eq '' ? ' ' : $author).
" </td>\n");	" </td>\n");
}	}
if ($hash{'display_attrs_5'} == 1) {	if ($hash{'display_attrs_5'} == 1) {
my $keywords = &Apache::lonnet::metadata($filelink,'keywords')	my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
if ($metafile == 1);
# $keywords = ' ' if (!$keywords);	# $keywords = ' ' if (!$keywords);
$r->print('<td> '.($keywords eq '' ? ' ' : $keywords).	$r->print('<td> '.($keywords eq '' ? ' ' : $keywords).
" </td>\n");	" </td>\n");
}	}
if ($hash{'display_attrs_6'} == 1) {	if ($hash{'display_attrs_6'} == 1) {
my $lang = &Apache::lonnet::metadata($filelink,'language')	my $lang = &Apache::lonnet::metadata($filelink,'language');
if ($metafile == 1);
$lang = &Apache::loncommon::languagedescription($lang);	$lang = &Apache::loncommon::languagedescription($lang);
$r->print('<td> '.($lang eq '' ? ' ' : $lang).	$r->print('<td> '.($lang eq '' ? ' ' : $lang).
" </td>\n");	" </td>\n");
Line 880 sub display_line {	Line 969 sub display_line {
my $output='';	my $output='';
my $embstyle=&Apache::loncommon::fileembstyle($curfext);	my $embstyle=&Apache::loncommon::fileembstyle($curfext);
if ($embstyle eq 'ssi') {	if ($embstyle eq 'ssi') {
$output=&Apache::lonnet::ssi_body($filelink);	my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
$output='<font size="-2">'.$output.'</font>';	'.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') {	} elsif ($embstyle eq 'img') {
$output='<img src="'.$filelink.'" />';	$output='<img src="'.$filelink.'" />';
} elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {	} elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
Line 893 sub display_line {	Line 994 sub display_line {
" </td>\n");	" </td>\n");
}	}
if ($hash{'display_attrs_8'} == 1) {	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'} : '').	my $stat = (exists($stat{'course'}) ? $stat{'course'} : '').
((exists($stat{'course'}) \|\| exists($stat{'count'})) ? '/' : '').	((exists($stat{'course'}) \|\| exists($stat{'count'})) ? '/' : '').
(exists($stat{'count'}) ? $stat{'count'} : '');	(exists($stat{'count'}) ? $stat{'count'} : '');
Line 906 sub display_line {	Line 1007 sub display_line {

# -- display directory	# -- display directory
if ($fnptr == $dirptr) {	if ($fnptr == $dirptr) {
my @file_ext = split (/\./,$listname);
my $curfext = $file_ext[scalar(@file_ext)-1];
my $curdir = $startdir.$filecom[0].'/';	my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;	my $anchor = $curdir;
$anchor =~ s/\///g;	$anchor =~ s/\///g;
Line 937 sub display_line {	Line 1036 sub display_line {
$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.
$iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.	$iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
"\n");	"\n");
$r->print ("$listname$tabtag</tr></form>\n");	$r->print ("$listname</td>\n");
	# Attributes
	my $filelink = $startdir.$filecom[0].'/default';

	if ($hash{'display_attrs_0'} == 1) {
	my $title = &Apache::lonnet::gettitle($filelink,'title');
	$r->print('<td> '.($title eq '' ? ' ' : $title).
	' </td>'."\n");
	}
	$r->print('<td align=right> ',
	$filecom[8]," </td>\n")
	if $hash{'display_attrs_1'} == 1;
	$r->print('<td> '.
	(localtime($filecom[9]))." </td>\n")
	if $hash{'display_attrs_2'} == 1;
	$r->print('<td> '.
	(localtime($filecom[10]))." </td>\n")
	if $hash{'display_attrs_3'} == 1;

	if ($hash{'display_attrs_4'} == 1) {
	my $author = &Apache::lonnet::metadata($filelink,'author');
	$r->print('<td> '.($author eq '' ? ' ' : $author).
	" </td>\n");
	}
	if ($hash{'display_attrs_5'} == 1) {
	my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
	# $keywords = ' ' if (!$keywords);
	$r->print('<td> '.($keywords eq '' ? ' ' : $keywords).
	" </td>\n");
	}
	if ($hash{'display_attrs_6'} == 1) {
	my $lang = &Apache::lonnet::metadata($filelink,'language');
	$lang = &Apache::loncommon::languagedescription($lang);
	$r->print('<td> '.($lang eq '' ? ' ' : $lang).
	" </td>\n");
	}
	if ($hash{'display_attrs_7'} == 1) {
	$r->print('<td> </td>');
	}
	if ($hash{'display_attrs_8'} == 1) {
	$r->print('<td> </td>');
	}
	$r->print('</form></tr>');
}	}

}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.75
changed lines
	Added in v.1.104