--- rat/lonratedt.pm 2005/06/08 15:44:51 1.67
+++ rat/lonratedt.pm 2006/04/13 19:00:57 1.76
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.67 2005/06/08 15:44:51 www Exp $
+# $Id: lonratedt.pm,v 1.76 2006/04/13 19:00:57 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,7 +33,7 @@ package Apache::lonratedt;
=head1 NAME
-Apache::lonratedt: advanced resource assembly tool
+Apache::lonratedt: simple resource assembly tool
=head1 SYNOPSIS
@@ -173,7 +173,7 @@ use Apache::loncommon;
use Apache::lonlocal;
use File::Copy;
-use vars qw(@order @resources @resparms @zombies %revzombies);
+use vars qw(@order @resources @resparms @zombies);
# Mapread read maps into global arrays @links and @resources, determines status
@@ -189,13 +189,11 @@ sub mapread {
undef @order;
undef @resparms;
undef @zombies;
- undef %revzombies;
@resources=('');
@order=();
@resparms=();
@zombies=();
- %revzombies=();
my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
if ($errtext) { return ($errtext,2); }
@@ -205,11 +203,11 @@ sub mapread {
my ($command,$number,$content)=split(/\<\:\>/,$_);
if ($command eq 'objcont') {
my ($title,$src,$ext,$type)=split(/\:/,$content);
+ if ($ext eq 'cond') { next; }
if ($type ne 'zombie') {
$resources[$number]=$content;
} else {
$zombies[$number]=$content;
- $revzombies{$src}=$number;
}
}
if ($command eq 'objlinks') {
@@ -407,25 +405,31 @@ sub attemptread {
# --------------------------------------------------------- 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">';
+ my %layout = ('border' => "0");
+ if ($env{'environment.remote'} eq 'off') {
+ $layout{'rows'} = "1,250,*";
+ } else {
+ $layout{'rows'} = "1,70,*";
}
- $r->print(<<ENDDOCUMENT);
-
-<html>
-<head>
-<script language="JavaScript">
+ my $js ='
+<script type="text/javascript">
var flag=0;
-</script>
-</head>
-$frameset
-<frame name=server src="$url/loadonly/ratserver" noresize noscroll>
-<frame name=code src="$url/loadonly/adveditmenu">
-<frame name=mapout src="/adm/rat/map.html">
-</frameset>
-</html>
+</script>';
+
+ my $start_page =
+ &Apache::loncommon::start_page('Edit Sequence',$js,
+ {'frameset' => 1,
+ 'add_entries' => \%layout});
+ my $end_page =
+ &Apache::loncommon::end_page({'frameset' => 1});
+ $r->print(<<ENDDOCUMENT);
+$start_page
+<frame name="server" src="$url/loadonly/ratserver" noresize="noresize"
+ noscroll="noscroll" />
+<frame name="code" src="$url/loadonly/adveditmenu" />
+<frame name="mapout" src="/adm/rat/map.html" />
+$end_page
ENDDOCUMENT
}
@@ -448,6 +452,33 @@ sub buttons {
return $output.'</form><hr>';
}
+# ------------------------------------- Revive zombie idx or get unused number
+
+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;
+}
+
+# --------------------------------------------------------------- Make a zombie
+
+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';
+}
+
# ----------------------------------------------------------- Paste into target
# modifies @order, @resources
@@ -460,7 +491,7 @@ sub pastetarget {
$name=&Apache::lonnet::unescape($name);
$url=&Apache::lonnet::unescape($url);
if ($url) {
- my $idx=$#resources+1;
+ my $idx=&getresidx($url);
$insertorder[$#insertorder+1]=$idx;
my $ext='false';
if ($url=~/^http\:\/\//) { $ext='true'; }
@@ -506,7 +537,7 @@ sub startfinish {
$resources[$order[0]]=$name.':'.$url.':'.$ext.':start:res';
# Make sure this has at least start and finish
if ($#order==0) {
- $resources[$#resources+1]='::false';
+ $resources[&getresidx()]='::false';
$order[1]=$#resources;
}
# Make the last one a finish resource
@@ -550,6 +581,11 @@ sub storemap {
}
}
}
+ 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
@@ -659,6 +695,14 @@ function idxopen(mode) {
idx.focus();
}
+// ------------------------------------------------------ Open groupsort window
+function groupopen(url,recover) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ idxflag=1;
+ idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url,"idxout",options);
+ idx.focus();
+}
+
// --------------------------------------------------------- Open search window
function srchopen(mode) {
var options="scrollbars=1,resizable=1,menubar=0";
@@ -675,6 +719,7 @@ function groupsearch() {
function groupimport() {
idxcheck('groupimport');
}
+
// ------------------------------------------------------- Do srch status check
function srchcheck(mode) {
if (!srch || srch.closed || srchmode!=mode) {
@@ -894,7 +939,11 @@ sub smpedt {
foreach (@targetselect) {
if ($_-1==$i) { $include=0; }
}
- if ($include) { $neworder[$#neworder+1]=$order[$i]; }
+ if ($include) {
+ $neworder[$#neworder+1]=$order[$i];
+ } else {
+ &makezombie($order[$i]);
+ }
}
@order=@neworder;
&storemap(&Apache::lonnet::filelocation('',$url));
@@ -979,9 +1028,7 @@ sub smpedt {
# ----------------------------------------------------- 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',
@@ -1001,11 +1048,10 @@ sub smpedt {
'cs' => 'Cut selected',
'ps' => 'Copy selected',
'pas' => 'Paste after selected',
+ 'reco' => 'Recover Deleted'
);
- $r->print(<<ENDSMPHEAD);
-<html>
-<head>
-<script>
+ my $js=<<ENDJS;
+<script type="text/javascript>
$editscript
@@ -1048,8 +1094,17 @@ sub smpedt {
}
</script>
-</head>
-$bodytag
+ENDJS
+
+ my $start_page = &Apache::loncommon::start_page(undef,$js).
+ &Apache::loncommon::help_open_menu('',
+ 'Sequence_Simple_Editor_Creation',
+ 'Sequence_Simple_Editor_Creation',
+ '',6,'RAT');
+ my $end_page = &Apache::loncommon::end_page();
+
+ $r->print(<<ENDSMPHEAD);
+$start_page
$buttons
<font color=red>$errtext</font>
<form name=simpleedit method=post>
@@ -1080,6 +1135,8 @@ value="Select Map"><input type=submit na
"javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}">
<input type=button onClick=
"javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;javascript:groupopen('$url',1);" value="$lt{'reco'}">
$lt{'as'}
<hr>
<input type=submit name="moveup" value="$lt{'mu'}">
@@ -1114,29 +1171,27 @@ $targetwindow
<input type=hidden name=targetdetail value="$targetdetail">
<input type=hidden name=impfortarget value="0">
</form>
-</body></html>
+$end_page
ENDSMPHEAD
}
# ----------------------------------------------------------------- No such dir
sub nodir {
my ($r,$dir)=@_;
- $dir=~s/^\/home\/\w+\/public\_html//;
- $r->print(<<ENDNODIR);
-<html>
-<body bgcolor='#FFFFFF'>
-<h1>No such directory: $dir</h1>
-</body>
-</html>
-ENDNODIR
+ $dir=~s{^/home/\w+/public_html}{};
+ $r->print(&Apache::loncommon::start_page(undef,undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',}).
+ "<h1>No such directory: $dir</h1>".
+ &Apache::loncommon::end_page());
}
# ---------------------------------------------------------------- View Handler
sub viewmap {
my ($r,$url,$adv,$errtext)=@_;
- $r->print('<html>'.
- &Apache::loncommon::bodytag('Edit Content of a Map').
+ $r->print(
+ &Apache::loncommon::start_page('Edit Content of a Map').
&Apache::loncommon::help_open_menu('','','','',6,'RAT').
&buttons($adv));
if ($errtext) {
@@ -1178,11 +1233,7 @@ sub viewmap {
'" /></td><td>'.&Apache::lonratsrv::qtescape($title).
'</td><td>'.$filename.'</td><td>');
if ($url) {
- if (-e $resfilepath) {
- $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
- } else {
- $r->print(&mt('unpublished'));
- }
+ $r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
}
$r->print('</td><td>');
if ($url) {
@@ -1193,7 +1244,7 @@ sub viewmap {
}
}
$r->print('</table>');
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler