--- loncom/interface/groupsort.pm	2006/07/28 20:01:26	1.47
+++ loncom/interface/groupsort.pm	2007/07/11 23:53:59	1.56
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.47 2006/07/28 20:01:26 www Exp $
+# $Id: groupsort.pm,v 1.56 2007/07/11 23:53:59 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,11 +37,50 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
 
 
+sub update_actions_hash {
+    my ($hash) = @_;
+    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 my $key (keys(%{ $hash })) {
+	next if ($key !~ /^pre_(\d+)_link/);
+	my $which = $1;
+	delete($hash->{'pre_'.$which.'_title'});
+	delete($hash->{'pre_'.$which.'_link'});
+    }
+}
+
 sub readfromdb {
     my ($r,$shash,$thash)=@_;
 
@@ -50,32 +89,8 @@ sub readfromdb {
 
 # ----------------------------- diropendb is now the filename of the db to open
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
-	my $acts = $env{'form.acts'};
-	my @Acts = split(/b/,$acts);
-	my %ahash;
-	my %achash;
-	my $ac = 0;
-	foreach (@Acts) {
-	    my ($state,$ref) = split(/a/);
-	    $ahash{$ref} = $state;
-	    $achash{$ref} = $ac;
-	    $ac++;
-	}
-	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
-	    my $key = $_;
-	    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'}};
-		}
-	    }
-	}
+	&update_actions_hash(\%hash);
+
 	foreach (keys %hash) {
 	    if ($_ =~ /^store_/) {
 		my $key = $_;
@@ -174,7 +189,7 @@ sub readfromfile {
 
 		    my $url=$token->[2]->{'src'};
                     my $name=$token->[2]->{'title'};
-		    $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
+		    $name=~s/ \[\((\d+)\,($LONCAPA::username_re)\,($LONCAPA::domain_re)\)\]$//;
 		    if ($1) {
 			$$nhash{$url}='<br />'.&mt('Removed by ').
 			    &Apache::loncommon::plainname($2,$3).', '.
@@ -327,16 +342,18 @@ END
 		'ci' => 'Continue Import',
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
+		're' => 'Recover Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
 		'pa' => 'Path',
                 'in' => 'Include'
 		);
-	$r->print(&Apache::loncommon::start_page('Sort Imported Resources',
-						 $js));
+	my $title = ($env{'form.recover'}) ? 'Recover Removed Resources'
+                                           : 'Sort Imported Resources';
+	$r->print(&Apache::loncommon::start_page($title, $js));
+
 	$r->print(<<END);
-<b><font color="#888888">$lt{'fin'}</font></b>
 <form method='post' action='/adm/groupsort' name='groupsort'
       enctype='application/x-www-form-urlencoded'>
 <input type="hidden" name="fnum" value="$clen" />
@@ -348,21 +365,30 @@ END
 <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END
 
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+        # ---
+    
+        if ($env{'form.recover'}) {
+	    $r->print(<<END);
+<input type="button" name="alter" value="$lt{'re'}"
+ onClick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+END
+	} else {
         # --- Continue Buttons
-        my $resurl = &Apache::loncommon::lastresurl();
-        $r->print(<<END);
+	    my $resurl = 
+		&Apache::loncommon::escape_single(&Apache::loncommon::lastresurl());
+	    $r->print(<<END);
+<b><font color="#888888">$lt{'fin'}</font></b>
 <input type="button" name="alter" value="$lt{'ci'}"
- onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
+ onClick="window.location='$resurl?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
- onClick="window.location='/adm/searchcat?catalogmode=import'" />&nbsp;
-END
-        # ---
-
-	$r->print(<<END);
+ onClick="window.location='/adm/searchcat?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
 <input type="button" name="alter" value="$lt{'fi'}"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
+        }
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
 	$r->print("<table border=0><tr>\n");
 	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
@@ -383,6 +409,8 @@ END
 <input type="hidden" name="newval" value="" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />
 END
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+
     }
     foreach (sort {$shash{$a}<=>$shash{$b}} (keys %shash)) {
 	my $key=$_;
@@ -431,7 +459,7 @@ sub hidden {
     my ($sel,$title,$filelink) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
 	'" />';
-    $filelink=~s/^\/ext\//http\:\/\//;
+    $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
 	$filelink.'" />';
     return $string;