--- rat/lonratedt.pm 2002/05/18 18:24:34 1.21
+++ rat/lonratedt.pm 2002/05/25 18:50:46 1.29
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.21 2002/05/18 18:24:34 www Exp $
+# $Id: lonratedt.pm,v 1.29 2002/05/25 18:50:46 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,8 +37,8 @@ use Apache::Constants qw(:common);
use Apache::lonnet;
use Apache::lonratsrv;
-my @order=();
-my @resources=();
+my @order;
+my @resources;
# Mapread read maps into global arrays @links and @resources, determines status
@@ -52,6 +52,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 +90,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 +129,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 +299,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
@@ -305,18 +309,44 @@ sub pastetarget {
sub startfinish {
foreach (@order) {
my ($name,$url,$ext)=split(/\:/,$resources[$_]);
+ 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';
}
+# ------------------------------------------------------------------- Store map
+
+sub storemap {
+ my $fn=shift;
+ &startfinish();
+ my $output='graphdef<:>no';
+ my $k=1;
+ for (my $i=0; $i<=$#order; $i++) {
+ if (defined($resources[$order[$i]])) {
+ $output.='<&>objcont<:>'.$order[$i].'<:>'.$resources[$order[$i]];
+ }
+ if (defined($order[$i+1])) {
+ if (defined($resources[$order[$i+1]])) {
+ $output.='<&>objlinks<:>'.$k.'<:>'.
+ $order[$i].':'.$order[$i+1].':0';
+ $k++;
+ }
+ }
+ }
+ $output=~s/http\&colon\;\/\///g;
+ $ENV{'form.output'}=$output;
+ return
+ &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
+}
+
# ------------------------------------------------------- Simple edit processor
sub smpedt {
- my ($r,$errtext)=@_;
+ my ($r,$url,$errtext)=@_;
my $buttons=&buttons(2);
# ---------------------------------------------------------- Process form input
@@ -325,16 +355,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'});
}
@@ -433,24 +463,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'}));
- &startfinish();
+ &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=
+ '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+ join("\n",map {
$idx++;
if ($_) {
my ($name,$url)=split(/\=/,$_);
@@ -462,7 +554,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'; }
@@ -595,7 +689,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>
@@ -603,6 +697,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>
@@ -632,7 +727,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>
@@ -640,10 +735,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>
@@ -677,8 +775,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;
@@ -689,7 +789,7 @@ sub viewmap {
}
$r->print(&Apache::lonratsrv::qtescape($title));
if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print('<br>');
}
}
$r->print('</body></html>');
@@ -738,7 +838,7 @@ sub handler {
if ($ENV{'form.forceadv'}) {
&ratedt($r,$url);
} elsif ($ENV{'form.forcesmp'}) {
- &smpedt($r,$errtext);
+ &smpedt($r,$url,$errtext);
} else {
&viewmap($r,$url,$adv,$errtext);
}