[LON-CAPA-cvs] cvs: rat / lonratedt.pm

[www]

www		Tue May 21 09:41:13 2002 EDT

  Modified files:              
    /rat	lonratedt.pm 
  Log:
  Group import seems to work now.
  
  
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.22 rat/lonratedt.pm:1.23
--- rat/lonratedt.pm:1.22	Mon May 20 14:54:55 2002
+++ rat/lonratedt.pm	Tue May 21 09:41:13 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.22 2002/05/20 18:54:55 www Exp $
+# $Id: lonratedt.pm,v 1.23 2002/05/21 13:41:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,8 +37,8 @@
 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 @@
     undef @links;
     undef @resources;
     undef @order;
+    @resources=('');
+    @order=();
 
     my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
     if ($errtext) { return ($errtext,2); }
@@ -88,7 +90,7 @@
 	}
 
     }
-    for (my $i=0; $i<=$#resources; $i++) {
+    for (my $i=1; $i<=$#resources; $i++) {
         if (defined($resources[$i])) {
 	    unless (($starters[$i]) || ($endings[$i])) {
                 return
@@ -295,8 +297,8 @@
 	   }
         }
     }
-    my @oldorder=splice(@order,$after,$#insertorder+1,@insertorder);
-    @order=(@order,@oldorder);
+    my @oldorder=splice(@order,$after);
+    @order=(@order,@insertorder,@oldorder);
 }
 
 # ------------------------------------------------ Get start and finish correct
@@ -308,8 +310,8 @@
         if ($url=~/http\&colon\:\/\//) { $ext='true'; }
         $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
     }
-   my ($name,$url,$ext)=split(/\:/,$resources[0]);
-   $resources[0]=$name.':'.$url.':'.$ext.':start: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';
 }
@@ -333,7 +335,7 @@
             }
         }
     }
-    $output=~s/http\&colon\:\/\///g;
+    $output=~s/http\&colon\;\/\///g;
     $ENV{'form.output'}=$output;
     return 
      &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
@@ -459,11 +461,10 @@
 # ------------------------------------------------ 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.importdetail'}));
        &storemap(&Apache::lonnet::filelocation('',$url));