--- rat/lonratedt.pm 2002/05/21 18:18:07 1.25 +++ rat/lonratedt.pm 2002/08/31 00:42:30 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Edit Handler for RAT Maps # -# $Id: lonratedt.pm,v 1.25 2002/05/21 18:18:07 www Exp $ +# $Id: lonratedt.pm,v 1.34 2002/08/31 00:42:30 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,11 @@ use strict; use Apache::Constants qw(:common); use Apache::lonnet; use Apache::lonratsrv; +use Apache::lonsequence; +use Apache::loncommon; +use File::Copy; -my @order; -my @resources; +use vars qw(@order @resources); # Mapread read maps into global arrays @links and @resources, determines status @@ -67,6 +69,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 +134,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 +319,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'; } @@ -319,7 +330,11 @@ sub startfinish { # ------------------------------------------------------------------- Store map sub storemap { - my $fn=shift; + my $realfn=shift; + my $fn=$realfn.'.tmp'; + unless (-e $fn) { + copy($realfn,$fn); + } &startfinish(); my $output='graphdef<:>no'; my $k=1; @@ -341,23 +356,145 @@ sub storemap { &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,'')); } +sub editscript { + my $mode=shift; + return(<You are working with an unsaved version of your map.
'; + my ($errtext,$fatal)=&mapread($tmpfn,''); + } # ---------------------------------------------------------- Process form input my @importselect=(); 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'})) { @@ -441,7 +578,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).'='. @@ -538,7 +675,11 @@ sub smpedt { # ------------------------------------------------------------ Assemble windows my $idx=-1; - my $importwindow=join("\n",map { + $importdetail='&'.$importdetail; + $importdetail=~s/^\&+/\&/; + my $importwindow= + ''. + join("\n",map { $idx++; if ($_) { my ($name,$url)=split(/\=/,$_); @@ -550,7 +691,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'; } @@ -561,112 +704,14 @@ sub smpedt { } @order); # ----------------------------------------------------- Start simple RAT screen + my $editscript=&editscript('simple'); + my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1); $r->print(< - +$bodytag $buttons $errtext +

$url

@@ -717,10 +763,13 @@ value="Browse"> after selected -
+
$targetmsg + + + - @@ -734,7 +783,7 @@ Copy selected
Paste after selected
-
@@ -764,12 +813,17 @@ ENDNODIR sub viewmap { my ($r,$url,$adv,$errtext)=@_; - $r->print(''.&buttons($adv)); + $r->print(''. + &Apache::loncommon::bodytag('Edit Content of a Map'). + &buttons($adv)); if ($errtext) { $r->print($errtext.'
'); } + my $idx=0; + $r->print('

'.$url.'

'); foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) { if (defined($_)) { + $idx++; my ($title,$url)=split(/\:/,$_); $title=~s/\&colon\;/\:/g; $url=~s/\&colon\;/\:/g; @@ -780,7 +834,7 @@ sub viewmap { } $r->print(&Apache::lonratsrv::qtescape($title)); if ($url) { $r->print(''); } - $r->print('
'); + $r->print('
'); } } $r->print('');