--- loncom/interface/groupsort.pm	2008/09/15 13:22:48	1.62
+++ loncom/interface/groupsort.pm	2012/05/02 19:10:13	1.68.6.1
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.62 2008/09/15 13:22:48 bisitz Exp $
+# $Id: groupsort.pm,v 1.68.6.1 2012/05/02 19:10:13 raeburn Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,8 +86,8 @@ sub update_actions_hash {
 sub readfromdb {
     my ($r,$resources)=@_;
 
-    my $diropendb = 
-       "/home/httpd/perl/tmp/$env{'user.domain'}_$env{'user.name'}_sel_res.db";
+    my $diropendb = LONCAPA::tempdir() .
+       "$env{'user.domain'}_$env{'user.name'}_sel_res.db";
 
 # ----------------------------- diropendb is now the filename of the db to open
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
@@ -191,12 +191,12 @@ sub readfrombookmarks {
     my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
     for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
         if ($bookmarks[$index*2+1]) {
-	    my $url  = $bookmarks[$index*2+1];
-	    my $name = $bookmarks[$index*2];
-	    $name =~ s/^LON\-CAPA\s+//;
+            my $url  = $bookmarks[$index*2+1];
+            my $name = $bookmarks[$index*2];
+            $name =~ s/^LON\-CAPA\s+//;
 
-	    push(@{$resources},{'url' => $url, 'title' => $name});
-	}
+            push(@{$resources},{'url' => $url, 'title' => $name});
+        }
     }
 }
 
@@ -300,13 +300,22 @@ END
     if ($env{'form.readfile'}) {
 	&readfromfile($r,\@resources);
     } elsif ($env{'form.bookmarks'}) {
-	&readfrombookmarks($r,\@resources);
+        &readfrombookmarks($r,\@resources);
     } else {
 	&readfromdb($r,\@resources);
     }
 
     my $ctr = 0;
     my $clen = scalar(@resources);
+    my $title = '';
+    if ($env{'form.recover'}) {
+        $title = 'Recover Removed Resources';
+    } else {
+        $title = 'Sort Imported Resources';
+    }
+    if ($env{'form.bookmarks'}) {
+        $title = 'Import Resources from Bookmarks';
+    }
     if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	my %lt=&Apache::lonlocal::texthash(
 		'fin'=> 'Finalize order of resources',
@@ -314,15 +323,16 @@ END
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
 		're' => 'Recover Checked',
+		'ip' => 'Import Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
 		'pa' => 'Path',
                 'in' => 'Include'
 		);
-	my $title = ($env{'form.recover'}) ? 'Recover Removed Resources'
-                                           : 'Sort Imported Resources';
+
 	$r->print(&Apache::loncommon::start_page($title, $js));
+	$r->print('<h1>'.&mt($title).'</h1>');
 
 	$r->print(<<END);
 <form method='post' action='/adm/groupsort' name='groupsort'
@@ -338,10 +348,14 @@ END
 
         $r->print(&Apache::loncommon::inhibit_menu_check('input'));
         # ---
-    
-        if ($env{'form.recover'}) {
+
+        my $buttontext = $lt{'re'};
+        if ($env{'form.bookmarks'}) {
+            $buttontext = $lt{'ip'}
+        }
+        if ($env{'form.recover'} || $env{'form.bookmarks'}) {
 	    $r->print(<<END);
-<input type="button" name="alter" value="$lt{'re'}"
+<input type="button" name="alter" value="$buttontext"
  onClick="finish_import()" />&nbsp;
 <input type="button" name="alter" value="$lt{'ca'}" onClick="self.close()" />
 END
@@ -363,20 +377,35 @@ END
 <br />
 END
         }
-        $r->print(&Apache::loncommon::start_data_table()
-                 .&Apache::loncommon::start_data_table_header_row());
-	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
-	    $r->print("<th>$lt{'in'}</th>\n");
-	} else { 
-	    $r->print("<th colspan='2'>$lt{'co'}</th>\n"); 
-	}
-	$r->print("<th colspan='2'>$lt{'ti'}</th>\n");
-	$r->print("<th>$lt{'pa'}</th>");
-        $r->print(&Apache::loncommon::end_data_table_header_row()
-                 ."\n");
+
+        # Only display header if content exists
+        if ($clen > 0) {
+            $r->print(&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row());
+            if (($env{'form.readfile'})) { 
+                $r->print("<th>$lt{'in'}</th>\n");
+            } else { 
+                $r->print('<th colspan="2">'.$lt{'co'}.'</th>'."\n"); 
+            }
+            $r->print('<th colspan="2">'.$lt{'ti'}.'</th>'."\n");
+            $r->print("<th>$lt{'pa'}</th>");
+            $r->print(&Apache::loncommon::end_data_table_header_row()."\n");
+        } else {
+            my $errtxt = '';
+            if ($env{'form.recover'}) {
+                $errtxt = 'There are no resources to recover.';
+            } else {
+                $errtxt = 'There are no resources to import.';
+            }
+            if ($env{'form.bookmarks'}) {
+                $errtxt = 'There are no resources in your bookmarks to import.';
+            }
+            $r->print('<p class="LC_info">'.&mt($errtxt).'</p>');
+        }
     } else {
 	$r->print(&Apache::loncommon::start_page(undef,$js,
 						 {'only_body' => 1}));
+#       $r->print('<h1>'.&mt($title).'</h1>');
 	$r->print(<<END);
 <form method='post' action='/adm/groupsort' name='groupsort'
       enctype='application/x-www-form-urlencoded'>
@@ -391,7 +420,7 @@ END
     foreach my $resource (@resources) {
 	$ctr++;
 	my $iconname=&Apache::loncommon::icon($resource->{'url'});
-	if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
+        if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	    $r->print(&Apache::loncommon::start_data_table_row()
                      ."<td>");
             if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
@@ -419,8 +448,10 @@ END
 	} 
     }
     if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
-        $r->print(&Apache::loncommon::end_data_table()
-                 ."</form>");
+        if ($clen > 0) {
+            $r->print(&Apache::loncommon::end_data_table());
+        }
+        $r->print('</form>');
     } else {
 	$r->print(<<END);
 <script type="text/javascript">
@@ -495,3 +526,30 @@ sub checkbox {
 1;
 
 __END__
+
+=pod
+
+=head1 NAME
+
+Apache::groupsort.pm
+
+=head1 SYNOPSIS
+
+Implements a second phase of importing
+multiple resources into the RAT. Allows for
+reordering the sequence of resources
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
+