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.181.6.2 and 1.193

version 1.181.6.2, 2009/12/02 18:22:20	version 1.193, 2009/03/18 13:47:14
Line 104 sub handler {	Line 104 sub handler {
my $lonhost = $r->dir_config('lonHostID');	my $lonhost = $r->dir_config('lonHostID');
my $tabdir = $r->dir_config('lonTabDir');	my $tabdir = $r->dir_config('lonTabDir');

my $fileclr='#ffffe6';	#SB my $fileclr='#ffffe6';
my $line;	my $line;
my (@attrchk,@openpath,$typeselect);	my (@attrchk,@openpath,$typeselect);
my $uri=$r->uri;	my $uri=$r->uri;
Line 177 ENDSUBM	Line 177 ENDSUBM

# --------------------- define extra fields and buttons in case of special mode	# --------------------- define extra fields and buttons in case of special mode
if ($env{'form.catalogmode'} eq 'interactive') {	if ($env{'form.catalogmode'} eq 'interactive') {
$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.	#SB $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
	$extrafield='<td valign="bottom">'.
'<img alt="" src="'.$iconpath.'whitespace1.gif"'.	'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
' class="LC_icon" /></td>';	' class="LC_icon" /></td>';
$colspan=" colspan='2' ";	$colspan=" colspan='2' ";
my $cl=&mt('Close');	my $cl=&mt('Close');
$closebutton=<<END;	$closebutton=<<END;
<input type="button" name="close" value='$cl' onclick="self.close()" />	<input type="button" name="close" value='$cl' onClick="self.close()" />
END	END
}	}
elsif ($env{'form.catalogmode'} eq 'import') {	elsif ($env{'form.catalogmode'} eq 'import') {
$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.	#SB $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
	$extrafield='<td valign="bottom">'.
'<img alt="" src="'.$iconpath.'whitespace1.gif"'.	'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
' class="LC_icon" /></td>';	' class="LC_icon" /></td>';
$colspan=" colspan='2' ";	$colspan=" colspan='2' ";
my $cl=&mt('Close');	my $cl=&mt('Close');
my $gi=&mt('Import');	my $gi=&mt('Import');
$closebutton=<<END;	$closebutton=<<END;
<input type="button" name="close" value='$cl' 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='$gi'	<input type="button" name="groupimport" value='$gi'
onclick="javascript:select_group()" />	onClick="javascript:select_group()" />
END	END
}	}
# Additions made by Matthew to make the browser a little easier to deal	# Additions made by Matthew to make the browser a little easier to deal
Line 407 function gothere(val) {	Line 409 function gothere(val) {
ENDHEADER	ENDHEADER

my ($headerdom)=($uri=~m{^/res/($match_domain)/});	my ($headerdom)=($uri=~m{^/res/($match_domain)/});
my %args = (	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
'domain' => $headerdom,	{'domain' => $headerdom,}));
);
if ($env{'form.catalogmode'}) {
# "Popup mode"
$args{'only_body'} = 1;
}
$r->print(&Apache::loncommon::start_page('Browse Resources',$js,\%args));
# ---------------------------------- get state of file types to be showing	# ---------------------------------- get state of file types to be showing
if ($env{'form.only'}) {	if ($env{'form.only'}) {
$typeselect = $env{'form.only'};	$typeselect = $env{'form.only'};
Line 427 ENDHEADER	Line 423 ENDHEADER
for (my $i=0; $i<=16; $i++) {	for (my $i=0; $i<=16; $i++) {
delete $hash{'display_attrs_'.$i};	delete $hash{'display_attrs_'.$i};
if ($env{'form.attr'.$i} == 1) {	if ($env{'form.attr'.$i} == 1) {
$attrchk[$i] = 'checked="checked"';	$attrchk[$i] = 'checked';
$hash{'display_attrs_'.$i} = 1;	$hash{'display_attrs_'.$i} = 1;
}	}
}	}
} else {	} else {
for (my $i=0; $i<=16; $i++) {	for (my $i=0; $i<=16; $i++) {
$attrchk[$i] = 'checked="checked"' if $hash{'display_attrs_'.$i} == 1;	$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
}	}
}	}

Line 448 ENDHEADER	Line 444 ENDHEADER
'st' => 'Statistics',	'st' => 'Statistics',
'au' => 'Author',	'au' => 'Author',
'kw' => 'Keywords',	'kw' => 'Keywords',
'sb' => 'Subject',	'sb' => 'Subject',
'nt' => 'Notes',	'nt' => 'Notes',
'ab' => 'Abstract',	'gl' => 'Grade Level',
	'ab' => 'Abstract',
	'sd' => 'Standards',
'ln' => 'Language',	'ln' => 'Language',
'gl' => 'Grade Level',
'sd' => 'Standards',
'sa' => 'Source Available',	'sa' => 'Source Available',
'sr' => 'Show resource',	'sr' => 'Show resource',
'li' => 'Linked/Related Resources',	'li' => 'Linked/Related Resources',
Line 462 ENDHEADER	Line 458 ENDHEADER
'pr' => 'Problems',	'pr' => 'Problems',
'gr' => 'Graphics',	'gr' => 'Graphics',
'at' => 'All types',	'at' => 'All types',
'hd' => 'Display Options',	'hd' => 'Display Options'
);	);
$r->print(<<END);	$r->print(<<END);
<fieldset>	<fieldset>
<legend>$lt{'hd'}</legend>	<legend>$lt{'hd'}</legend>
<form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">	<form method="post" name="fileattr" action="$uri"
<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>	enctype="application/x-www-form-urlencoded">
	<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
