--- loncom/interface/lonindexer.pm	2007/06/27 22:39:48	1.162
+++ loncom/interface/lonindexer.pm	2007/06/29 22:42:17	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.162 2007/06/27 22:39:48 albertel Exp $
+# $Id: lonindexer.pm,v 1.167 2007/06/29 22:42:17 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,6 @@ sub handler {
 	    if ($env{'form.launch'} eq '1') {
 		&start_fresh_session(\%dbfile);
 	    }
-
 	    while(my($key,$value)=each(%dbfile)) {
 		$hash{$key}=$value;
 	    }
@@ -350,21 +349,26 @@ END
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
 $catalogmodefunctions
-function checkAll(dir) {
+function checkAll() {
     var numForms = document.forms.length;
-    var dirLength = dir.length;
-    var dirCheckbox = document.getElementById(dir);
     for (i=0;i<numForms;i++) {
         var numElements = document.forms[i].elements.length;
         for (j=0;j<numElements;j++){
-            var fieldVal = document.forms[i].elements[j].value;
-            var comp = fieldVal.substr(0,dirLength);
-            if ((comp == dir) && (dirLength < fieldVal.length)) {
-                if (dirCheckbox.checked == true) {
-                    document.forms[i].elements[j].checked = true;
-                } else {
-                    document.forms[i].elements[j].checked = false;
-                }
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = true;
+            }
+        }
+    }
+}
+function uncheckAll() {
+    var numForms = document.forms.length;
+    for (i=0;i<numForms;i++) {
+        var numElements = document.forms[i].elements.length;
+        for (j=0;j<numElements;j++){
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = false;
             }
         }
     }
@@ -404,11 +408,10 @@ ENDHEADER
 		$ac++;
 	    }
 	    # sorting through the actions and changing the global database hash
-	    foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
-		my $key=$_;
+	    foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
 		if ($ahash{$key} eq '1') {
 		    $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'pre_'.$key.'_title'};
+		       $hash{'pre_'.$key.'_title'};
 		    $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}=
 			$hash{'storectr'}+0;
 		    $hash{'storectr'}++;
@@ -518,6 +521,9 @@ END
 # ------------------------------------------------------ Remember where we were
 	&Apache::loncommon::storeresurl($storeuri);
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
+# -------------------------------------------------- Check All and Uncheck all
+	$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()" />');
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
         #$r->print(&initdebug());
@@ -889,10 +895,7 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\W//g;
-	$r->print("<tr valign=$valign bgcolor=\"$fileclr\">");
-	$r->print("<td>\n");
-	$r->print("<input type=\"checkbox\" name=\"$curdir\" id=\"$curdir\" value=\"$curdir\" onClick=\"javascript:checkAll('$curdir')\" /></td>\n");
-	$r->print("<td nowrap>\n");
+	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
 		   'whitespace1.gif" class="LC_icon" />'."\n");
@@ -915,7 +918,11 @@ sub display_line {
 
 # display file
     if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+        my $title;
 	my $filelink = $pathprefix.$filecom[0];
+	if ($hash{'display_attrs_0'} == 1) {
+	    $title = &Apache::lonnet::gettitle($filelink,'title');
+	}
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -948,6 +955,10 @@ sub display_line {
 	    $r->print(" />\n");
 	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
+	    $hash{"pre_${fnum}_title"}=$title;
+	    if (!$hash{"pre_${fnum}_title"}) {
+	        $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+	    }
   	    $fnum++;
 	}
 # Form to open or close sequences
@@ -1001,7 +1012,6 @@ sub display_line {
 	}
 	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title');
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}