--- loncom/interface/groupsort.pm	2006/06/08 07:20:41	1.42
+++ loncom/interface/groupsort.pm	2007/07/06 08:34:37	1.53
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.42 2006/06/08 07:20:41 www Exp $
+# $Id: groupsort.pm,v 1.53 2007/07/06 08:34:37 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ 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
@@ -64,6 +65,9 @@ sub readfromdb {
 	foreach (sort {$achash{$a} <=> $achash{$b}} (keys %ahash)) {
 	    my $key = $_;
 	    if ($ahash{$key} eq '1') {
+	        if ($hash{'pre_'.$key.'_title'} eq 'Not_retrieved') {
+	            $hash{'pre_'.$key.'_title'} = &Apache::lonnet::gettitle($hash{'pre_'.$key.'_link'});
+	        }
 		$hash{'store_'.$hash{'pre_'.$key.'_link'}} =
 		    $hash{'pre_'.$key.'_title'};
 		$hash{'storectr_'.$hash{'pre_'.$key.'_link'}} =
@@ -174,7 +178,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).', '.
@@ -191,12 +195,32 @@ sub readfromfile {
     return ($shash,$thash);
 }
 
+# --------------------------------------------------------- Read from bookmarks
+
+sub readfrombookmarks {
+    my ($r,$shash,$thash)=@_;
+    my %bookmarks=&Apache::lonnet::dump('bookmarks');
+# the bookmark "hash" is just one entry
+# it's a javascript program code with arguments like ('title','url');
+    my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g);
+    my $order=1;
+    for (my $index=0;$index<($#bookmarks+1)/2;$index++) {
+        if ($bookmarks[$index*2+1]) {
+	    $$thash{$bookmarks[$index*2+1]}=$bookmarks[$index*2];
+	    $$thash{$bookmarks[$index*2+1]}=~s/^LON\-CAPA\s+//;
+	    $$shash{$bookmarks[$index*2+1]}=$order;
+	    $order++;
+	}
+    }
+    return ($shash,$thash);
+}
+
 # ---------------------------------------------------------------- Main Handler
 sub handler {
     my $r = shift;
  
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-				     ['acts','mode','readfile','recover']);
+			     ['acts','mode','readfile','recover','bookmarks']);
     # color scheme
     my $fileclr = '#ffffe6';
     my $titleclr = '#ddffff';
@@ -209,7 +233,7 @@ sub handler {
     my $finishimport='';
     my $begincondition='';
     my $endcondition='';
-    if ($env{'form.readfile'}) {
+    if (($env{'form.readfile'}) || ($env{'form.bookmarks'}))  {
         $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
 	$endcondition='}';
     }
@@ -293,18 +317,21 @@ END
 
     if ($env{'form.readfile'}) {
 	&readfromfile($r,\%shash,\%thash,\%nhash);
+    } elsif ($env{'form.bookmarks'}) {
+	&readfrombookmarks($r,\%shash,\%thash);
     } else {
 	&readfromdb($r,\%shash,\%thash);
     }
 
     my $ctr = 0;
     my $clen = scalar(keys %shash);
-    if (($clen > 1) || ($env{'form.readfile'})) {
+    if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	my %lt=&Apache::lonlocal::texthash(
 		'fin'=> 'Finalize order of resources',
 		'ci' => 'Continue Import',
 		'cs' => 'Continue Search',
 		'fi' => 'Finish Import',
+		're' => 'Recover Checked',
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
@@ -322,27 +349,36 @@ END
 <input type="hidden" name="newval" value="" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />
 <input type="hidden" name="readfile" value="$env{'form.readfile'}" />
+<input type="hidden" name="bookmarks" value="$env{'form.bookmarks'}" />
 <input type="hidden" name="recover" value="$env{'form.recover'}" />
 END
 
+
+        # ---
+    
+        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);
 <input type="button" name="alter" value="$lt{'ci'}"
- onClick="window.location='$resurl'" />&nbsp;
+ onClick="window.location='$resurl?catalogmode=import'" />&nbsp;
 <input type="button" name="altersearch" value="$lt{'cs'}"
- onClick="window.location='/adm/searchcat'" />&nbsp;
-END
-        # ---
-
-	$r->print(<<END);
+ onClick="window.location='/adm/searchcat?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'}) { 
+	if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { 
 	    $r->print("<td bgcolor='$titleclr'><b>$lt{'in'}</b></td>\n");
 	} else { 
 	    $r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n"); 
@@ -365,18 +401,18 @@ END
 	my $key=$_;
 	$ctr++;
 	my $iconname=&Apache::loncommon::icon($key);
-	if (($clen > 1) || ($env{'form.readfile'})) {
+	if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	    $r->print("<tr><td bgcolor='$fileclr'>");
-            if ($env{'form.readfile'}) {
+            if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 		$r->print(&checkbox($ctr-1));
 	    } else {
 		$r->print(&movers($clen,$ctr));
 	    }
 	}
 	$r->print(&hidden($ctr-1,$thash{$key},$key));
-	if (($clen > 1)  || ($env{'form.readfile'})) {
+	if (($clen > 1)  || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	    $r->print("</td>");
-            unless ($env{'form.readfile'}) {
+            unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 		$r->print("<td bgcolor='$fileclr'>".
 			  &select_box($clen,$ctr).
 			  "</td>");
@@ -388,7 +424,7 @@ END
 	    $r->print("$key</td></tr>\n");
 	} 
     }
-    if (($clen > 1) || ($env{'form.readfile'})) {
+    if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) {
 	$r->print("</table></td></tr></table></form>");
     } else {
 	$r->print(<<END);
@@ -408,6 +444,7 @@ sub hidden {
     my ($sel,$title,$filelink) = @_;
     my $string = '<input type="hidden" name="title'.$sel.'" value="'.$title.
 	'" />';
+    $filelink=~s|^/ext/|http://|;
     $string .= '<input type="hidden" name="filelink'.$sel.'" value="'.
 	$filelink.'" />';
     return $string;