--- rat/lonratedt.pm 2002/05/20 18:54:55 1.22 +++ rat/lonratedt.pm 2002/06/04 13:23:54 1.30 @@ -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.30 2002/06/04 13:23:54 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,10 @@ use strict; use Apache::Constants qw(:common); use Apache::lonnet; use Apache::lonratsrv; +use Apache::lonsequence; -my @order=(); -my @resources=(); +my @order; +my @resources; # Mapread read maps into global arrays @links and @resources, determines status @@ -52,6 +53,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 +91,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 @@ -127,7 +130,9 @@ sub mapread { } # ---------------------------------------------- Read a map as well as possible - +# Also used by the sequence handler +# Call lonsequence::attemptread to read from resource space +# sub attemptread { my $fn=shift; @@ -295,8 +300,8 @@ sub pastetarget { } } } - 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 +313,8 @@ sub startfinish { 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 +338,7 @@ sub storemap { } } } - $output=~s/http\&colon\:\/\///g; + $output=~s/http\&colon\;\/\///g; $ENV{'form.output'}=$output; return &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,'')); @@ -351,16 +356,16 @@ sub smpedt { my @targetselect=(); undef @importselect; undef @targetselect; - if (defined($ENV{'form.import'})) { - if (ref($ENV{'form.import'})) { - @importselect=sort($ENV->{'form.import'}); + if (defined($ENV{'form.importsel'})) { + if (ref($ENV{'form.importsel'})) { + @importselect=sort(@{$ENV{'form.importsel'}}); } else { - @importselect=($ENV{'form.import'}); + @importselect=($ENV{'form.importsel'}); } } 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'}); } @@ -439,7 +444,7 @@ sub smpedt { } foreach ( - &attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { + &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) { my ($name,$url)=split(/\:/,$_); if ($url) { $importdetail.='&'.&Apache::lonnet::escape($name).'='. @@ -459,24 +464,86 @@ 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.importdetail'})); &storemap(&Apache::lonnet::filelocation('',$url)); # ------------------------------------------------------------------------- Cut - } elsif ($ENV{'form.cut'}) { + } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) { + $importdetail=''; + my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + + my $lastsel; + + if (defined($importselect[-1])) { + $lastsel=$importselect[-1]; + } else { + $lastsel=$#curimport; + } + + for (my $i=0;$i<=$lastsel;$i++) { + my ($name,$url)=split(/\=/,$curimport[$i]); + if ($url) { + $importdetail.='&'.$name.'='.$url; + } + } + + foreach (@targetselect) { + my ($name,$url)=split(/\:/,$resources[$order[$_-1]]); + if ($url) { + $importdetail.='&'.&Apache::lonnet::escape($name).'='. + &Apache::lonnet::escape($url); + } + } + + for (my $i=$lastsel+1;$i<=$#curimport;$i++) { + my ($name,$url)=split(/\=/,$curimport[$i]); + if ($url) { + $importdetail.='&'.$name.'='.$url; + } + } + $importdetail=~s/\&+/\&/g; + $importdetail=~s/^\&//; + + if ($ENV{'form.cut'}) { + my @neworder=(); + for (my $i=0;$i<=$#order;$i++) { + my $include=1; + foreach (@targetselect) { + if ($_-1==$i) { $include=0; } + } + if ($include) { $neworder[$#neworder+1]=$order[$i]; } + } + @order=@neworder; + &storemap(&Apache::lonnet::filelocation('',$url)); + } + # ----------------------------------------------------------------------- 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 my $idx=-1; - my $importwindow=join("\n",map { + my $importwindow= + ''. + join("\n",map { $idx++; if ($_) { my ($name,$url)=split(/\=/,$_); @@ -488,7 +555,9 @@ sub smpedt { } split(/\&/,$importdetail)); $idx=0; - my $targetwindow=join("\n",map { + my $targetwindow= + ''. + join("\n",map { my ($name,$url)=split(/\:/,$resources[$_]); unless ($name) { $name=(split(/\//,$url))[-1]; } unless ($name) { $name='EMPTY'; } @@ -621,7 +690,7 @@ function idxcheck(mode) { function viewimport() { openview((document.forms.simpleedit.curimpdetail.value.split('&')) - [document.forms.simpleedit.import.selectedIndex+1]); + [document.forms.simpleedit.importsel.selectedIndex+1]); } @@ -629,6 +698,7 @@ function idxcheck(mode) { $buttons $errtext +

$url

@@ -658,7 +728,7 @@ after selected
- @@ -666,10 +736,13 @@ $importwindow Cut selected


+Copy selected
+

+


Paste after selected
- + -
@@ -703,8 +776,10 @@ sub viewmap { if ($errtext) { $r->print($errtext.'
'); } + my $idx=0; foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) { if (defined($_)) { + $idx++; my ($title,$url)=split(/\:/,$_); $title=~s/\&colon\;/\:/g; $url=~s/\&colon\;/\:/g; @@ -715,7 +790,7 @@ sub viewmap { } $r->print(&Apache::lonratsrv::qtescape($title)); if ($url) { $r->print(''); } - $r->print('
'); + $r->print('
'); } } $r->print('');