--- loncom/interface/lonindexer.pm	2003/08/06 16:43:36	1.72
+++ loncom/interface/lonindexer.pm	2003/12/22 18:58:26	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.72 2003/08/06 16:43:36 albertel Exp $
+# $Id: lonindexer.pm,v 1.82 2003/12/22 18:58:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,6 +64,7 @@ use Apache::loncommon();
 use Apache::Constants qw(:common);
 use Apache::lonmeta;
 use Apache::File;
+use Apache::lonlocal;
 use GDBM_File;
 
 # ---------------------------------------- variables used throughout the module
@@ -82,11 +83,25 @@ my @Only = ();
 my @Omit = ();
 
 
+# ------------------------------------------------------- Puts directory header
+
+sub crumbs {
+    my $uri=shift;
+    my $output='<br /><tt><b><font size="+2">/';
+    my $path='/';
+    foreach (split('/',$uri)) {
+	unless ($_) { next; }
+	$path.=$_.'/';
+	$output.='<a href="'.$path.'">'.$_.'</a>/';
+    }
+    return $output.'</font></b></tt><br />';
+}
+
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
     my $c = $r->connection();
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
@@ -117,7 +132,7 @@ sub handler {
     # Get the parameters from the query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 	     ['catalogmode','launch','acts','mode','form','element',
-              'only','omit']);
+              'only','omit','titleelement']);
     #-------------------------------------------------------------------
     my $closebutton='';
     my $groupimportbutton='';
@@ -149,8 +164,9 @@ sub handler {
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
+            my $cl=&mt('Close');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onClick="self.close()">
 END
         }
 	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
@@ -158,11 +174,13 @@ END
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
+	    my $cl=&mt('Close');
+            my $gi=&mt('Group Import');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onClick="self.close()">
 END
             $groupimportbutton=<<END;
-<input type="button" name="groupimport" value='GROUP IMPORT'
+<input type="button" name="groupimport" value='$gi'
 onClick="javascript:select_group()">
 END
         }
@@ -175,11 +193,12 @@ END
 	# $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');
-	&setvalues(\%hash,'form.only'   ,\%ENV,'form.only'   );
-	&setvalues(\%hash,'form.omit'   ,\%ENV,'form.omit'   );
+	&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'}) {
@@ -190,12 +209,14 @@ END
         }
         
 	my $mode = $ENV{'form.mode'};
-	my ($form,$element);
+	my ($form,$element,$titleelement);
 	if ($mode eq 'edit' || $mode eq 'parmset') {
-	    $form    = $ENV{'form.form'};
-	    $element = $ENV{'form.element'};
+	    $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
@@ -244,6 +265,7 @@ END
 // mode = $mode
 function select_data(title,url) {
     changeURL(url);
+    changeTitle(title);
     self.close();
 }
 
@@ -258,8 +280,20 @@ function changeURL(val) {
 	    alert("The file you selected is: "+val);
     }
 }
-
 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') {
                 my $location = "/adm/groupsort?catalogmode=interactive&";
                 $location .= "form=$form&element=$element&mode=parmset&acts=";
@@ -337,7 +371,9 @@ function gothere(val) {
 
 </head>
 ENDHEADER
-$r->print(&Apache::loncommon::bodytag('Browse Resources'));
+my ($headerdom)=($uri=~/^\/res\/(\w+)\//);
+$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef,
+				      $headerdom));
 # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    my $acts=$ENV{'form.acts'};
@@ -397,31 +433,47 @@ $r->print(&Apache::loncommon::bodytag('B
 # ------------------------------- 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',
+					   'sr' => 'Show resource',
+					   'av' => 'All versions',
+					   'ud' => 'Update Display'
+					   );
+        my $Displayfileattributes=&mt('Display file attributes');
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
  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>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Title</td>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>
-<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Statistics</td></tr><tr>
-<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>
-<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>
-<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>
-<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> Show Resource</td>
-<td><input type="checkbox" name="attr9" value="1" $attrchk[9] /> All versions</td>
+<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> $lt{'ti'}</td>
+<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> $lt{'si'}</td>
+<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> $lt{'la'}</td>
+<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> $lt{'lm'}</td>
+<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> $lt{'st'}</td>
+</tr><tr>
+<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> $lt{'au'}</td>
+<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> $lt{'kw'}</td>
+<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> $lt{'ln'}</td>
+<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> $lt{'sr'}</td>
+<td><input type="checkbox" name="attr9" value="1" $attrchk[9] /> $lt{'av'}</td>
 <td>&nbsp;</td>
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Update Display" />
+<input type="submit" name="attrs" value="$lt{'ud'}" />
 $closebutton
 $groupimportbutton
 </form>
 END
-
+# ---------------------------------------------------------------- Bread crumbs
+        $r->print(&crumbs($uri));
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
 #        $r->print(&initdebug());
@@ -429,24 +481,25 @@ END
 #        $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 bgcolor=$titleclr>\n");
-	$r->print("<td $colspan><b>Name</b></td>\n");
-	$r->print("<td><b>Title</b></td>\n") 
+	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
+	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
 	    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);
-	$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);
-	$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);
-	$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);
-	$r->print("<td><b>Keywords</b></td>\n")
+	$r->print("<td><b>".&mt("Keywords")."</b></td>\n")
 	    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);
-	$r->print("<td><b>Resource</b></td>\n")
+	$r->print("<td><b>".&mt("Resource")."</b></td>\n")
 	    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);
 	$r->print('</tr>');
 
@@ -549,13 +602,14 @@ sub scanDir {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/);
 	    }
 	}
 
 	if ($dom eq 'domain') {
 	    # dom list has full path /res/<domain name>/ already
 	    $curdir='';
+	    $compuri = (split(/\&/,$line))[0];
 	} else {
 	    # user, dir & file have name only, i.e., w/o path
 	    $compuri = join('',$startdir,$strip,'/');
@@ -583,7 +637,7 @@ sub get_list {
     my @list;
     (my $luri = $uri) =~ s/\//_/g;
 
-    if ($ENV{'form.attrs'} eq 'Update Display') {
+    if ($ENV{'form.attrs'} eq &mt('Update Display')) {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    }
@@ -646,7 +700,7 @@ sub match_ext {
 	    push @trimlist,$line;
 	}
     }
-    @trimlist = sort (@trimlist);
+    @trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
     return @trimlist;
 }
 
@@ -662,8 +716,8 @@ sub display_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='</td>';
     my $i=0;
@@ -692,7 +746,7 @@ sub display_line {
 	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	$r->print("Up $tabtag</tr></form>\n");
+	$r->print(&mt("Up")." $tabtag</tr></form>\n");
 	return OK;
     }
 # Do we have permission to look at this?
@@ -705,8 +759,8 @@ sub display_line {
 	    if ($ENV{'form.dirPointer'} eq "on");
 	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
 	$r->print("<td>");
-	&begin_form ($r,$filecom[0].'/');
-	my $anchor = $filecom[0].'/';
+	&begin_form ($r,$filecom[0]);
+	my $anchor = $filecom[0];
 	$anchor =~ s/\///g;
 	$r->print ('<a name="'.$anchor.'">');
 	$r->print ('<input type="hidden" name="acts" value="">');
@@ -715,9 +769,9 @@ sub display_line {
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
 	$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 ("Domain - $listname ");
+	$r->print (&mt("Domain")." - $listname ");
 	if ($Apache::lonnet::domaindescription{$listname}) {
 	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
 		      ")");
@@ -755,6 +809,7 @@ 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) {