--- loncom/interface/lonindexer.pm	2007/07/11 20:32:15	1.170
+++ loncom/interface/lonindexer.pm	2007/08/01 21:12:12	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.170 2007/07/11 20:32:15 albertel Exp $
+# $Id: lonindexer.pm,v 1.174 2007/08/01 21:12:12 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@ use Apache::lonmeta;
 use Apache::File;
 use Apache::lonlocal;
 use Apache::lonsource();
+use Apache::groupsort();
 use GDBM_File;
 use LONCAPA qw(:match);
 
@@ -134,6 +135,11 @@ sub handler {
 	    untie(%dbfile);
 	}
     }
+# - Evaluate actions from previous page (both cumulatively and chronologically)
+        if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') {
+	    &Apache::groupsort::update_actions_hash(\%hash);
+	}
+    
     {
   #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {
@@ -268,6 +274,9 @@ END
 function select_data(url) {
    var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url;
    window.location=location;
+   if (window.opener.document.forms["$form"].elements["$element"].value != url) {
+       window.opener.unClean();
+   }
 }
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
@@ -397,47 +406,6 @@ ENDHEADER
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
 	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
 						 {'domain' => $headerdom,}));
-# - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($env{'form.catalogmode'} eq 'import') {
-	    my $acts=$env{'form.acts'};
-	    my @Acts=split(/b/,$acts);
-	    my %ahash;
-	    my %achash;
-	    my $ac=0;
-	    # some initial hashes for working with data
-	    foreach (@Acts) {
-		my ($state,$ref)=split(/a/);
-		$ahash{$ref}=$state;
-		$achash{$ref}=$ac;
-		$ac++;
-	    }
-	    # sorting through the actions and changing the global database hash
-	    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{'storectr_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'storectr'}+0;
-		    $hash{'storectr'}++;
-		}
-		if ($ahash{$key} eq '0') {
-		    if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
-			delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
-		    }
-		}
-	    }
-	    # deleting the previously cached listing
-	    foreach (keys %hash) {
-		if ($_ =~ /^pre_/ && $_ =~/link$/) {
-		    my $key = $_;
-		    $key =~ s/^pre_//;
-		    $key =~ s/_[^_]*$//;
-		    delete $hash{'pre_'.$key.'_title'};
-		    delete $hash{'pre_'.$key.'_link'};
-		}
-	    }
-	}
-	
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
 	    for (my $i=0; $i<=11; $i++) {
@@ -469,7 +437,10 @@ ENDHEADER
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
 					   'av' => 'All versions',
-					   'ud' => 'Update Display'
+					   'ud' => 'Update Display',
+					   'pr' => 'Problems',
+					   'gr' => 'Graphics',
+					   'at' => 'All types'
 					   );
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
@@ -496,6 +467,12 @@ ENDHEADER
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
+<input type="hidden" name="only" value="" />
+<label><input type="checkbox" name="problem" value="problem" onClick="this.form.only.value += 'problem';this.form.submit();" />$lt{'pr'}</label>
+<label><input type="checkbox" name="graphic" value="gif,jpg,jpeg" onClick="this.form.only.value += ',gif,jpg,jpg';this.form.submit();" />$lt{'gr'}</label>
+<label><input type="checkbox" name="all" value="" onClick="this.form.only.value = '';this.form.submit();" />$lt{'at'}</label>
+
+<br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
@@ -527,8 +504,10 @@ END
 	&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()" />');
+	if ($env{'form.catalogmode'} eq 'import') {
+	    $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());