--- rat/lonratedt.pm	2005/06/08 16:10:01	1.68
+++ rat/lonratedt.pm	2005/06/10 21:45:46	1.74
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.68 2005/06/08 16:10:01 www Exp $
+# $Id: lonratedt.pm,v 1.74 2005/06/10 21:45:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ package Apache::lonratedt;
 
 =head1 NAME
 
-Apache::lonratedt: advanced resource assembly tool
+Apache::lonratedt: simple resource assembly tool
 
 =head1 SYNOPSIS
 
@@ -173,7 +173,7 @@ use Apache::loncommon;
 use Apache::lonlocal;
 use File::Copy;
 
-use vars qw(@order @resources @resparms @zombies %revzombies);
+use vars qw(@order @resources @resparms @zombies);
 
 
 # Mapread read maps into global arrays @links and @resources, determines status
@@ -189,13 +189,11 @@ sub mapread {
     undef @order;
     undef @resparms;
     undef @zombies;
-    undef %revzombies;
 
     @resources=('');
     @order=();
     @resparms=();
     @zombies=();
-    %revzombies=();
 
     my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
     if ($errtext) { return ($errtext,2); }
@@ -205,11 +203,11 @@ sub mapread {
 	my ($command,$number,$content)=split(/\<\:\>/,$_);
         if ($command eq 'objcont') {
 	    my ($title,$src,$ext,$type)=split(/\:/,$content);
+	    if ($ext eq 'cond') { next; }
 	    if ($type ne 'zombie') {
 		$resources[$number]=$content;
 	    } else {
 		$zombies[$number]=$content;
-		$revzombies{$src}=$number;
 	    }
         }
         if ($command eq 'objlinks') {
@@ -448,10 +446,31 @@ sub buttons {
     return $output.'</form><hr>';
 }
 
-# ----------------------------------------------------- Get an unused res index
+# ------------------------------------- Revive zombie idx or get unused number
 
-sub unusedindex {
-    return 1+($#resources>$#zombies?$#resources:$#zombies);
+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;
+}
+
+# --------------------------------------------------------------- Make a zombie
+
+sub makezombie {
+    my $idx=shift;
+    my ($name,$url,$ext)=split(/\:/,$resources[$idx]);
+    my $now=time;
+    $zombies[$idx]=$name.
+	' [('.$now.','.$env{'user.name'}.','.$env{'user.domain'}.')]:'.
+	$url.':'.$ext.':zombie';
 }
 
 # ----------------------------------------------------------- Paste into target
@@ -466,7 +485,7 @@ sub pastetarget {
             $name=&Apache::lonnet::unescape($name);
             $url=&Apache::lonnet::unescape($url);
             if ($url) {
-	       my $idx=&unusedindex();
+	       my $idx=&getresidx($url);
                $insertorder[$#insertorder+1]=$idx;
                my $ext='false';
                if ($url=~/^http\:\/\//) { $ext='true'; }
@@ -512,7 +531,7 @@ sub startfinish {
    $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
 # Make sure this has at least start and finish
    if ($#order==0) {
-       $resources[&unusedindex()]='::false';
+       $resources[&getresidx()]='::false';
        $order[1]=$#resources;
    }
 # Make the last one a finish resource
@@ -556,6 +575,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 
@@ -665,6 +689,14 @@ function idxopen(mode) {
    idx.focus();
 }
 
+// ------------------------------------------------------ Open groupsort window
+function groupopen(url,recover) {
+   var options="scrollbars=1,resizable=1,menubar=0";
+   idxflag=1;
+   idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
+   idx.focus();
+}
+
 // --------------------------------------------------------- Open search window
 function srchopen(mode) {
    var options="scrollbars=1,resizable=1,menubar=0";
@@ -681,6 +713,7 @@ function groupsearch() {
 function groupimport() {
    idxcheck('groupimport');
 }
+
 // ------------------------------------------------------- Do srch status check
 function srchcheck(mode) {
    if (!srch || srch.closed || srchmode!=mode) {
@@ -900,7 +933,11 @@ sub smpedt {
                foreach (@targetselect) {
 		   if ($_-1==$i) { $include=0; }
                }
-               if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+               if ($include) { 
+		   $neworder[$#neworder+1]=$order[$i]; 
+	       } else {
+		   &makezombie($order[$i]);
+	       }
            }
            @order=@neworder;
            &storemap(&Apache::lonnet::filelocation('',$url));      
@@ -1007,6 +1044,7 @@ sub smpedt {
                                       'cs' => 'Cut selected',
                                       'ps' => 'Copy selected',
                                       'pas' => 'Paste after selected',
+                                      'reco' => 'Recover Deleted'
 				      );
    $r->print(<<ENDSMPHEAD);
 <html>
@@ -1086,6 +1124,8 @@ value="Select Map"><input type=submit na
 "javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
 <input type=button onClick=
 "javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;javascript:groupopen('$url',1);" value="$lt{'reco'}">
 $lt{'as'}
 <hr>
 <input type=submit name="moveup" value="$lt{'mu'}">