--- rat/lonratedt.pm	2002/05/16 21:10:05	1.20
+++ rat/lonratedt.pm	2002/05/21 15:04:10	1.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.20 2002/05/16 21:10:05 www Exp $
+# $Id: lonratedt.pm,v 1.24 2002/05/21 15:04:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,8 +37,8 @@ use Apache::Constants qw(:common);
 use Apache::lonnet;
 use Apache::lonratsrv;
 
-my @order=();
-my @resources=();
+my @order;
+my @resources;
 
 
 # Mapread read maps into global arrays @links and @resources, determines status
@@ -52,6 +52,8 @@ sub mapread {
     undef @links;
     undef @resources;
     undef @order;
+    @resources=('');
+    @order=();
 
     my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
     if ($errtext) { return ($errtext,2); }
@@ -88,7 +90,7 @@ sub mapread {
 	}
 
     }
-    for (my $i=0; $i<=$#resources; $i++) {
+    for (my $i=1; $i<=$#resources; $i++) {
         if (defined($resources[$i])) {
 	    unless (($starters[$i]) || ($endings[$i])) {
                 return
@@ -283,26 +285,66 @@ sub pastetarget {
     foreach (@which) {
         if (defined($_)) {
 	    my ($name,$url)=split(/\=/,$_);
-	    my $idx=$#resources+1;
-            $insertorder[$#insertorder+1]=$idx;
-            my $ext='false';
-            if ($url=~/^http\:\/\//) { $ext='true'; }
-            $resources[$idx]=$name.':'.$url.':normal:'.$ext.':res';
+            $name=&Apache::lonnet::unescape($name);
+            $url=&Apache::lonnet::unescape($url);
+            if ($url) {
+	       my $idx=$#resources+1;
+               $insertorder[$#insertorder+1]=$idx;
+               my $ext='false';
+               if ($url=~/^http\:\/\//) { $ext='true'; }
+               $url=~s/\:/\&colon;/g;
+               $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
+	   }
         }
     }
-    print "insertorder:".join(',',@insertorder).'<br>';
-    print "order:".join(',',@order).'<br>';
-    my @oldorder=splice(@order,$after,$#insertorder+1,@insertorder);
-    print "oldorder:".join(',',@oldorder).'<br>';
-    print "order:".join(',',@order).'<br>';
-    @order=push(@order,@oldorder);
-    print "order:".join(',',@order).'<br>';
+    my @oldorder=splice(@order,$after);
+    @order=(@order,@insertorder,@oldorder);
+}
+
+# ------------------------------------------------ Get start and finish correct
+# modifies @resources
+
+sub startfinish {
+    foreach (@order) {
+	my ($name,$url,$ext)=split(/\:/,$resources[$_]);
+        if ($url=~/http\&colon\:\/\//) { $ext='true'; }
+        $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
+    }
+   my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
+   $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
+   my ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
+   $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
+}
+
+# ------------------------------------------------------------------- Store map
+
+sub storemap {
+    my $fn=shift;
+    &startfinish();
+    my $output='graphdef<:>no';
+    my $k=1;
+    for (my $i=0; $i<=$#order; $i++) {
+        if (defined($resources[$order[$i]])) {
+	    $output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
+        }
+        if (defined($order[$i+1])) {
+	    if (defined($resources[$order[$i+1]])) {
+               $output.='<&>objlinks<:>'.$k.'<:>'.
+		   $order[$i].':'.$order[$i+1].':0';
+	       $k++;
+            }
+        }
+    }
+    $output=~s/http\&colon\;\/\///g;
+    $ENV{'form.output'}=$output;
+    return 
+     &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
 }
 
 # ------------------------------------------------------- Simple edit processor
 
 sub smpedt {
-   my ($r,$errtext)=@_;
+   my ($r,$url,$errtext)=@_;
    my $buttons=&buttons(2);
 
 # ---------------------------------------------------------- Process form input
@@ -313,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'});
        }
@@ -419,17 +461,30 @@ sub smpedt {
 # ------------------------------------------------ Groupimport/search to target
    } elsif ($ENV{'form.importdetail'}) {
        my $lastsel;
-
        if (defined($targetselect[-1])) {
 	   $lastsel=$targetselect[-1];
        } else {
-           $lastsel=$#order;
+           $lastsel=$#order+1;
        }
-       &pastetarget($lastsel,split(/\&/,$ENV{'form.importdata'}));
+       &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
+       &storemap(&Apache::lonnet::filelocation('',$url));
 # ------------------------------------------------------------------------- Cut
    } elsif ($ENV{'form.cut'}) {
 # ----------------------------------------------------------------------- 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
@@ -723,7 +778,7 @@ sub handler {
   if ($ENV{'form.forceadv'}) {
       &ratedt($r,$url);
   } elsif ($ENV{'form.forcesmp'}) {
-      &smpedt($r,$errtext);
+      &smpedt($r,$url,$errtext);
   } else {
       &viewmap($r,$url,$adv,$errtext);
   }