--- rat/lonratedt.pm 2002/05/21 13:41:13 1.23
+++ rat/lonratedt.pm 2002/05/21 18:18:07 1.25
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.23 2002/05/21 13:41:13 www Exp $
+# $Id: lonratedt.pm,v 1.25 2002/05/21 18:18:07 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -355,14 +355,14 @@ sub smpedt {
undef @targetselect;
if (defined($ENV{'form.import'})) {
if (ref($ENV{'form.import'})) {
- @importselect=sort($ENV->{'form.import'});
+ @importselect=sort(@{$ENV{'form.import'}});
} else {
@importselect=($ENV{'form.import'});
}
}
if (defined($ENV{'form.target'})) {
if (ref($ENV{'form.target'})) {
- @targetselect=sort($ENV->{'form.target'});
+ @targetselect=sort(@{$ENV{'form.target'}});
} else {
@targetselect=($ENV{'form.target'});
}
@@ -469,9 +469,70 @@ sub smpedt {
&pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
&storemap(&Apache::lonnet::filelocation('',$url));
# ------------------------------------------------------------------------- Cut
- } elsif ($ENV{'form.cut'}) {
+ } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) {
+ $importdetail='';
+ my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+
+ my $lastsel;
+
+ if (defined($importselect[-1])) {
+ $lastsel=$importselect[-1];
+ } else {
+ $lastsel=$#curimport;
+ }
+
+ for (my $i=0;$i<=$lastsel;$i++) {
+ my ($name,$url)=split(/\=/,$curimport[$i]);
+ if ($url) {
+ $importdetail.='&'.$name.'='.$url;
+ }
+ }
+
+ foreach (@targetselect) {
+ my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
+ if ($url) {
+ $importdetail.='&'.&Apache::lonnet::escape($name).'='.
+ &Apache::lonnet::escape($url);
+ }
+ }
+
+ for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
+ my ($name,$url)=split(/\=/,$curimport[$i]);
+ if ($url) {
+ $importdetail.='&'.$name.'='.$url;
+ }
+ }
+ $importdetail=~s/\&+/\&/g;
+ $importdetail=~s/^\&//;
+
+ if ($ENV{'form.cut'}) {
+ my @neworder=();
+ for (my $i=0;$i<=$#order;$i++) {
+ my $include=1;
+ foreach (@targetselect) {
+ if ($_-1==$i) { $include=0; }
+ }
+ if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+ }
+ @order=@neworder;
+ &storemap(&Apache::lonnet::filelocation('',$url));
+ }
+
# ----------------------------------------------------------------------- Paste
} elsif ($ENV{'form.paste'}) {
+ my $lastsel;
+ if (defined($targetselect[-1])) {
+ $lastsel=$targetselect[-1];
+ } else {
+ $lastsel=$#order+1;
+ }
+ my @newsequence;
+ my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ foreach (@importselect) {
+ $newsequence[$#newsequence+1]=$curimport[$_];
+ }
+ &pastetarget($lastsel,@newsequence);
+ &storemap(&Apache::lonnet::filelocation('',$url));
# ------------------------------------------------
}
# ------------------------------------------------------------ Assemble windows
@@ -667,8 +728,11 @@ $importwindow
Cut selected
+