--- rat/lonratedt.pm 2002/05/21 13:41:13 1.23
+++ rat/lonratedt.pm 2002/09/04 19:11:24 1.31.2.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.23 2002/05/21 13:41:13 www Exp $
+# $Id: lonratedt.pm,v 1.31.2.2 2002/09/04 19:11:24 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,9 +36,9 @@ use strict;
use Apache::Constants qw(:common);
use Apache::lonnet;
use Apache::lonratsrv;
+use Apache::lonsequence;
-my @order;
-my @resources;
+use vars qw(@order @resources);
# Mapread read maps into global arrays @links and @resources, determines status
@@ -67,6 +67,9 @@ sub mapread {
if ($command eq 'objlinks') {
$links[$number]=$content;
}
+ if ($command eq 'objparms') {
+ return('Map has resource parameters. Use advanced editor.',1);
+ }
}
# ------------------------------------------------------- Is this a linear map?
my @starters=();
@@ -129,7 +132,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;
@@ -312,6 +317,10 @@ sub startfinish {
}
my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
$resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
+ if ($#order==0) {
+ $resources[$#resources+1]='::false';
+ $order[1]=$#resources;
+ }
my ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
$resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
}
@@ -353,16 +362,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'});
}
@@ -441,7 +450,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).'='.
@@ -469,15 +478,80 @@ sub smpedt {
&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 {
+ $importdetail='&'.$importdetail;
+ $importdetail=~s/^\&+/\&/;
+ my $importwindow=
+ '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+ join("\n",map {
$idx++;
if ($_) {
my ($name,$url)=split(/\=/,$_);
@@ -489,7 +563,9 @@ sub smpedt {
} split(/\&/,$importdetail));
$idx=0;
- my $targetwindow=join("\n",map {
+ my $targetwindow=
+ '<option value="0"> ------- Target Edit Map ------- </option>'.
+ join("\n",map {
my ($name,$url)=split(/\:/,$resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
@@ -622,7 +698,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]);
}
</script>
@@ -630,6 +706,7 @@ function idxcheck(mode) {
<body bgcolor='#FFFFFF'>
$buttons
<font color=red>$errtext</font>
+<h1>$url</h1>
<form name=simpleedit method=post>
<input type=hidden name=forcesmp value=1>
<table>
@@ -659,7 +736,7 @@ after selected
<hr><input type=button onClick="javascript:viewtarget()" value="View">
</td></tr>
-<tr><td bgcolor="#FFFFCC"><select name="import" multiple>
+<tr><td bgcolor="#FFFFCC"><select name="importsel" size=10 multiple>
$importwindow
</select>
</td>
@@ -667,10 +744,13 @@ $importwindow
Cut selected<br>
<input type=submit name=cut value='<<<'><p>
<hr>
+Copy selected<br>
+<input type=submit name=copy value='<--'><p>
+<hr>
Paste after selected<br>
-<input type=submit name=paste value='>>>'>
+<input type=submit name=paste value='-->'>
</td>
-<td bgcolor="#FFFFCC"><select name="target" multiple>
+<td bgcolor="#FFFFCC"><select name="target" size=10 multiple>
$targetwindow
</select>
</table>
@@ -704,8 +784,10 @@ sub viewmap {
if ($errtext) {
$r->print($errtext.'<hr>');
}
+ my $idx=0;
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
+ $idx++;
my ($title,$url)=split(/\:/,$_);
$title=~s/\&colon\;/\:/g;
$url=~s/\&colon\;/\:/g;
@@ -716,7 +798,7 @@ sub viewmap {
}
$r->print(&Apache::lonratsrv::qtescape($title));
if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print('<br>');
}
}
$r->print('</body></html>');