--- loncom/interface/lonindexer.pm	2007/07/06 08:34:37	1.169
+++ loncom/interface/lonindexer.pm	2007/07/18 13:39:31	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.169 2007/07/06 08:34:37 albertel Exp $
+# $Id: lonindexer.pm,v 1.173 2007/07/18 13:39:31 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);
 
@@ -241,7 +242,7 @@ END
 #
 #
 	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
-                my $location = "/adm/groupsort?catalogmode=import&";
+                my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&";
                 $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
@@ -268,6 +269,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;
@@ -345,7 +349,9 @@ function queue(val) {
 END
 	}
 
+        my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'";
 # ---------------------------------------------------------------- Print Header
+        
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
 $catalogmodefunctions
@@ -387,7 +393,7 @@ function openWindow(url, wdwName, w, h,
     newWin.focus();
 }
 function gothere(val) {
-    window.location=val+'?acts='+document.forms.fileattr.acts.value;
+    window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
 </script>
 ENDHEADER
@@ -397,43 +403,7 @@ ENDHEADER
 						 {'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'};
-		}
-	    }
+	    &Apache::groupsort::update_actions_hash(\%hash);
 	}
 	
 # ---------------------------------- get state of file attributes to be showing
@@ -498,6 +468,7 @@ ENDHEADER
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
 END
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
 # -------------- Filter out sequence containment in crumbs and "recent folders"
 	my $storeuri=$uri;
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
@@ -513,7 +484,7 @@ END
 	if ($reshome) {
 	    $r->print("<font size='+2'><a href='");
 	    if ($env{'form.catalogmode'} eq 'import') {
-		$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
+		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
 	    } else {
 		$r->print($reshome);
 	    }
@@ -524,8 +495,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());
@@ -847,6 +820,7 @@ sub display_line {
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
+	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
 	$r->print ('<input type=hidden name=openuri value="'.
 		   $startdir.'" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />'."\n");
@@ -1000,13 +974,13 @@ sub display_line {
 	$r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
-
 	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
-		   "','previewfile','450','500','no','yes','yes');\"".
+		   "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
 		   " target=\"_self\">$listname</a> ");
-
+	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
 	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
-		   ".meta','metadatafile','500','550','no','yes','no');\" ".
+		   "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
 		   " target=\"_self\">metadata</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
@@ -1069,6 +1043,7 @@ sub display_line {
 	    if($source eq 'open') {
 		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
 		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+		&Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
 		$r->print('<td>'."<a href=\"javascript:openWindow('"
 			  .$quotable_sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
@@ -1266,6 +1241,7 @@ sub begin_form {
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
 	       "\n");
     $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
+    $r->print(&Apache::loncommon::inhibit_menu_check('input'));
     $dnum++;
 }