--- rat/lonratedt.pm 2002/05/13 19:23:52 1.13
+++ rat/lonratedt.pm 2002/09/02 15:27:08 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.13 2002/05/13 19:23:52 www Exp $
+# $Id: lonratedt.pm,v 1.35 2002/09/02 15:27:08 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
@@ -52,6 +54,8 @@ sub mapread {
undef @links;
undef @resources;
undef @order;
+ @resources=('');
+ @order=();
my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
if ($errtext) { return ($errtext,2); }
@@ -65,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=();
@@ -88,7 +95,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
@@ -126,6 +133,119 @@ sub mapread {
return $errtext;
}
+# ---------------------------------------------- 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;
+
+ my @links;
+ undef @links;
+ my @theseres;
+ undef @theseres;
+
+ my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
+ if ($errtext) { return @theseres }
+
+# -------------------------------------------------------------------- Read map
+ foreach (split(/\<\&\>/,$outtext)) {
+ my ($command,$number,$content)=split(/\<\:\>/,$_);
+ if ($command eq 'objcont') {
+ $theseres[$number]=$content;
+ }
+ if ($command eq 'objlinks') {
+ $links[$number]=$content;
+ }
+ }
+
+# --------------------------------------------------------------- Sort, sort of
+
+ my @objsort=();
+ undef @objsort;
+
+ my @data1=();
+ my @data2=();
+ undef @data1;
+ undef @data2;
+
+ my $k;
+ my $kj;
+ my $j;
+ my $ij;
+
+ for ($k=1;$k<=$#theseres;$k++) {
+ if (defined($theseres[$k])) {
+ $objsort[$#objsort+1]=$k;
+ }
+ }
+
+ for ($k=1;$k<=$#links;$k++) {
+ if (defined($links[$k])) {
+ @data1=split(/\:/,$links[$k]);
+ $kj=-1;
+ for (my $j=0;$j<=$#objsort;$j++) {
+ if ((split(/\:/,$objsort[$j]))[0]==$data1[0]) {
+ $kj=$j;
+ }
+ }
+ if ($kj!=-1) { $objsort[$kj].=':'.$data1[1]; }
+ }
+ }
+ for ($k=0;$k<=$#objsort;$k++) {
+ for ($j=0;$j<=$#objsort;$j++) {
+ if ($k!=$j) {
+ @data1=split(/\:/,$objsort[$k]);
+ @data2=split(/\:/,$objsort[$j]);
+ my $dol=$#data1+1;
+ my $dtl=$#data2+1;
+ if ($dol+$dtl<1000) {
+ for ($kj=1;$kj<$dol;$kj++) {
+ if ($data1[$kj]==$data2[0]) {
+ for ($ij=1;$ij<$dtl;$ij++) {
+ $data1[$#data1+1]=$data2[$ij];
+ }
+ }
+ }
+ for ($kj=1;$kj<$dtl;$kj++) {
+ if ($data2[$kj]==$data1[0]) {
+ for ($ij=1;$ij<$dol;$ij++) {
+ $data2[$#data2+1]=$data1[$ij];
+ }
+ }
+ }
+ $objsort[$k]=join(':',@data1);
+ $objsort[$j]=join(':',@data2);
+ }
+ }
+ }
+ }
+# ---------------------------------------------------------------- Now sort out
+
+ @objsort=sort {
+ my @data1=split(/\:/,$a);
+ my @data2=split(/\:/,$b);
+ my $rvalue=0;
+ my $k;
+ for ($k=1;$k<=$#data1;$k++) {
+ if ($data1[$k]==$data2[0]) { $rvalue--; }
+ }
+ for ($k=1;$k<=$#data2;$k++) {
+ if ($data2[$k]==$data1[0]) { $rvalue++; }
+ }
+ if ($rvalue==0) { $rvalue=$#data2-$#data1; }
+ $rvalue;
+ } @objsort;
+
+ my @outres=();
+ undef @outres;
+
+ for ($k=0;$k<=$#objsort;$k++) {
+ $outres[$k]=$theseres[(split(/\:/,$objsort[$k]))[0]];
+ }
+ return @outres;
+}
+
# --------------------------------------------------------- Build up RAT screen
sub ratedt {
my ($r,$url)=@_;
@@ -163,99 +283,88 @@ sub buttons {
return $output.'</form><hr>';
}
-sub smpedt {
- my ($r,$errtext)=@_;
- my $buttons=&buttons(2);
-
-# ---------------------------------------------------------- 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'});
- } else {
- @importselect=($ENV{'form.import'});
- }
- }
- if (defined($ENV{'form.target'})) {
- if (ref($ENV{'form.target'})) {
- @targetselect=sort($ENV->{'form.target'});
- } else {
- @targetselect=($ENV{'form.target'});
- }
- }
-# ============================================================ Process commands
-
- my $targetdetail='';
- my $importdetail='';
-
-# ---------------------------------------------------- Importing from groupsort
- if ($ENV{'form.importdetail'}) {
-
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
-
- my $lastsel;
-
- if (defined($importselect[-1])) {
- $lastsel=$importselect[-1];
- } else {
- $lastsel=$#curimport;
- }
+# ----------------------------------------------------------- Paste into target
+# modifies @order, @resources
- for (my $i=0;$i<=$lastsel;$i++) {
- my ($name,$url)=split(/\=/,$curimport[$i]);
- if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+sub pastetarget {
+ my ($after,@which)=@_;
+ my @insertorder=();
+ foreach (@which) {
+ if (defined($_)) {
+ my ($name,$url)=split(/\=/,$_);
+ $name=&Apache::lonnet::unescape($name);
+ $url=&Apache::lonnet::unescape($url);
+ if ($url) {
+ my $idx=$#resources+1;
+ $insertorder[$#insertorder+1]=$idx;
+ my $ext='false';
+ if ($url=~/^http\:\/\//) { $ext='true'; }
+ $url=~s/\:/\:/g;
+ $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
}
- }
-
- $importdetail.='&'.$ENV{'form.importdetail'};
+ }
+ }
+ my @oldorder=splice(@order,$after);
+ @order=(@order,@insertorder,@oldorder);
+}
- for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
- my ($name,$url)=split(/\=/,$curimport[$i]);
- if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
- }
- }
- $importdetail=~s/\&+/\&/g;
- $importdetail=~s/^\&//;
+# ------------------------------------------------ Get start and finish correct
+# modifies @resources
-# --------------------------------------------------------
+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[$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';
+}
-# ------------------------------------------------------------ Assemble windows
-
- my $idx=-1;
- my $importwindow=join("\n",map {
- $idx++;
- if ($_) {
- my ($name)=split(/\=/,$_);
- unless ($name) { $name='UNKNOWN'; }
- '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
- '</option>';
- }
- } split(/\&/,$importdetail));
+# ------------------------------------------------------------------- Store map
- $idx=0;
- my $targetwindow=join("\n",map {
- my ($name,$url)=split(/\:/,$resources[$_]);
- unless ($name) { $name='UNKNOWN'; }
- $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
- $idx++;
- '<option value="'.$idx.'_'.$_.'">'.$name.'</option>';
- } @order);
+sub storemap {
+ my $realfn=shift;
+ my $fn=$realfn;
+# unless this is forced to work from the original file, use a temporary file
+# instead
+ unless (shift) {
+ $fn=$realfn.'.tmp';
+ unless (-e $fn) {
+ copy($realfn,$fn);
+ }
+ }
+# store data either into tmp or real file
+ &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,''));
+}
-# ----------------------------------------------------- Start simple RAT screen
- $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
+sub editscript {
+ my $mode=shift;
+ return(<<ENDSCRIPT);
var srch;
var srchflag=-1; // 1 means currently open
// 0 means closed (but has been open)
@@ -299,7 +408,7 @@ 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=open("/res/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
idx.focus();
}
@@ -308,7 +417,7 @@ 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=open("/adm/searchcat?launch=1&mode=$mode&catalogmode="+mode,"srchout",options);
srch.focus();
}
// ----------------------------------------------------- launch indexer browser
@@ -334,11 +443,310 @@ function idxcheck(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);
+ my ($errtext,$fatal)=
+ &mapread(&Apache::lonnet::filelocation('',$url),'');
+ }
+ if ($ENV{'form.revert'}) {
+ $targetmsg='<b>Reverting ...</b><br>';
+ unlink($tmpfn);
+ my ($errtext,$fatal)=
+ &mapread(&Apache::lonnet::filelocation('',$url),'');
+ }
+ 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.importsel'})) {
+ if (ref($ENV{'form.importsel'})) {
+ @importselect=sort(@{$ENV{'form.importsel'}});
+ } else {
+ @importselect=($ENV{'form.importsel'});
+ }
+ }
+ if (defined($ENV{'form.target'})) {
+ if (ref($ENV{'form.target'})) {
+ @targetselect=sort(@{$ENV{'form.target'}});
+ } else {
+ @targetselect=($ENV{'form.target'});
+ }
+ }
+# ============================================================ Process commands
+
+ my $targetdetail=$ENV{'form.targetdetail'};
+ my $importdetail=$ENV{'form.curimpdetail'};
+
+# ---------------------------------------------------- Importing from groupsort
+ if (($ENV{'form.importdetail'}) && (!$ENV{'form.impfortarget'})) {
+
+ $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;
+ }
+ }
+
+ $importdetail.='&'.$ENV{'form.importdetail'};
+
+ for (my $i=$lastsel+1;$i<=$#curimport;$i++) {
+ my ($name,$url)=split(/\=/,$curimport[$i]);
+ if ($url) {
+ $importdetail.='&'.$name.'='.$url;
+ }
+ }
+ $importdetail=~s/\&+/\&/g;
+ $importdetail=~s/^\&//;
+
+# ------------------------------------------------------------------- Clear all
+ } elsif ($ENV{'form.clear'}) {
+ $importdetail='';
+# ------------------------------------------------------------ Discard selected
+ } elsif ($ENV{'form.discard'}) {
+ $importdetail='';
+ my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+ foreach (@importselect) {
+ $curimport[$_]='';
+ }
+ for (my $i=0;$i<=$#curimport;$i++) {
+ my ($name,$url)=split(/\=/,$curimport[$i]);
+ if ($url) {
+ $importdetail.='&'.$name.'='.$url;
+ }
+ }
+# --------------------------------------------------------- Loading another map
+ } elsif ($ENV{'form.loadmap'}) {
+ $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 (
+ &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
+ my ($name,$url)=split(/\:/,$_);
+ 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/^\&//;
+
+# ------------------------------------------------ Groupimport/search to target
+ } elsif ($ENV{'form.importdetail'}) {
+ my $lastsel;
+ if (defined($targetselect[-1])) {
+ $lastsel=$targetselect[-1];
+ } else {
+ $lastsel=$#order+1;
+ }
+ &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'}));
+ &storemap(&Apache::lonnet::filelocation('',$url));
+# ------------------------------------------------------------------------- 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;
+ $importdetail='&'.$importdetail;
+ $importdetail=~s/^\&+/\&/;
+ my $importwindow=
+ '<option value="-1"> ---- Import and Paste Area ---- </option>'.
+ join("\n",map {
+ $idx++;
+ if ($_) {
+ my ($name,$url)=split(/\=/,$_);
+ unless ($name) { $name=(split(/\//,$url))[-1]; }
+ unless ($name) { $name='EMPTY'; }
+ '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
+ '</option>';
+ }
+ } split(/\&/,$importdetail));
+
+ $idx=0;
+ 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'; }
+ $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
+ &Apache::lonnet::escape($url);
+ $idx++;
+ '<option value="'.$idx.'">'.$name.'</option>';
+ } @order);
+
+# ----------------------------------------------------- Start simple RAT screen
+ my $editscript=&editscript('simple');
+ my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
+ $r->print(<<ENDSMPHEAD);
+<html>
+<head>
+<script>
+
+ $editscript
+
+ function openview(entry) {
+ var url=unescape((entry.split('='))[1]);
+ var parts=new Array;
+ parts=url.split(':');
+ url=parts.join(':');
+ if (url) { open(url,'cat'); }
+ }
+
+ function viewtarget() {
+ openview((document.forms.simpleedit.targetdetail.value.split('&'))
+ [document.forms.simpleedit.target.selectedIndex]);
+ }
+
+ function viewimport() {
+ openview((document.forms.simpleedit.curimpdetail.value.split('&'))
+ [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>
@@ -348,11 +756,30 @@ $buttons
<tr><td bgcolor="#FFFFCC">
<input type=button onClick="javascript:groupsearch()" value="Group Search">
<input type=button onClick="javascript:groupimport();" value="Group Import">
+after selected
+<hr>
+<input type=text size=20 name=importmap>
+<input type=button
+onClick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
+value="Browse"><input type=submit name=loadmap value="Load Map"><hr>
+<input type=submit name="discard" value="Discard Selected">
+<input type=submit name="clear" value="Clear All">
<input type=button onClick="javascript:viewimport()" value="View">
+
</td><td> </td><td bgcolor="#FFFFCC">
+
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupsearch()" value="Group Search">
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupimport();" value="Group Import">
+after selected
+<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>
@@ -360,16 +787,20 @@ $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>
<input type=hidden name=importdetail value="">
<input type=hidden name=curimpdetail value="$importdetail">
<input type=hidden name=targetdetail value="$targetdetail">
+<input type=hidden name=impfortarget value="0">
</form>
</body></html>
ENDSMPHEAD
@@ -391,23 +822,29 @@ ENDNODIR
# ---------------------------------------------------------------- View Handler
sub viewmap {
- my ($r,$adv,$errtext)=@_;
- $r->print('<html><body bgcolor="#FFFFFF">'.&buttons($adv));
+ my ($r,$url,$adv,$errtext)=@_;
+ $r->print('<html>'.
+ &Apache::loncommon::bodytag('Edit Content of a Map').
+ &buttons($adv));
if ($errtext) {
$r->print($errtext.'<hr>');
}
- foreach (@resources) {
+ 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;
- unless ($title) { $title='<i>Unknown</i>'; }
+ unless ($title) { $title=(split(/\//,$url))[-1] };
+ unless ($title) { $title='<i>Empty</i>'; }
if ($url) {
$r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
}
$r->print(&Apache::lonratsrv::qtescape($title));
if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print('<br>');
}
}
$r->print('</body></html>');
@@ -456,9 +893,9 @@ sub handler {
if ($ENV{'form.forceadv'}) {
&ratedt($r,$url);
} elsif ($ENV{'form.forcesmp'}) {
- &smpedt($r,$errtext);
+ &smpedt($r,$url,$errtext);
} else {
- &viewmap($r,$adv,$errtext);
+ &viewmap($r,$url,$adv,$errtext);
}
return OK;
}