--- loncom/interface/groupsort.pm 2002/01/17 12:17:50 1.6
+++ loncom/interface/groupsort.pm 2002/05/09 23:07:36 1.9
@@ -2,7 +2,7 @@
# The LON-CAPA group sort handler
# Allows for sorting prior to import into RAT.
#
-# $Id: groupsort.pm,v 1.6 2002/01/17 12:17:50 harris41 Exp $
+# $Id: groupsort.pm,v 1.9 2002/05/09 23:07:36 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,6 +46,9 @@ my $iconpath; # variable to be accessibl
# ---------------------------------------------------------------- Main Handler
sub handler {
my $r = shift;
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['acts','catalogmode','mode']);
# color scheme
my $fileclr = '#ffffe6';
@@ -55,7 +58,38 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
- # output start of web page
+# finish_import looks different for graphical or "simple" RAT
+ my $finishimport='';
+ if ($ENV{'form.mode'} eq 'simple') {
+ $finishimport=(<<ENDSMP);
+function finish_import() {
+ alert("Finishing a simple import");
+}
+ENDSMP
+ } else {
+ $finishimport=(<<ENDADV);
+function finish_import() {
+ var linkflag=false;
+ for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
+ insertRowInLastRow();
+ placeResourceInLastRow(
+ eval("document.forms.groupsort.title"+num+".value"),
+ eval("document.forms.groupsort.filelink"+num+".value"),
+ linkflag
+ );
+ linkflag=true;
+ }
+ opener.editmode=0;
+ opener.notclear=0;
+ opener.linkmode=0;
+ opener.draw();
+ self.close();
+}
+ENDADV
+ }
+
+# output start of web page
+
$r->print(<<END);
<html>
<head>
@@ -75,24 +109,7 @@ function placeResourceInLastRow (title,u
}
opener.linkmode=opener.mostrecent;
}
-function finish_import() {
- var linkflag=false;
- for (var num=0; num<document.forms.groupsort.fnum.value; num++) {
- insertRowInLastRow();
- placeResourceInLastRow(
- eval("document.forms.groupsort.title"+num+".value"),
- eval("document.forms.groupsort.filelink"+num+".value"),
- linkflag
- );
- linkflag=true;
- }
- opener.editmode=0;
- opener.notclear=0;
- opener.linkmode=0;
- opener.infoclear();
- opener.draw();
- self.close();
-}
+$finishimport
function selectchange(val) {
var newval=0+eval("document.forms.groupsort.alt"+val+".selectedIndex");
orderchange(val,newval);
@@ -116,17 +133,7 @@ END
my %shash; # sort order (key is resource location, value is sort order)
my %thash; # title (key is resource location, value is title)
- foreach (split(/&/,$ENV{'QUERY_STRING'})) {
- my ($name, $value) = split(/=/,$_);
- $value =~ tr/+/ /;
- $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
- if ($name eq 'acts') {
- $ENV{'form.'.$name}=$value;
- }
- if ($name eq 'catalogmode') {
- $ENV{'form.'.$name}=$value;
- }
- }
+
my $diropendb;
if ($ENV{'form.catalogmode'} eq 'groupsearch') {
$diropendb =