--- rat/lonratedt.pm	2005/04/07 06:56:27	1.65
+++ rat/lonratedt.pm	2005/06/08 17:42:01	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.65 2005/04/07 06:56:27 albertel Exp $
+# $Id: lonratedt.pm,v 1.70 2005/06/08 17:42:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,7 +173,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use File::Copy;
 
-use vars qw(@order @resources @resparms);
+use vars qw(@order @resources @resparms @zombies);
 
 
 # Mapread read maps into global arrays @links and @resources, determines status
@@ -188,9 +188,12 @@ sub mapread {
     undef @resources;
     undef @order;
     undef @resparms;
+    undef @zombies;
+
     @resources=('');
     @order=();
     @resparms=();
+    @zombies=();
 
     my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
     if ($errtext) { return ($errtext,2); }
@@ -199,7 +202,13 @@ sub mapread {
     foreach (split(/\<\&\>/,$outtext)) {
 	my ($command,$number,$content)=split(/\<\:\>/,$_);
         if ($command eq 'objcont') {
-	    $resources[$number]=$content;
+	    my ($title,$src,$ext,$type)=split(/\:/,$content);
+	    if ($ext eq 'cond') { next; }
+	    if ($type ne 'zombie') {
+		$resources[$number]=$content;
+	    } else {
+		$zombies[$number]=$content;
+	    }
         }
         if ($command eq 'objlinks') {
             $links[$number]=$content;
@@ -296,7 +305,10 @@ sub attemptread {
     foreach (split(/\<\&\>/,$outtext)) {
 	my ($command,$number,$content)=split(/\<\:\>/,$_);
         if ($command eq 'objcont') {
-	    $theseres[$number]=$content;
+	    my ($title,$src,$ext,$type)=split(/\:/,$content);
+	    unless ($type eq 'zombie') {
+		$theseres[$number]=$content;
+	    }
         }
         if ($command eq 'objlinks') {
             $links[$number]=$content;
@@ -434,6 +446,22 @@ sub buttons {
     return $output.'</form><hr>';
 }
 
+# ------------------------------------- Revive zombie idx or get unused number
+
+sub getresidx {
+    my $url=shift;
+    my $max=1+($#resources>$#zombies?$#resources:$#zombies);
+    unless ($url) { return $max; }
+    for (my $i=0; $i<=$#zombies; $i++) {
+	my ($title,$src,$ext,$type)=split(/\:/,$zombies[$i]);
+	if ($src eq $url) {
+	    undef $zombies[$i];
+	    return $i;
+	}
+    }
+    return $max;
+}
+
 # ----------------------------------------------------------- Paste into target
 # modifies @order, @resources
 
@@ -446,7 +474,7 @@ sub pastetarget {
             $name=&Apache::lonnet::unescape($name);
             $url=&Apache::lonnet::unescape($url);
             if ($url) {
-	       my $idx=$#resources+1;
+	       my $idx=&getresidx($url);
                $insertorder[$#insertorder+1]=$idx;
                my $ext='false';
                if ($url=~/^http\:\/\//) { $ext='true'; }
@@ -492,7 +520,7 @@ sub startfinish {
    $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
 # Make sure this has at least start and finish
    if ($#order==0) {
-       $resources[$#resources+1]='::false';
+       $resources[&getresidx()]='::false';
        $order[1]=$#resources;
    }
 # Make the last one a finish resource
@@ -536,6 +564,11 @@ sub storemap {
             }
         }
     }
+    for (my $i=0; $i<=$#zombies; $i++) {
+        if (defined($zombies[$i])) {
+	    $output.='<&>objcont<:>'.$i.'<:>'.$zombies[$i];
+        }
+    }
     $output=~s/http\&colon\;\/\///g;
     $env{'form.output'}=$output;
     return 
@@ -733,24 +766,8 @@ sub smpedt {
    }
 # ---------------------------------------------------------- Process form input
 
-   my @importselect=();
-   my @targetselect=();
-   undef @importselect;
-   undef @targetselect;
-   if (defined($env{'form.importsel'})) {
-       if (ref($env{'form.importsel'})) {
-	   @importselect=sort(@{$env{'form.importsel'}});
-       } else {
-           @importselect=($env{'form.importsel'});
-       }
-   }
-   if (defined($env{'form.target'})) {
-       if (ref($env{'form.target'})) {
-	   @targetselect=sort(@{$env{'form.target'}});
-       } else {
-           @targetselect=($env{'form.target'});
-       }
-   }
+   my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
+   my @targetselect=&Apache::loncommon::get_env_multiple('form.target');
 # ============================================================ Process commands
 
    my $targetdetail=$env{'form.targetdetail'};
@@ -1180,11 +1197,7 @@ sub viewmap {
                       '" /></td><td>'.&Apache::lonratsrv::qtescape($title).
                       '</td><td>'.$filename.'</td><td>');
             if ($url) {
-                if (-e $resfilepath) {
-		    $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
-                } else {
-                    $r->print(&mt('unpublished'));
-                }
+		$r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
             }
             $r->print('</td><td>');
             if ($url) {