--- loncom/interface/groupsort.pm	2011/07/04 09:24:58	1.68
+++ loncom/interface/groupsort.pm	2013/08/08 12:08:01	1.68.6.6
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.68 2011/07/04 09:24:58 foxr Exp $
+# $Id: groupsort.pm,v 1.68.6.6 2013/08/08 12:08:01 raeburn Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use GDBM_File;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -152,12 +152,23 @@ sub readfromfile {
 		  &Apache::lonnet::filelocation('',$env{'form.readfile'}));
     } else {
         my $parser = HTML::TokeParser->new(\$cont);
-        my $token;
+        my ($token,$donechk,$allmaps);
+        $allmaps = {};
         while ($token = $parser->get_token) {
 	    if ($token->[0] eq 'S') {
                 if ($token->[1] eq 'resource') {
 		    if ($env{'form.recover'}) {
 			if ($token->[2]->{'type'} ne 'zombie') { next; }
+                        if ($token->[2]->{'src'} =~ /\.(page|sequence)$/) {
+                            if (($env{'request.course.id'}) &&
+                                ($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) {
+                                unless ($donechk) {
+                                    $allmaps = &Apache::loncommon::allmaps_incourse();
+                                    $donechk = 1;
+                                }
+                            }
+                            if ($allmaps->{$token->[2]->{'src'}}) { next; }
+                        }
 		    } else {
 			if ($token->[2]->{'type'} eq 'zombie') { next; }
 		    }
@@ -181,7 +192,6 @@ sub readfromfile {
     }
 }
 
-
 # ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
@@ -329,8 +339,8 @@ END
         if ($env{'form.recover'}) {
 	    $r->print(<<END);
 <input type="button" name="alter" value="$buttontext"
- onClick="finish_import()" />&nbsp;
-<input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
+ onclick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onclick="self.close()" />
 END
 	} else {
         # --- Continue Buttons
@@ -340,12 +350,12 @@ END
 <h2>$lt{'fin'}</h2>
 <div>
 <input type="button" name="alter" value="$lt{'ci'}"
- onClick="window.location='$resurl?inhibitmenu=yes&amp;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?inhibitmenu=yes&amp;catalogmode=import'" />&nbsp;
+ 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()" />
+ onclick="finish_import()" />&nbsp;
+<input type="button" name="alter" value="$lt{'ca'}" onclick="self.close()" />
 </div>
 <br />
 END
@@ -411,7 +421,14 @@ END
 	    $r->print("<td>");
 	    $r->print("<img src='$iconname' />");
 	    $r->print("</td><td>");
-	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
+            if (($env{'form.recover'}) &&
+                ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) {
+                my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'});
+                $r->print($title);
+            } else {
+                $r->print($resource->{'title'});
+            }
+            $r->print($resource->{'notes'}."</td><td>\n");
 	    $r->print($resource->{'url'}."</td>"
                      .&Apache::loncommon::end_data_table_row()
                      ."\n");
@@ -471,7 +488,7 @@ sub select_box {
     my ($total,$sel) = @_;
     my $string;
     $string = '<select name="alt'.$sel.'"';
-    $string .= " onChange='selectchange($sel)'>";
+    $string .= " onchange='selectchange($sel)'>";
     $string .= "<option name='o0' value='0'>".&mt('discard')."</option>";
     for my $cur (1..$total) {
 	$string .= "<option name='o$cur' value='$cur'";