<table border="0">	<table border="0">
<tr>	<tr>
<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onclick="this.form.submit();" /> $lt{'ti'}</label></td>	<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
<td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onclick="this.form.submit();" /> $lt{'au'}</label></td>	<td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
<td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onclick="this.form.submit();" /> $lt{'kw'}</label></td>	<td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
<td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onclick="this.form.submit();" /> $lt{'ln'}</label></td>	<td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onclick="this.form.submit();" /> $lt{'nt'}</label></td>	<td><label><input type="checkbox" name="attr13" value="1" $attrchk[13] onClick="this.form.submit();" /> $lt{'nt'}</label></td>
<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onclick="this.form.submit();" /> $lt{'sd'}</label></td>	<td><label><input type="checkbox" name="attr16" value="1" $attrchk[16] onClick="this.form.submit();" /> $lt{'sd'}</label></td>
</tr>	</tr>
<tr>	<tr>
<td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onclick="this.form.submit();" /> $lt{'si'}</label></td>	<td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
<td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onclick="this.form.submit();" /> $lt{'la'}</label></td>	<td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
<td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onclick="this.form.submit();" /> $lt{'lm'}</label></td>	<td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
<td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onclick="this.form.submit();" /> $lt{'sa'}</label></td>	<td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onclick="this.form.submit();" /> $lt{'ab'}</label></td>	<td><label><input type="checkbox" name="attr14" value="1" $attrchk[14] onClick="this.form.submit();" /> $lt{'ab'}</label></td>
<td> </td>	<td> </td>
</tr>	</tr>
<tr>	<tr>
<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onclick="this.form.submit();" /> $lt{'st'}</label></td>	<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
<td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onclick="this.form.submit();" /> $lt{'li'}</label></td>	<td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
<td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onclick="this.form.submit();" /> $lt{'sr'}</label></td>	<td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onclick="this.form.submit();" /> $lt{'sb'}</label></td>	<td><label><input type="checkbox" name="attr12" value="1" $attrchk[12] onClick="this.form.submit();" /> $lt{'sb'}</label></td>
<td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onclick="this.form.submit();" /> $lt{'gl'}</label></td>	<td><label><input type="checkbox" name="attr15" value="1" $attrchk[15] onClick="this.form.submit();" /> $lt{'gl'}</label></td>
<td> </td>	<td> </td>
</tr>	</tr>
</table>	</table>
Line 549 END	Line 546 END
&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
# -------------------------------------------------- Check All and Uncheck all	# -------------------------------------------------- Check All and Uncheck all
if ($env{'form.catalogmode'} eq 'import') {	if ($env{'form.catalogmode'} eq 'import') {
$r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onclick="javascript:checkAll()" />');	$r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
$r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onclick="javascript:uncheckAll()" />');	$r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
}	}
# ----------------- output starting row to the indexed file/directory hierarchy	# ----------------- output starting row to the indexed file/directory hierarchy
my $titleclr="#ddffff";
#$r->print(&initdebug());	#$r->print(&initdebug());
#$r->print(&writedebug("Omit:@Omit")) if (@Omit);	#$r->print(&writedebug("Omit:@Omit")) if (@Omit);
#$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('<br /><br />');
$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");	$r->print(&Apache::loncommon::start_data_table()
$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");	.&Apache::loncommon::start_data_table_header_row());
$r->print("<td><b>".&mt('Title')."</b></td>\n")	$r->print("<th $colspan>".&mt('Name')."</th>\n");
	$r->print("<th>".&mt('Title')."</th>\n")
