--- loncom/interface/groupsort.pm	2005/06/10 02:19:51	1.34
+++ loncom/interface/groupsort.pm	2006/02/07 19:46:30	1.39
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.34 2005/06/10 02:19:51 www Exp $
+# $Id: groupsort.pm,v 1.39 2006/02/07 19:46:30 albertel Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -195,12 +195,13 @@ sub cleanup {
 	    &Apache::lonnet::logthis('Failed cleanup groupsort: hash');
         }
     }
+    return OK;
 }
 
 # -------------------------------------------------------------- Read from file
 
 sub readfromfile {
-    my ($r,$shash,$thash)=@_;
+    my ($r,$shash,$thash,$nhash)=@_;
     my $cont=&Apache::lonnet::getfile
 	(&Apache::lonnet::filelocation('',$env{'form.readfile'}));
     if ($cont==-1) {
@@ -209,6 +210,7 @@ sub readfromfile {
     } else {
         my $parser = HTML::TokeParser->new(\$cont);
         my $token;
+	my $n=1;
         while ($token = $parser->get_token) {
 	    if ($token->[0] eq 'S') {
                 if ($token->[1] eq 'resource') {
@@ -217,15 +219,19 @@ sub readfromfile {
 		    } else {
 			if ($token->[2]->{'type'} eq 'zombie') { next; }
 		    }
-                    my $name=$token->[2]->{'title'};
+
 		    my $url=$token->[2]->{'src'};
+                    my $name=$token->[2]->{'title'};
 		    $name=~s/ \[\((\d+)\,(\w+)\,(\w+)\)\]$//;
 		    if ($1) {
-			$name.='<br />'.&mt('Removed by ').
+			$$nhash{$url}='<br />'.&mt('Removed by ').
 			    &Apache::loncommon::plainname($2,$3).', '.
 			    &Apache::lonlocal::locallocaltime($1);
 		    }
-		    $r->print('<br />'.$name);
+		    $name=~s/\&colon\;/\:/g;
+		    $$thash{$url}=$name;
+                    $$shash{$url}=$n;
+                    $n++;
 		}
 	    }
 	}
@@ -249,14 +255,22 @@ sub handler {
 
 # finish_import looks different for graphical or "simple" RAT
     my $finishimport='';
+    my $begincondition='';
+    my $endcondition='';
+    if ($env{'form.readfile'}) {
+        $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {';
+	$endcondition='}';
+    }
     if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') {
         $finishimport=(<<ENDSMP);
 function finish_import() {
     opener.document.forms.simpleedit.importdetail.value='';
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+	$begincondition
 	opener.document.forms.simpleedit.importdetail.value+='&'+
               escape(eval("document.forms.groupsort.title"+num+".value"))+'='+
 	      escape(eval("document.forms.groupsort.filelink"+num+".value"));
+	$endcondition
     }
     opener.document.forms.simpleedit.submit();
     self.close();
@@ -267,6 +281,7 @@ ENDSMP
 function finish_import() {
     var linkflag=false;
     for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+	$begincondition
 	insertRowInLastRow();
 	placeResourceInLastRow(
 	       eval("document.forms.groupsort.title"+num+".value"),
@@ -274,6 +289,7 @@ function finish_import() {
 	       linkflag
 	);
         linkflag=true;
+	$endcondition
     }
     opener.editmode=0;
     opener.notclear=0;
@@ -326,16 +342,17 @@ END
 
     my %shash; # sort order (key is resource location, value is sort order)
     my %thash; # title (key is resource location, value is title)
+    my %nhash; # notes (key is resource location);
 
     if ($env{'form.readfile'}) {
-	&readfromfile($r,\%shash,\%thash);
+	&readfromfile($r,\%shash,\%thash,\%nhash);
     } else {
 	&readfromdb($r,\%shash,\%thash);
     }
 
     my $ctr = 0;
     my $clen = scalar(keys %shash);
-    if ($clen > 1) {
+    if (($clen > 1) || ($env{'form.readfile'})) {
 	my %lt=&Apache::lonlocal::texthash(
 		'fin'=> 'Finalize order of resources',
 		'gb' => 'Go Back',
@@ -344,7 +361,8 @@ END
 		'ca' => 'Cancel',
 		'co' => 'Change Order',
 		'ti' => 'Title',
-		'pa' => 'Path'
+		'pa' => 'Path',
+                'in' => 'Include'
 		);
 	$r->print(&Apache::loncommon::bodytag('Sort Imported Resources'));
 	$r->print(<<END);
@@ -355,6 +373,8 @@ END
 <input type="hidden" name="oldval" value="" />
 <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="recover" value="$env{'form.recover'}" />
 END
 
         # --- Expand here if "GO BACK" button desired
@@ -380,7 +400,11 @@ END
 END
         $r->print("<table border='0'><tr><td bgcolor='#eeeeee'>");
 	$r->print("<table border=0><tr>\n");
-	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'co'}</b></td>\n");
+	if ($env{'form.readfile'}) { 
+	    $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"); 
+	}
 	$r->print("<td colspan='2' bgcolor='$titleclr'><b>$lt{'ti'}</b></td>\n");
 	$r->print("<td bgcolor='$titleclr'><b>$lt{'pa'}</b></td></tr>\n");
     } else {
@@ -398,22 +422,30 @@ END
 	my $key=$_;
 	$ctr++;
 	my $iconname=&Apache::loncommon::icon($key);
-	if ($clen > 1) {
+	if (($clen > 1) || ($env{'form.readfile'})) {
 	    $r->print("<tr><td bgcolor='$fileclr'>");
-	    $r->print(&movers($clen,$ctr));
+            if ($env{'form.readfile'}) {
+		$r->print(&checkbox($ctr-1));
+	    } else {
+		$r->print(&movers($clen,$ctr));
+	    }
 	}
 	$r->print(&hidden($ctr-1,$thash{$key},$key));
-	if ($clen > 1) {
-	    $r->print("</td><td bgcolor='$fileclr'>");
-	    $r->print(&select_box($clen,$ctr));
-	    $r->print("</td><td bgcolor='$fileclr'>");
+	if (($clen > 1)  || ($env{'form.readfile'})) {
+	    $r->print("</td>");
+            unless ($env{'form.readfile'}) {
+		$r->print("<td bgcolor='$fileclr'>".
+			  &select_box($clen,$ctr).
+			  "</td>");
+	    }
+	    $r->print("<td bgcolor='$fileclr'>");
 	    $r->print("<img src='$iconname' />");
 	    $r->print("</td><td bgcolor='$fileclr'>");
-	    $r->print("$thash{$key}</td><td bgcolor='$fileclr'>\n");
+	    $r->print("$thash{$key}$nhash{$key}</td><td bgcolor='$fileclr'>\n");
 	    $r->print("$key</td></tr>\n");
 	} 
     }
-    if ($clen > 1) {
+    if (($clen > 1) || ($env{'form.readfile'})) {
 	$r->print("</table></td></tr></table></form>");
     } else {
 	$r->print(<<END);
@@ -465,7 +497,7 @@ sub select_box {
     my $string;
     $string = '<select name="alt'.$sel.'"';
     $string .= " onChange='selectchange($sel)'>";
-    $string .= "<option name='o0' value='0'>remove</option>";
+    $string .= "<option name='o0' value='0'>".&mt('discard')."</option>";
     for my $cur (1..$total) {
 	$string .= "<option name='o$cur' value='$cur'";
 	if ($cur == $sel) {
@@ -477,6 +509,15 @@ sub select_box {
     return $string;
 }
 
+# ------------------------------------------------------------------- Checkbox
+
+sub checkbox {
+    my $sel=shift;
+    return "<label><input type='checkbox' name='include$sel'".
+       ($env{"form.include$sel"}?' checked="checked"':'').
+       ' />'.&mt('Include').'</label>';
+}
+
 1;
 
 __END__