--- rat/lonratedt.pm 2002/05/14 15:19:13 1.16
+++ rat/lonratedt.pm 2005/06/09 21:40:37 1.72
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.16 2002/05/14 15:19:13 www Exp $
+# $Id: lonratedt.pm,v 1.72 2005/06/09 21:40:37 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,20 +25,155 @@
#
# http://www.lon-capa.org/
#
-# (TeX Content Handler
-#
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1,6/30 Gerd Kortemeyer
+
package Apache::lonratedt;
+=pod
+
+=head1 NAME
+
+Apache::lonratedt: simple resource assembly tool
+
+=head1 SYNOPSIS
+
+lonratedt provides the routines and the handler for the Advanced
+ Resource Assembly Tool (RAT), and ties the various pieces together
+ with Javascript.
+
+=head1 OVERVIEW
+
+=head2 Map Representation
+
+=begin latex
+
+%
+\begin{figure}
+\begin{center}\includegraphics[%
+ width=0.55\paperwidth,bb = 0 0 200 100, draft, type=eps]{Map_Example}\end{center}
+
+
+\caption{\label{Map_In_Advanced_Editor}Example of a Map in the Advanced Editor}
+\end{figure}
+%
+\begin{figure}
+\begin{lyxcode}
+<map>
+
+~~<resource~id=\char`\"{}1\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/korte/phy231welcome.html\char`\"{}
+
+~~~~type=\char`\"{}start\char`\"{}
+
+~~~~title=\char`\"{}Start\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}2\char`\"{}
+
+~~~~src=\char`\"{}\char`\"{}~type=\char`\"{}finish\char`\"{}
+
+~~~~title=\char`\"{}Finish\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}6\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/korte/tests/units.problem\char`\"{}
+
+~~~~type=\char`\"{}mandatory\char`\"{}
+
+~~~~title=\char`\"{}Physical~Units~Test\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}9\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/korte/chapters/onedim.sequence\char`\"{}
+
+~~~~title=\char`\"{}Motion~in~One~Dimension\char`\"{}>
+
+~~~~</resource>
+
+~~<resource~id=\char`\"{}11\char`\"{}
+
+~~~~src=\char`\"{}/res/msu/bauer/bridges/units.sequence\char`\"{}
+
+~~~~title=\char`\"{}Physical~Units~Refresher\char`\"{}>
+
+~~~~</resource>
+
+~~<condition~id=\char`\"{}19\char`\"{}
+
+~~~~type=\char`\"{}stop\char`\"{}
+
+~~~~value=\char`\"{}user.assessments{[}this./res/msu/korte/tests/units.problem{]}.status=solved\char`\"{}>
+
+~~~~</condition>
+
+~~<link~from=\char`\"{}1\char`\"{}~to=\char`\"{}6\char`\"{}></link>
+
+~~<link~from=\char`\"{}6\char`\"{}~to=\char`\"{}9\char`\"{}~condition=\char`\"{}19\char`\"{}></link>
+
+~~<link~from=\char`\"{}6\char`\"{}~to=\char`\"{}11\char`\"{}></link>
+
+~~<link~from=\char`\"{}11\char`\"{}~to=\char`\"{}6\char`\"{}></link>
+
+~~</map>
+\end{lyxcode}
+
+\caption{\label{XML}XML for Map in Figure \ref{Map_In_Advanced_Editor}}
+\end{figure}
+
+=end latex
+
+Fig. "XML for Map in Figure" shows the XML representation of the
+resource map shown in Fig. "Example of a Map in the Advanced Editor",
+which is the format in which maps are stored. In the figure, however,
+additional graphical map layout information generated by the Advanced
+Resource Assembly Tool is not displayed. This graphical information is
+optional to re-generate the same graphical layout when the map is
+brought up again in the Resource Assembly Tool, and is not needed for
+any other system functionality.
+
+Maps can be generated by tools other than the Resource Assembly
+Tool. In particular, an author might have some other representation of
+a course sequence, which can be converted into a map using scripts. If
+this map then were to be brought up in the Resource Assembly Tool, the
+Tool would automatically generate a graphical layout for it. Each
+entry of the map (resources, conditions and links) is stored in a
+separate tag.
+
+Resources and conditionsX<conditions> have to have unique ID
+numbers. These numbers are automatically generated by the Resource
+Assembly Tool when the entry is first created, or added to the entries
+when a map generated outside the Resource Assembly Tool is first
+retrieved. They can also be assigned by custom scripts or added in by
+hand.
+
+In the XML example, entry 1 is the start resource of the map. When
+this map is accessed, the source (src) URL of this tag will be the
+first resource rendered. Entry 2 is the finish resource of this
+map. This resource will be the last resource in the sequence of
+resources. Entry 6 is a problem resource with the given URL and title,
+as well as the priority "mandatory". Entry 19 is a condition, which is
+used by the link between entries 6, the problem, and 9, a
+sequence. I<The final syntax for conditions has not yet been
+determined.>
+
+=cut
+
use strict;
use Apache::Constants qw(:common);
use Apache::lonnet;
use Apache::lonratsrv;
+use Apache::lonsequence;
+use Apache::loncommon;
+use Apache::lonlocal;
+use File::Copy;
-my @order=();
-my @resources=();
+use vars qw(@order @resources @resparms @zombies);
# Mapread read maps into global arrays @links and @resources, determines status
@@ -52,6 +187,13 @@ sub mapread {
undef @links;
undef @resources;
undef @order;
+ undef @resparms;
+ undef @zombies;
+
+ @resources=('');
+ @order=();
+ @resparms=();
+ @zombies=();
my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
if ($errtext) { return ($errtext,2); }
@@ -60,11 +202,24 @@ sub mapread {
foreach (split(/\<\&\>/,$outtext)) {
my ($command,$number,$content)=split(/\<\:\>/,$_);
if ($command eq 'objcont') {
- $resources[$number]=$content;
+ my ($title,$src,$ext,$type)=split(/\:/,$content);
+ if ($ext eq 'cond') { next; }
+ if ($type ne 'zombie') {
+ $resources[$number]=$content;
+ } else {
+ $zombies[$number]=$content;
+ }
}
if ($command eq 'objlinks') {
$links[$number]=$content;
}
+ if ($command eq 'objparms') {
+ if ($resparms[$number]) {
+ $resparms[$number].='&&&'.$content;
+ } else {
+ $resparms[$number]=$content;
+ }
+ }
}
# ------------------------------------------------------- Is this a linear map?
my @starters=();
@@ -77,26 +232,31 @@ sub mapread {
my ($start,$end,$cond)=split(/\:/,$_);
if ((defined($starters[$start])) || (defined($endings[$end]))) {
return
- ('Map has branchings. Use advanced editor.',1);
+ (&mt('Map has branchings. Use advanced editor.'),1);
}
$starters[$start]=1;
$endings[$end]=1;
if ($cond) {
return
- ('Map has conditions. Use advanced editor.',1);
+ (&mt('Map has conditions. Use advanced editor.'),1);
}
}
}
- for (my $i=0; $i<=$#resources; $i++) {
+ for (my $i=1; $i<=$#resources; $i++) {
if (defined($resources[$i])) {
unless (($starters[$i]) || ($endings[$i])) {
return
- ('Map has unconnected resources. Use advanced editor.',1);
+ (&mt('Map has unconnected resources. Use advanced editor.'),1);
}
}
}
-
+# ---------------------------------------------- Did we just read an empty map?
+ if ($#resources<1) {
+ undef $resources[0];
+ $resources[1]=':::start';
+ $resources[2]=':::finish';
+ }
# -------------------------------------------------- This is a linear map, sort
my $startidx=0;
@@ -127,7 +287,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;
@@ -143,7 +305,10 @@ sub attemptread {
foreach (split(/\<\&\>/,$outtext)) {
my ($command,$number,$content)=split(/\<\:\>/,$_);
if ($command eq 'objcont') {
- $theseres[$number]=$content;
+ my ($title,$src,$ext,$type)=split(/\:/,$content);
+ unless ($type eq 'zombie') {
+ $theseres[$number]=$content;
+ }
}
if ($command eq 'objlinks') {
$links[$number]=$content;
@@ -152,25 +317,98 @@ sub attemptread {
# --------------------------------------------------------------- Sort, sort of
- my $startidx=0;
- my $endidx=0;
- for (my $i=0; $i<=$#theseres; $i++) {
- if (defined($theseres[$i])) {
- my ($title,$url,$ext,$type)=split(/\:/,$theseres[$i]);
- if ($type eq 'start') { $startidx=$i; }
- if ($type eq 'finish') { $endidx=$i; }
- }
- }
+ 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
- return @theseres;
+ @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)=@_;
+ my $frameset = '<frameset rows="1,70,*" border="0">';
+ if ($env{'environment.remote'} eq 'off') {
+ $frameset = '<frameset rows="1,250,*" border="0">';
+ }
$r->print(<<ENDDOCUMENT);
<html>
@@ -179,9 +417,9 @@ sub ratedt {
var flag=0;
</script>
</head>
-<frameset rows="1,50,*" border=0>
+$frameset
<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="/adm/rat/code.html">
+<frame name=code src="$url/loadonly/adveditmenu">
<frame name=mapout src="/adm/rat/map.html">
</frameset>
</html>
@@ -195,129 +433,215 @@ sub buttons {
my $adv=shift;
my $output='<form method=post>';
if ($adv==1) {
- $output.='<input type=submit name=forceadv value="Edit">';
+ $output.='<input type=submit name=forceadv value="'.&mt('Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');;
} else {
unless ($adv==2) {
- $output.='<input type=submit name=forcesmp value="Simple Edit">';
+ $output.='<input type=submit name=forcesmp value="'.&mt('Simple Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Simple_Editor_Creation');
}
- $output.='<input type=submit name=forceadv value="Advanced Edit">';
+ $output.='<input type=submit name=forceadv value="'.&mt('Advanced Edit').'">'.
+ &Apache::loncommon::help_open_topic('Sequence_Advanced_Editor_Creation');
}
return $output.'</form><hr>';
}
-sub smpedt {
- my ($r,$errtext)=@_;
- my $buttons=&buttons(2);
-
-# ---------------------------------------------------------- Process form input
+# ------------------------------------- Revive zombie idx or get unused number
- 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
+sub getresidx {
+ my $url=shift;
+ my $max=1+($#resources>$#zombies?$#resources:$#zombies);
+ unless ($url) { return $max; }
+ for (my $i=0; $i<=$#zombies; $i++) {
+ my ($title,$src,$ext,$type)=split(/\:/,$zombies[$i]);
+ if ($src eq $url) {
+ undef $zombies[$i];
+ return $i;
+ }
+ }
+ return $max;
+}
- my $targetdetail=$ENV{'form.targetdetail'};
- my $importdetail=$ENV{'form.curimpdetail'};
+# --------------------------------------------------------------- Make a zombie
-# ---------------------------------------------------- Importing from groupsort
- if (($ENV{'form.importdetail'}) && (!$ENV{'form.impfortarget'})) {
+sub makezombie {
+ my $idx=shift;
+ my ($name,$url,$ext)=split(/\:/,$resources[$idx]);
+ my $now=time;
+ $zombies[$idx]=$name.
+ ' [('.$now.','.$env{'user.name'}.','.$env{'user.domain'}.')]:'.
+ $url.':'.$ext.':zombie';
+}
- $importdetail='';
- my @curimport=split(/\&/,$ENV{'form.curimpdetail'});
+# ----------------------------------------------------------- Paste into target
+# modifies @order, @resources
- my $lastsel;
+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=&getresidx($url);
+ $insertorder[$#insertorder+1]=$idx;
+ my $ext='false';
+ if ($url=~/^http\:\/\//) { $ext='true'; }
+ $url=~s/\:/\:/g;
+ $name=~s/\:/\:/g;
+ $resources[$idx]=$name.':'.$url.':'.$ext.':normal:res';
+ }
+ }
+ }
+ my @oldorder=splice(@order,$after);
+ @order=(@order,@insertorder,@oldorder);
+}
- if (defined($importselect[-1])) {
- $lastsel=$importselect[-1];
- } else {
- $lastsel=$#curimport;
- }
+# ------------------------------------------------ Get start and finish correct
+# modifies @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 startfinish {
+# Remove all start and finish
+ foreach (@order) {
+ my ($name,$url,$ext)=split(/\:/,$resources[$_]);
+ if ($url=~/http\&colon\:\/\//) { $ext='true'; }
+ $resources[$_]=$name.':'.$url.':'.$ext.':normal:res';
+ }
+# Garbage collection
+ my $stillchange=1;
+ while (($#order>1) && ($stillchange)) {
+ $stillchange=0;
+ for (my $i=0;$i<=$#order;$i++) {
+ my ($name,$url,$ext)=split(/\:/,$resources[$order[$i]]);
+ unless ($url) {
+# Take out empty resource
+ for (my $j=$i+1;$j<=$#order;$j++) {
+ $order[$j-1]=$order[$j];
+ }
+ $#order--;
+ $stillchange=1;
+ last;
+ }
}
+ }
+# Put in a start resource
+ my ($name,$url,$ext)=split(/\:/,$resources[$order[0]]);
+ $resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
+# Make sure this has at least start and finish
+ if ($#order==0) {
+ $resources[&getresidx()]='::false';
+ $order[1]=$#resources;
+ }
+# Make the last one a finish resource
+ ($name,$url,$ext)=split(/\:/,$resources[$order[$#order]]);
+ $resources[$order[$#order]]=$name.':'.$url.':'.$ext.':finish:res';
+}
- $importdetail.='&'.$ENV{'form.importdetail'};
+# ------------------------------------------------------------------- Store map
- 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);
- }
+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);
}
- $importdetail=~s/\&+/\&/g;
- $importdetail=~s/^\&//;
+ }
+# 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($resparms[$order[$i]])) {
+ foreach (split('&&&',$resparms[$order[$i]])) {
+ if ($_) {
+ $output.='<&>objparms<:>'.$order[$i].'<:>'.$_;
+ }
+ }
+ }
+ if (defined($order[$i+1])) {
+ if (defined($resources[$order[$i+1]])) {
+ $output.='<&>objlinks<:>'.$k.'<:>'.
+ $order[$i].':'.$order[$i+1].':0';
+ $k++;
+ }
+ }
+ }
+ for (my $i=0; $i<=$#zombies; $i++) {
+ if (defined($zombies[$i])) {
+ $output.='<&>objcont<:>'.$i.'<:>'.$zombies[$i];
+ }
+ }
+ $output=~s/http\&colon\;\/\///g;
+ $env{'form.output'}=$output;
+ return
+ &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,''));
+}
-# ------------------------------------------------------------------- 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.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
- }
- }
-# ---------------------------
- }
+# ------------------------------------------ Store and get parameters in global
-# ------------------------------------------------------------ Assemble windows
+sub storeparameter {
+ my ($to,$name,$value,$ptype)=@_;
+ my $newentry='';
+ my $nametype='';
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname) {
+ unless ($thisname eq $name) {
+ $newentry.=$_.'&&&';
+ } else {
+ $nametype=$thistype;
+ }
+ }
+ }
+ unless ($ptype) { $ptype=$nametype; }
+ unless ($ptype) { $ptype='string'; }
+ $newentry.=$ptype.'___'.$name.'___'.$value;
+ $resparms[$to]=$newentry;
+}
- my $idx=-1;
- my $importwindow=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));
+sub delparameter {
+ my ($to,$name)=@_;
+ my $newentry='';
+ my $nametype='';
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname) {
+ unless ($thisname eq $name) {
+ $newentry.=$_.'&&&';
+ }
+ }
+ }
+ $resparms[$to]=$newentry;
+}
- $idx=0;
- my $targetwindow=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);
+sub getparameter {
+ my ($to,$name)=@_;
+ my $value=undef;
+ my $ptype=undef;
+ foreach (split('&&&',$resparms[$to])) {
+ my ($thistype,$thisname,$thisvalue)=split('___',$_);
+ if ($thisname eq $name) {
+ $value=$thisvalue;
+ $ptype=$thistype;
+ }
+ }
+ return ($value,$ptype);
+}
-# ----------------------------------------------------- Start simple RAT screen
- $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
+# ----------------------------------------------------------------- Edit script
+sub editscript {
+ my $mode=shift;
+ my $resurl=&Apache::loncommon::lastresurl();
+ return(<<ENDSCRIPT);
var srch;
var srchflag=-1; // 1 means currently open
// 0 means closed (but has been open)
@@ -361,7 +685,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("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
idx.focus();
}
@@ -370,7 +694,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
@@ -400,7 +724,7 @@ function idxcheck(mode) {
var editbrowser;
function openbrowser(formname,elementname,only,omit) {
- var url = '/res/?';
+ var url = '$resurl/?';
if (editbrowser == null) {
url += 'launch=1&';
}
@@ -420,52 +744,402 @@ function idxcheck(mode) {
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'}) {
+ copy($tmpfn,&Apache::lonnet::filelocation('',$url));
+ unlink($tmpfn);
+ my ($errtext,$fatal)=
+ &mapread(&Apache::lonnet::filelocation('',$url),'');
+ unless ($fatal) {
+ $targetmsg='<b>'.&mt('Saved.').'</b><br />';
+ } else {
+ $targetmsg='<b>'.&mt('An error occured while saving.').'</b><br />';
+ }
+ }
+ if ($env{'form.revert'}) {
+ $targetmsg='<b>'.&mt('Reverted.').'</b><br />';
+ unlink($tmpfn);
+ my ($errtext,$fatal)=
+ &mapread(&Apache::lonnet::filelocation('',$url),'');
+ }
+ if (-e $tmpfn) {
+ $targetmsg=
+ '<b><font color="red">'.&mt('You are working with an unsaved version of your map.').'</font></b><br>';
+ my ($errtext,$fatal)=&mapread($tmpfn,'');
+ }
+# ---------------------------------------------------------- Process form input
+
+ my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
+ my @targetselect=&Apache::loncommon::get_env_multiple('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];
+ } else {
+ &makezombie($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));
+# -------------------------------------------------------------------- Move up
+ } elsif ($env{'form.moveup'}) {
+ foreach (sort @targetselect) {
+ if ($_-1>0) {
+ my $movethis=$order[$_-1];
+ $order[$_-1]=$order[$_-2];
+ $order[$_-2]=$movethis;
+ }
+ }
+ &storemap(&Apache::lonnet::filelocation('',$url));
+# ------------------------------------------------------------------ Move down
+ } elsif ($env{'form.movedown'}) {
+ foreach (reverse sort @targetselect) {
+ if ($_-1<$#order) {
+ my $movethis=$order[$_-1];
+ $order[$_-1]=$order[$_];
+ $order[$_]=$movethis;
+ }
+ }
+ &storemap(&Apache::lonnet::filelocation('',$url));
+# --------------------------------------------------------------------- Rename
+ } elsif ($env{'form.renameres'}) {
+ my $residx=$Apache::lonratedt::order[$env{'form.renameidx'}-1];
+ my ($name,@resrest)=split(/\:/,$Apache::lonratedt::resources[$residx]);
+ $name=$env{'form.renametitle'};
+ $name=~s/\:/\&colon\;/g;
+ $Apache::lonratedt::resources[$residx]=$name.':'.join(':',@resrest);
+ &storemap(&Apache::lonnet::filelocation('',$url));
+ }
+# ------------------------------------------------------------ Assemble windows
+
+ my $idx=-1;
+ $importdetail='&'.$importdetail;
+ $importdetail=~s/^\&+/\&/;
+ my $importwindow=
+ '<option value="-1"> ---- '.&mt('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;
+ $targetdetail='';
+ my $targetwindow=
+ '<option value="0"> ------- '.&mt('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++;
+ $name=~s/\:/\:/g;
+ '<option value="'.$idx.'">'.$name.'</option>';
+ } @order);
+
+# ----------------------------------------------------- Start simple RAT screen
+ my $editscript=&editscript('simple');
+ my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
+ ($env{'environment.remote'} ne 'off')).
+ &Apache::loncommon::help_open_menu('','Sequence_Simple_Editor_Creation','Sequence_Simple_Editor_Creation','',6,'RAT');
+ my %lt=&Apache::lonlocal::texthash(
+ 'sa' => 'Save',
+ 'nt' => 'New Title',
+ 'se' => 'Search',
+ 'im' => 'Import',
+ 'vi' => 'View',
+ 'lm' => 'Load Map',
+ 'ds' => 'Discard Selected',
+ 'ca' => 'Clear All',
+ 'ta' => 'Temporary Assembly Workspace',
+ 'rv' => 'Revert to Last Saved',
+ 'sa' => 'Save',
+ 'mu' => 'Move Up',
+ 'md' => 'Move Down',
+ 're' => 'Rename',
+ 'as' => 'after selected',
+ 'cs' => 'Cut selected',
+ 'ps' => 'Copy selected',
+ 'pas' => 'Paste after selected',
+ );
+ $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]);
+ }
+
+ function renametarget() {
+ var selidx=document.forms.simpleedit.target.selectedIndex;
+ var entry=(document.forms.simpleedit.targetdetail.value.split('&'))
+ [selidx];
+ var oldname=unescape((entry.split('='))[0]);
+ var nameparts=oldname.split(':');
+ oldname=unescape(nameparts.join(':'));
+ nameparts=oldname.split('"');
+ oldname=unescape(nameparts.join('"'));
+ nameparts=oldname.split(''');
+ oldname=unescape(nameparts.join("'"));
+ newtitle=prompt('$lt{'nt'}',oldname);
+ if (newtitle) {
+ document.forms.simpleedit.renameres.value=1;
+ document.forms.simpleedit.renameidx.value=selidx;
+ document.forms.simpleedit.renametitle.value=newtitle;
+ document.forms.simpleedit.submit();
+ }
+ }
+
</script>
</head>
-<body bgcolor='#FFFFFF'>
+$bodytag
$buttons
<font color=red>$errtext</font>
<form name=simpleedit method=post>
<input type=hidden name=forcesmp value=1>
+<input type=hidden name=renameres value=0>
+<input type=hidden name=renametitle value=''>
+<input type=hidden name=renameidx value=0>
<table>
- <tr><th width="40%">Import</th>
+ <tr><th width="40%">$lt{'ta'}</th>
<th> </th>
-<th width="40%">Target</th></tr>
+<th width="40%">File: $url</th></tr>
<tr><td bgcolor="#FFFFCC">
-<input type=button onClick="javascript:groupsearch()" value="Group Search">
-<input type=button onClick="javascript:groupimport();" value="Group Import">
-after selected
+<input type=button onClick="javascript:groupsearch()" value="$lt{'se'}">
+<input type=button onClick="javascript:groupimport();" value="$lt{'im'}">
+$lt{'as'}
<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">
+value="Select Map"><input type=submit name=loadmap value="$lt{'lm'}"><hr>
+<input type=submit name="discard" value="$lt{'ds'}">
+<input type=submit name="clear" value="$lt{'ca'}">
+<input type=button onClick="javascript:viewimport()" value="$lt{'vi'}">
</td><td> </td><td bgcolor="#FFFFCC">
<input type=button onClick=
-"javascript:impfortarget.value=1;groupsearch()" value="Group Search">
+"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
<input type=button onClick=
-"javascript:impfortarget.value=1;groupimport();" value="Group Import">
-after selected
-<hr><input type=button onClick="javascript:viewtarget()" value="View">
+"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
+$lt{'as'}
+<hr>
+<input type=submit name="moveup" value="$lt{'mu'}">
+<input type=submit name="movedown" value="$lt{'md'}">
+<input type=button onClick="javascript:renametarget()" value="$lt{'re'}">
+<hr>$targetmsg
+<input type=submit name="revert" value="$lt{'rv'}">
+<input type=submit name="save" value="$lt{'sa'}">
+<input type=button onClick="javascript:viewtarget()" value="$lt{'vi'}">
</td></tr>
-<tr><td bgcolor="#FFFFCC"><select name="import" multiple>
+<tr><td bgcolor="#FFFFCC"><select name="importsel" size=10 multiple>
$importwindow
</select>
</td>
<td bgcolor="#FFFFAA" align="center">
-Cut selected<br>
+$lt{'cs'}<br>
<input type=submit name=cut value='<<<'><p>
<hr>
-Paste after selected<br>
-<input type=submit name=paste value='>>>'>
+$lt{'ps'}<br>
+<input type=submit name=copy value='<--'><p>
+<hr>
+$lt{'pas'}<br>
+<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>
@@ -494,26 +1168,61 @@ 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').
+ &Apache::loncommon::help_open_menu('','','','',6,'RAT').
+ &buttons($adv));
if ($errtext) {
- $r->print($errtext.'<hr>');
+ $r->print($errtext.'<hr />');
+ }
+ my $idx=0;
+ $r->print('<h1>'.$url.'</h1>');
+ if ($adv) {
+ $r->print('<p><b><font color="red">'.&mt('Map contents are not shown in order.').'</font></b></p><br />');
}
- foreach (@resources) {
+ $r->print( '<table border="0" cellspacing="2" cellpadding="4">'.
+ '<tr bgcolor="#DDDDDD"><th>'.&mt('Type').'</th>'.
+ '<th>'.&mt('Title in map').'</th>'.
+ '<th>'.&mt('Filename of resource').'</th>'.
+ '<th>'.&mt('Link to published resource').'</th>'.
+ '<th>'.&mt('Link to resource in Construction Space').'</th>'.
+ '</tr>');
+ my @backgroundColors = ("#FFFFFF", "#F6F6F6");
+ foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
if (defined($_)) {
- my ($title,$url)=split(/\:/,$_);
+ $idx++;
+ my ($title,$url,$cond)=split(/\:/,$_);
+ if ($cond eq 'cond') { next; }
$title=~s/\&colon\;/\:/g;
$url=~s/\&colon\;/\:/g;
unless ($title) { $title=(split(/\//,$url))[-1] };
- unless ($title) { $title='<i>Empty</i>'; }
+ unless ($title) { $title='<i>'.&mt('Empty').'</i>'; }
+ my $resurl = &Apache::lonratsrv::qtescape($url);
+ my $resfilepath = $Apache::lonnet::perlvar{'lonDocRoot'}.$resurl;
+ my $filename;
+ if ($resurl =~ m#/([^/]+)$#) {
+ $filename = $1;
+ }
+ my $cstrurl = $resurl;
+ $cstrurl =~ s#^/res/[^/]+/([^/]+)/#/priv/$1/#;
+ my $bgcol = $idx%2;
+ $r->print('<tr bgcolor='.$backgroundColors[$bgcol].'><td>'.
+ '<img src="'.&Apache::loncommon::icon($resfilepath).
+ '" /></td><td>'.&Apache::lonratsrv::qtescape($title).
+ '</td><td>'.$filename.'</td><td>');
if ($url) {
- $r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
+ $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
}
- $r->print(&Apache::lonratsrv::qtescape($title));
- if ($url) { $r->print('</a>'); }
- $r->print('<br>');
+ $r->print('</td><td>');
+ if ($url) {
+ $r->print('<a href="'.$cstrurl.'">'.
+ &mt('Construction space').'</a>');
+ }
+ $r->print('</td></tr>'."\n");
}
}
+ $r->print('</table>');
$r->print('</body></html>');
}
@@ -521,11 +1230,17 @@ sub viewmap {
sub handler {
my $r=shift;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
-
+ my $target = $env{'form.grade_target'};
+ if ($target eq 'meta') {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ return OK;
+ }
+
my $url=$r->uri;
my $fn=&Apache::lonnet::filelocation('',$url);
@@ -538,8 +1253,8 @@ sub handler {
# ------------------------------------------- Determine which tools can be used
my $adv=0;
- unless ($ENV{'form.forcesmp'}) {
- if ($ENV{'form.forceadv'}) {
+ unless ($env{'form.forcesmp'}) {
+ if ($env{'form.forceadv'}) {
$adv=1;
} elsif (my $fh=Apache::File->new($fn)) {
my $allmap=join('',<$fh>);
@@ -557,12 +1272,12 @@ sub handler {
# ----------------------------------- adv==1 now means "graphical MUST be used"
- if ($ENV{'form.forceadv'}) {
+ if ($env{'form.forceadv'}) {
&ratedt($r,$url);
- } elsif ($ENV{'form.forcesmp'}) {
- &smpedt($r,$errtext);
+ } elsif ($env{'form.forcesmp'}) {
+ &smpedt($r,$url,$errtext);
} else {
- &viewmap($r,$adv,$errtext);
+ &viewmap($r,$url,$adv,$errtext);
}
return OK;
}