if ($hash{'display_attrs_0'} == 1);	if ($hash{'display_attrs_0'} == 1);
$r->print("<td align=right><b>".&mt("Size")." (".&mt("bytes").") ".	$r->print('<th align="right">'.&mt("Size")." (".&mt("bytes").") ".
"</b></td>\n") if ($hash{'display_attrs_1'} == 1);	"</th>\n") if ($hash{'display_attrs_1'} == 1);
$r->print("<td><b>".&mt("Last accessed")."</b></td>\n")	$r->print("<th>".&mt("Last accessed")."</th>\n")
if ($hash{'display_attrs_2'} == 1);	if ($hash{'display_attrs_2'} == 1);
$r->print("<td><b>".&mt("Last modified")."</b></td>\n")	$r->print("<th>".&mt("Last modified")."</th>\n")
if ($hash{'display_attrs_3'} == 1);	if ($hash{'display_attrs_3'} == 1);
$r->print("<td><b>".&mt("Author(s)")."</b></td>\n")	$r->print("<th>".&mt("Author(s)")."</th>\n")
if ($hash{'display_attrs_4'} == 1);	if ($hash{'display_attrs_4'} == 1);
$r->print("<td><b>".&mt("Keywords")."</b></td>\n")	$r->print("<th>".&mt("Keywords")."</th>\n")
if ($hash{'display_attrs_5'} == 1);	if ($hash{'display_attrs_5'} == 1);
$r->print("<td><b>".&mt("Language")."</b></td>\n")	$r->print("<th>".&mt("Language")."</th>\n")
if ($hash{'display_attrs_6'} == 1);	if ($hash{'display_attrs_6'} == 1);
$r->print("<td><b>".&mt("Usage Statistics")." <br />(".	$r->print("<th>".&mt("Usage Statistics")." <br />(".
&mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")	&mt("Courses/Network Hits").") ".&mt('updated periodically')."</th>\n")
if ($hash{'display_attrs_8'} == 1);	if ($hash{'display_attrs_8'} == 1);
$r->print("<td><b>".&mt("Source Available")."</b></td>\n")	$r->print("<th>".&mt("Source Available")."</th>\n")
if ($hash{'display_attrs_10'} == 1);	if ($hash{'display_attrs_10'} == 1);
$r->print("<td><b>".&mt("Linked/Related Resources")."</b></td>\n")	$r->print("<th>".&mt("Linked/Related Resources")."</th>\n")
if ($hash{'display_attrs_11'} == 1);	if ($hash{'display_attrs_11'} == 1);
$r->print("<td><b>".&mt("Resource")."</b></td>\n")	$r->print("<th>".&mt("Resource")."</th>\n")
if ($hash{'display_attrs_7'} == 1);	if ($hash{'display_attrs_7'} == 1);
$r->print("<th>".&mt("Subject")."</th>\n")	$r->print("<th>".&mt("Subject")."</th>\n")
if ($hash{'display_attrs_12'} == 1);	if ($hash{'display_attrs_12'} == 1);
$r->print("<th>".&mt("Notes")."</th>\n")	$r->print("<th>".&mt("Notes")."</th>\n")
if ($hash{'display_attrs_13'} == 1);	if ($hash{'display_attrs_13'} == 1);
$r->print("<th>".&mt("Abstract")."</th>\n")	$r->print("<th>".&mt("Abstract")."</th>\n")
if ($hash{'display_attrs_14'} == 1);	if ($hash{'display_attrs_14'} == 1);
$r->print("<th>".&mt("Grade Level")."</th>\n")	$r->print("<th>".&mt("Grade Level")."</th>\n")
if ($hash{'display_attrs_15'} == 1);	if ($hash{'display_attrs_15'} == 1);
$r->print("<th>".&mt("Standards")."</th>\n")	$r->print("<th>".&mt("Standards")."</th>\n")
if ($hash{'display_attrs_16'} == 1);	if ($hash{'display_attrs_16'} == 1);
$r->print('</tr>');
	$r->print(&Apache::loncommon::end_data_table_header_row());



# ----------------- read in what directories have previously been set to "open"	# ----------------- read in what directories have previously been set to "open"
foreach (keys %hash) {	foreach (keys %hash) {
Line 643 END	Line 643 END

# -------- recursively go through all the directories and output as appropriate	# -------- recursively go through all the directories and output as appropriate
&scanDir ($r,$toplevel,$indent,\%hash);	&scanDir ($r,$toplevel,$indent,\%hash);


# -------------------------------------------------------------- end the tables	# -------------------------------------------------------------- end the tables
$r->print('</table>');	$r->print(&Apache::loncommon::end_data_table());

# ---------------------------- embed hidden information useful for group import	# ---------------------------- embed hidden information useful for group import
$r->print("<form name='fnum' action=''>");	$r->print("<form name='fnum' action=''>");
$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
# -------------------------------------------------------------- end the tables
$r->print('</td></tr></table>');

# --------------------------------------------------- end the output and return	# --------------------------------------------------- end the output and return
$r->print(&Apache::loncommon::end_page()."\n");	$r->print(&Apache::loncommon::end_page()."\n");
Line 848 sub display_line {	Line 846 sub display_line {
$pathprefix=$startdir;	$pathprefix=$startdir;
}	}
my $dirptr=16384;	my $dirptr=16384;
my $fileclr="#ffffe6";	#SB my $fileclr="#ffffe6";
my $iconpath= $r->dir_config('lonIconsURL') . '/';	my $iconpath= $r->dir_config('lonIconsURL') . '/';

my @filecom = split (/\&/,$line);	my @filecom = split (/\&/,$line);
Line 864 sub display_line {	Line 862 sub display_line {
$tabtag=join('',$tabtag,"<td> </td>")	$tabtag=join('',$tabtag,"<td> </td>")
if ($i != 9 &&	if ($i != 9 &&
$hash{'display_attrs_'.$i} == 1);	$hash{'display_attrs_'.$i} == 1);
$i++;	$i++;
}	}
my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');	my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');

Line 875 sub display_line {	Line 873 sub display_line {
$updir='/'.(split(/\.(page\|sequence)\/\//,$startdir))[-1];	$updir='/'.(split(/\.(page\|sequence)\/\//,$startdir))[-1];
$updir=~s/\/+/\//g;	$updir=~s/\/+/\//g;

$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");	#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
	$r->print($extrafield);
$r->print("<td>\n");	$r->print("<td>\n");
$r->print ('<form method="post" name="dirpathUP" action="'.$updir.	$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)" '.
'enctype="application/x-www-form-urlencoded"'.	'enctype="application/x-www-form-urlencoded"'.
'>'."\n");	'>'."\n");
$r->print(&Apache::loncommon::inhibit_menu_check('input'));	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
$r->print ('<input type="hidden" name="openuri" value="'.	$r->print ('<input type=hidden name=openuri value="'.
$startdir.'" />'."\n");	$startdir.'" />'."\n");
$r->print ('<input type="hidden" name="acts" value="" />'."\n");	$r->print ('<input type="hidden" name="acts" value="" />'."\n");
$r->print ('<input src="'.$iconpath.'arrow_up.gif"');	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
$r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");	"\n");
$r->print(&mt("Up")."</form>$tabtag</tr>\n");	$r->print(&mt("Up")."</form>$tabtag");
	$r->print(&Apache::loncommon::end_data_table_row());
return OK;	return OK;
}	}
# Do we have permission to look at this?	# Do we have permission to look at this?
Line 898 sub display_line {	Line 899 sub display_line {
if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }	if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }

# make absolute links appear on different background	# make absolute links appear on different background
if ($absolute) { $fileclr='#ccdd99'; }	#SB if ($absolute) { $fileclr='#ccdd99'; }

# 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");	#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
	$r->print($extrafield);
$r->print("<td>");	$r->print("<td>");
&begin_form ($r,$filecom[0]);	&begin_form ($r,$filecom[0]);
my $anchor = $filecom[0];	my $anchor = $filecom[0];
Line 913 sub display_line {	Line 916 sub display_line {
$r->print ('<input type="hidden" name="acts" value="" />');	$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<input src="'.$iconpath.'folder_pointer_'.	$r->print ('<input src="'.$iconpath.'folder_pointer_'.
$diropen.'.gif"');	$diropen.'.gif"');
$r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");	"\n");
my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
Line 924 sub display_line {	Line 927 sub display_line {
$r->print("(".&Apache::lonnet::domain($listname,'description').	$r->print("(".&Apache::lonnet::domain($listname,'description').
")");	")");
}	}
$r->print ("</form>$tabtag</tr>\n");	$r->print("</form>$tabtag");
	$r->print(&Apache::loncommon::end_data_table_row());
return OK;	return OK;

# display user directory	# display user directory
Line 934 sub display_line {	Line 938 sub display_line {
my $curdir = $startdir.$filecom[0].'/';	my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;	my $anchor = $curdir;
$anchor =~ s/\W//g;	$anchor =~ s/\W//g;
$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");	#SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
	$r->print(&Apache::loncommon::start_data_table_row()
	.$extrafield.'<td valign="'.$valign.'">');
&begin_form ($r,$curdir);	&begin_form ($r,$curdir);
$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
'whitespace1.gif" class="LC_icon" />'."\n");	'whitespace1.gif" class="LC_icon" />'."\n");
$r->print ('<input type="hidden" name="acts" value="" />');	$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
'.gif"');	'.gif"');
$r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");	"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
$r->print ('<a href="javascript:gothere(\''.$quotable_curdir	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
Line 951 sub display_line {	Line 957 sub display_line {
my $plainname=&Apache::loncommon::plainname($listname,$domain);	my $plainname=&Apache::loncommon::plainname($listname,$domain);
$r->print ($listname);	$r->print ($listname);
if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
$r->print ('</form>'.$tabtag.'</tr>'."\n");	$r->print('</form>'.$tabtag);
	$r->print(&Apache::loncommon::end_data_table_row());
return OK;	return OK;
}	}

Line 974 sub display_line {	Line 981 sub display_line {
}	}
# Set the icon for the file	# Set the icon for the file
my $iconname = &Apache::loncommon::icon($listname);	my $iconname = &Apache::loncommon::icon($listname);
$r->print('<tr valign="'.$valign.'" bgcolor="'.$fileclr.'">'.	#SB $r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
'<td valign="top"><span class="LC_nobreak">');	$r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
	$r->print('<td valign="top"><span class="LC_nobreak">');

if ($env{'form.catalogmode'} eq 'interactive') {	if ($env{'form.catalogmode'} eq 'interactive') {
my $quotable_filelink = &Apache::loncommon::escape_single($filelink);	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
Line 987 sub display_line {	Line 995 sub display_line {
} elsif ($env{'form.catalogmode'} eq 'import') {	} elsif ($env{'form.catalogmode'} eq 'import') {
$r->print("<form name='form$fnum' action=''>\n");	$r->print("<form name='form$fnum' action=''>\n");
$r->print("<input type='checkbox' name='filelink"."' ".	$r->print("<input type='checkbox' name='filelink"."' ".
"value='$filelink' onclick='".	"value='$filelink' onClick='".
"javascript:queue(\"form$fnum\")' ");	"javascript:queue(\"form$fnum\")' ");
if ($hash{'store_'.$filelink}) {	if ($hash{'store_'.$filelink}) {
$r->print("checked");	$r->print("checked");
Line 1031 sub display_line {	Line 1039 sub display_line {
$r->print ('<input type="hidden" name="acts" value="" />');	$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.	$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
'folder_pointer_'.$diropen.'.gif"');	'folder_pointer_'.$diropen.'.gif"');
$r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");	"\n");
}	}
# Filetype icons	# Filetype icons
Line 1076 sub display_line {	Line 1084 sub display_line {
$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');
Line 1088 sub display_line {	Line 1095 sub display_line {
# statistics	# statistics
&dynmetaread($filelink);	&dynmetaread($filelink);
$r->print("<td>");	$r->print("<td>");
for (qw(count course stdno avetries difficulty disc clear technical	&dynmetaprint($r,$filelink,'count');
correct helpful depth)) {	&dynmetaprint($r,$filelink,'course');
	&dynmetaprint($r,$filelink,'stdno');
&dynmetaprint($r,$filelink,$_);	&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(" </td>\n");	$r->print(" </td>\n");

}	}
Line 1115 sub display_line {	Line 1128 sub display_line {
&dynmetaread($filelink);	&dynmetaread($filelink);
$r->print('<td>');	$r->print('<td>');
&coursecontext($r,$filelink);	&coursecontext($r,$filelink);
for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {	&dynmetaprint($r,$filelink,'goto_list');
&dynmetaprint($r,$filelink,$_);	&dynmetaprint($r,$filelink,'comefrom_list');
}	&dynmetaprint($r,$filelink,'sequsage_list');
$r->print('</td>');	&dynmetaprint($r,$filelink,'dependencies');
	&dynmetaprint($r,$filelink,'course_list');
	$r->print('</td>');
}	}
if ($hash{'display_attrs_7'} == 1) {


	if ($hash{'display_attrs_7'} == 1) {
# Show resource	# Show resource
my $output=&showpreview($filelink);	my $output=&showpreview($filelink);
$r->print('<td> '.($output eq '' ? ' ':$output).	$r->print('<td> '.($output eq '' ? ' ':$output).
" </td>\n");	" </td>\n");
}
if ($hash{'display_attrs_12'} == 1) {
my $subject = &Apache::lonnet::metadata($filelink,'subject');
$r->print('<td> '.($subject eq '' ? ' ' : $subject).
" </td>\n");
}

if ($hash{'display_attrs_13'} == 1) {
my $notes = &Apache::lonnet::metadata($filelink,'notes');
$r->print('<td> '.($notes eq '' ? ' ' : $notes).
" </td>\n");
}

if ($hash{'display_attrs_14'} == 1) {
my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
$r->print('<td> '.($abstract eq '' ? ' ' : $abstract).
" </td>\n");
}

if ($hash{'display_attrs_15'} == 1) {
my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
$r->print('<td> '.($gradelevel eq '' ? ' ' : $gradelevel).
" </td>\n");
}

if ($hash{'display_attrs_16'} == 1) {
my $standards = &Apache::lonnet::metadata($filelink,'standards');
$r->print('<td> '.($standards eq '' ? ' ' : $standards).
" </td>\n");
}

$r->print("</tr>\n");
}	}

	if ($hash{'display_attrs_12'} == 1) {
	my $subject = &Apache::lonnet::metadata($filelink,'subject');
	$r->print('<td> '.($subject eq '' ? ' ' : $subject).
	" </td>\n");
	}

	if ($hash{'display_attrs_13'} == 1) {
	my $notes = &Apache::lonnet::metadata($filelink,'notes');
	$r->print('<td> '.($notes eq '' ? ' ' : $notes).
	" </td>\n");
	}

	if ($hash{'display_attrs_14'} == 1) {
	my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
	$r->print('<td> '.($abstract eq '' ? ' ' : $abstract).
	" </td>\n");
	}

	if ($hash{'display_attrs_15'} == 1) {
	my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
	$r->print('<td> '.($gradelevel eq '' ? ' ' : $gradelevel).
	" </td>\n");
	}

	if ($hash{'display_attrs_16'} == 1) {
	my $standards = &Apache::lonnet::metadata($filelink,'standards');
	$r->print('<td> '.($standards eq '' ? ' ' : $standards).
	" </td>\n");
	}

	$r->print(&Apache::loncommon::end_data_table_row());
	}



# -- display directory	# -- display directory
if ($fnptr == $dirptr) {	if ($fnptr == $dirptr) {
my $curdir = $startdir.$filecom[0].'/';	my $curdir = $startdir.$filecom[0].'/';
my $anchor = $curdir;	my $anchor = $curdir;
$anchor =~ s/\W//g;	$anchor =~ s/\W//g;
$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");	#SB $r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
	$r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
	# $r->print('<tr class="LC_info_row">');
	$r->print($extrafield.'<td valign="'.$valign.'">');
&begin_form ($r,$curdir);	&begin_form ($r,$curdir);
my $indentm1 = $indent-1;	my $indentm1 = $indent-1;
if ($indentm1 < 16 and $indentm1 > 0) {	if ($indentm1 < 12 and $indentm1 > 0) {
$r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,	$r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
".gif class='LC_icon' />\n");	".gif class='LC_icon' />\n");
} else {	} else {
Line 1185 sub display_line {	Line 1209 sub display_line {
$r->print ('<input type="hidden" name="acts" value="" />');	$r->print ('<input type="hidden" name="acts" value="" />');
$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.	$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
'folder_pointer_'.$diropen.'.gif"');	'folder_pointer_'.$diropen.'.gif"');
$r->print (' name="'.$msg.'" alt="'.$msg.'" type="image" class="LC_indexer_icon" />'.	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
"\n");	"\n");
my $quotable_curdir = &Apache::loncommon::escape_single($curdir);	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
$r->print ('<a href="javascript:gothere(\''	$r->print ('<a href="javascript:gothere(\''
Line 1202 sub display_line {	Line 1226 sub display_line {
$r->print('<td> '.($title eq '' ? ' ' : $title).	$r->print('<td> '.($title eq '' ? ' ' : $title).
' </td>'."\n");	' </td>'."\n");
}	}
$r->print('<td align=right> ',	$r->print('<td align="right"> ',
$filecom[8]," </td>\n")	$filecom[8]," </td>\n")
if $hash{'display_attrs_1'} == 1;	if $hash{'display_attrs_1'} == 1;
$r->print('<td> '.	$r->print('<td> '.
Line 1229 sub display_line {	Line 1253 sub display_line {
$r->print('<td> '.($lang eq '' ? ' ' : $lang).	$r->print('<td> '.($lang eq '' ? ' ' : $lang).
" </td>\n");	" </td>\n");
}	}

if ($hash{'display_attrs_8'} == 1) {	if ($hash{'display_attrs_8'} == 1) {
$r->print('<td> </td>');	$r->print('<td> </td>');
}	}
Line 1237 sub display_line {	Line 1262 sub display_line {
}	}
if ($hash{'display_attrs_7'} == 1) {	if ($hash{'display_attrs_7'} == 1) {
$r->print('<td> </td>');	$r->print('<td> </td>');
}	}
if ($hash{'display_attrs_12'} == 1) {	if ($hash{'display_attrs_11'} == 1) {
my $subject = &Apache::lonnet::metadata($filelink,'subject');	$r->print('<td> </td>');
$r->print('<td> '.($subject eq '' ? ' ' : $subject).	}
" </td>\n");	if ($hash{'display_attrs_12'} == 1) {
}	my $subject = &Apache::lonnet::metadata($filelink,'subject');
if ($hash{'display_attrs_11'} == 1) {	$r->print('<td> '.($subject eq '' ? ' ' : $subject).
$r->print('<td> </td>');	" </td>\n");
}	}
if ($hash{'display_attrs_12'} == 1) {	if ($hash{'display_attrs_13'} == 1) {
my $subject = &Apache::lonnet::metadata($filelink,'subject');	my $notes = &Apache::lonnet::metadata($filelink,'notes');
$r->print('<td> '.($subject eq '' ? ' ' : $subject).	$r->print('<td> '.($notes eq '' ? ' ' : $notes).
" </td>\n");	" </td>\n");
}	}
if ($hash{'display_attrs_13'} == 1) {
my $notes = &Apache::lonnet::metadata($filelink,'notes');	if ($hash{'display_attrs_14'} == 1) {
$r->print('<td> '.($notes eq '' ? ' ' : $notes).	my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
" </td>\n");	$r->print('<td> '.($abstract eq '' ? ' ' : $abstract).
}	" </td>\n");
if ($hash{'display_attrs_14'} == 1) {	}
my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
$r->print('<td> '.($abstract eq '' ? ' ' : $abstract).	if ($hash{'display_attrs_15'} == 1) {
" </td>\n");	my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
}	$r->print('<td> '.($gradelevel eq '' ? ' ' : $gradelevel).
if ($hash{'display_attrs_15'} == 1) {	" </td>\n");
my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');	}
$r->print('<td> '.($gradelevel eq '' ? ' ' : $gradelevel).
" </td>\n");	if ($hash{'display_attrs_16'} == 1) {
}	my $standards = &Apache::lonnet::metadata($filelink,'standards');
if ($hash{'display_attrs_16'} == 1) {	$r->print('<td> '.($standards eq '' ? ' ' : $standards).
my $standards = &Apache::lonnet::metadata($filelink,'standards');	" </td>\n");
$r->print('<td> '.($standards eq '' ? ' ' : $standards).	}
" </td>\n");
}	$r->print(&Apache::loncommon::end_data_table_row());
$r->print('</tr>');
}	}

}	}
Line 1296 sub showpreview {	Line 1320 sub showpreview {
my $output='';	my $output='';
my $embstyle=&Apache::loncommon::fileembstyle($curfext);	my $embstyle=&Apache::loncommon::fileembstyle($curfext);
if ($embstyle eq 'ssi') {	if ($embstyle eq 'ssi') {
my $cache = $Apache::lonnet::perlvar{'lonDocRoot'}.$filelink;	my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
if ($env{'request.gcicontext'} eq 'buildtest') {	'.tmp';
$cache .= '.tn';
} else {
$cache .= '.tmp';
}
if ((!$env{'form.updatedisplay'}) &&	if ((!$env{'form.updatedisplay'}) &&
(-e $cache)) {	(-e $cache)) {
open(FH,$cache);	open(FH,$cache);
Line 1355 sub begin_form {	Line 1375 sub begin_form {
$uri=&Apache::loncommon::escape_single($uri);	$uri=&Apache::loncommon::escape_single($uri);
$r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.	$r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
'#'.$anchor.	'#'.$anchor.
'" onsubmit="return rep_dirpath(\''.$dnum.'\''.	'" onSubmit="return rep_dirpath(\''.$dnum.'\''.
',document.forms.fileattr.acts.value)" '.	',document.forms.fileattr.acts.value)" '.
'enctype="application/x-www-form-urlencoded">'."\n");	'enctype="application/x-www-form-urlencoded">'."\n");
$r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.	$r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.

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

Removed from v.1.181.6.2
changed lines
	Added in v.1.193