--- rat/lonratedt.pm 2005/06/08 16:35:46 1.69 +++ 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.69 2005/06/08 16:35:46 www 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 @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); } @@ -210,7 +208,6 @@ sub mapread { $resources[$number]=$content; } else { $zombies[$number]=$content; - $revzombies{$src}=$number; } } if ($command eq 'objlinks') { @@ -449,10 +446,20 @@ sub buttons { return $output.'
'; } -# ----------------------------------------------------- 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; } # ----------------------------------------------------------- Paste into target @@ -467,7 +474,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'; } @@ -513,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[&unusedindex()]='::false'; + $resources[&getresidx()]='::false'; $order[1]=$#resources; } # Make the last one a finish resource