--- rat/lonratedt.pm 2002/05/21 15:04:10 1.24
+++ 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.24 2002/05/21 15:04:10 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,28 +356,150 @@ sub storemap {
&Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
}
+sub editscript {
+ my $mode=shift;
+ return(<<ENDSCRIPT);
+var srch;
+var srchflag=-1; // 1 means currently open
+ // 0 means closed (but has been open)
+ // -1 means never yet opened/defined
+var srchmode='';
+
+var idx;
+var idxflag=-1; // 1 means currently open
+ // 0 means closed (but has been open)
+ // -1 means never yet opened/defined
+var idxmode='';
+
+// ------------------------------------------------------ Clears indexer window
+function idxclear() {
+ idx.document.clear();
+}
+
+// ------------------------------------------------------- Clears search window
+function srchclear() {
+ srch.document.clear();
+}
+
+// ------------------------------------------------------ Closes indexer window
+function idxclose() {
+ if (idx && !idx.closed) {
+ idxflag=0;
+ idx.close();
+ }
+}
+
+// ------------------------------------------------------- Closes search window
+function srchclose() {
+ if (srch && !srch.closed) {
+ srchflag=0;
+ srch.close();
+ }
+}
+
+// -------------------------------------------------------- Open indexer window
+function idxopen(mode) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ idxmode=mode;
+ idxflag=1;
+ idx=open("/res/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
+ idx.focus();
+}
+
+// --------------------------------------------------------- Open search window
+function srchopen(mode) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ srchmode=mode;
+ srchflag=1;
+ srch=open("/adm/searchcat?launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
+ srch.focus();
+}
+// ----------------------------------------------------- launch indexer browser
+function groupsearch() {
+ srchcheck('groupsearch');
+}
+
+function groupimport() {
+ idxcheck('groupimport');
+}
+// ------------------------------------------------------- Do srch status check
+function srchcheck(mode) {
+ if (!srch || srch.closed || srchmode!=mode) {
+ srchopen(mode);
+ }
+ srch.focus();
+}
+
+// -------------------------------------------------------- Do idx status check
+function idxcheck(mode) {
+ if (!idx || idx.closed || idxmode!=mode) {
+ idxopen(mode);
+ }
+ idx.focus();
+}
+
+
+ var editbrowser;
+ function openbrowser(formname,elementname,only,omit) {
+ var url = '/res/?';
+ if (editbrowser == null) {
+ url += 'launch=1&';
+ }
+ url += 'catalogmode=interactive&';
+ url += 'mode=edit&';
+ url += 'form=' + formname + '&';
+ if (only != null) {
+ url += 'only=' + only + '&';
+ }
+ if (omit != null) {
+ url += 'omit=' + omit + '&';
+ }
+ url += 'element=' + elementname + '';
+ var title = 'Browser';
+ var options = 'scrollbars=1,resizable=1,menubar=0';
+ options += ',width=700,height=600';
+ editbrowser = open(url,title,options,'1');
+ editbrowser.focus();
+ }
+ENDSCRIPT
+}
# ------------------------------------------------------- Simple edit processor
sub smpedt {
my ($r,$url,$errtext)=@_;
my $buttons=&buttons(2);
-
+ my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp';
+ my $targetmsg='';
+ if ($ENV{'form.save'}) {
+ $targetmsg='<b>Saving ...</b><br>';
+ copy($tmpfn,&Apache::lonnet::filelocation('',$url));
+ unlink($tmpfn);
+ }
+ if ($ENV{'form.revert'}) {
+ $targetmsg='<b>Reverting ...</b><br>';
+ unlink($tmpfn);
+ }
+ if (-e $tmpfn) {
+ $targetmsg=
+ '<b><font color="red">You are working with an unsaved version of your map.</font></b><br>';
+ 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'})) {
if (ref($ENV{'form.target'})) {
- @targetselect=sort(@{ $ENV->{'form.target'} });
+ @targetselect=sort(@{$ENV{'form.target'}});
} else {
@targetselect=($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).'='.
@@ -469,7 +606,55 @@ 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;
@@ -490,7 +675,11 @@ sub smpedt {
# ------------------------------------------------------------ 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(/\=/,$_);
@@ -502,7 +691,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'; }
@@ -513,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(<<ENDSMPHEAD);
<html>
<head>
<script>
-var srch;
-var srchflag=-1; // 1 means currently open
- // 0 means closed (but has been open)
- // -1 means never yet opened/defined
-var srchmode='';
-
-var idx;
-var idxflag=-1; // 1 means currently open
- // 0 means closed (but has been open)
- // -1 means never yet opened/defined
-var idxmode='';
-
-// ------------------------------------------------------ Clears indexer window
-function idxclear() {
- idx.document.clear();
-}
-
-// ------------------------------------------------------- Clears search window
-function srchclear() {
- srch.document.clear();
-}
-
-// ------------------------------------------------------ Closes indexer window
-function idxclose() {
- if (idx && !idx.closed) {
- idxflag=0;
- idx.close();
- }
-}
-
-// ------------------------------------------------------- Closes search window
-function srchclose() {
- if (srch && !srch.closed) {
- srchflag=0;
- srch.close();
- }
-}
-
-// -------------------------------------------------------- Open indexer window
-function idxopen(mode) {
- var options="scrollbars=1,resizable=1,menubar=0";
- idxmode=mode;
- idxflag=1;
- idx=open("/res/?launch=1&mode=simple&catalogmode="+mode,"idxout",options);
- idx.focus();
-}
-
-// --------------------------------------------------------- Open search window
-function srchopen(mode) {
- var options="scrollbars=1,resizable=1,menubar=0";
- srchmode=mode;
- srchflag=1;
- srch=open("/adm/searchcat?launch=1&mode=simple&catalogmode="+mode,"srchout",options);
- srch.focus();
-}
-// ----------------------------------------------------- launch indexer browser
-function groupsearch() {
- srchcheck('groupsearch');
-}
-
-function groupimport() {
- idxcheck('groupimport');
-}
-// ------------------------------------------------------- Do srch status check
-function srchcheck(mode) {
- if (!srch || srch.closed || srchmode!=mode) {
- srchopen(mode);
- }
- srch.focus();
-}
-
-// -------------------------------------------------------- Do idx status check
-function idxcheck(mode) {
- if (!idx || idx.closed || idxmode!=mode) {
- idxopen(mode);
- }
- idx.focus();
-}
-
- var editbrowser;
- function openbrowser(formname,elementname,only,omit) {
- var url = '/res/?';
- if (editbrowser == null) {
- url += 'launch=1&';
- }
- url += 'catalogmode=interactive&';
- url += 'mode=edit&';
- url += 'form=' + formname + '&';
- if (only != null) {
- url += 'only=' + only + '&';
- }
- if (omit != null) {
- url += 'omit=' + omit + '&';
- }
- url += 'element=' + elementname + '';
- var title = 'Browser';
- var options = 'scrollbars=1,resizable=1,menubar=0';
- options += ',width=700,height=600';
- editbrowser = open(url,title,options,'1');
- editbrowser.focus();
- }
+ $editscript
function openview(entry) {
var url=unescape((entry.split('='))[1]);
@@ -630,19 +723,20 @@ function idxcheck(mode) {
function viewtarget() {
openview((document.forms.simpleedit.targetdetail.value.split('&'))
- [document.forms.simpleedit.target.selectedIndex+1]);
+ [document.forms.simpleedit.target.selectedIndex]);
}
function viewimport() {
openview((document.forms.simpleedit.curimpdetail.value.split('&'))
- [document.forms.simpleedit.import.selectedIndex+1]);
+ [document.forms.simpleedit.importsel.selectedIndex]);
}
</script>
</head>
-<body bgcolor='#FFFFFF'>
+$bodytag
$buttons
<font color=red>$errtext</font>
+<h1>$url</h1>
<form name=simpleedit method=post>
<input type=hidden name=forcesmp value=1>
<table>
@@ -669,10 +763,13 @@ value="Browse"><input type=submit name=l
<input type=button onClick=
"javascript:impfortarget.value=1;groupimport();" value="Group Import">
after selected
-<hr><input type=button onClick="javascript:viewtarget()" value="View">
+<hr>$targetmsg
+<input type=submit name="revert" value="Revert to Last Saved">
+<input type=submit name="save" value="Save">
+<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>
@@ -680,10 +777,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>
@@ -713,12 +813,17 @@ ENDNODIR
sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
- $r->print('<html><body bgcolor="#FFFFFF">'.&buttons($adv));
+ $r->print('<html>'.
+ &Apache::loncommon::bodytag('Edit Content of a Map').
+ &buttons($adv));
if ($errtext) {
$r->print($errtext.'<hr>');
}
+ my $idx=0;
+ $r->print('<h1>'.$url.'</h1>');
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
+ $idx++;
my ($title,$url)=split(/\:/,$_);
$title=~s/\&colon\;/\:/g;
$url=~s/\&colon\;/\:/g;
@@ -729,7 +834,7 @@ sub viewmap {
}
$r->print(&Apache::lonratsrv::qtescape($title));
if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print('<br>');
}
}
$r->print('</body></html>');