--- rat/lonratedt.pm 2005/04/07 07:34:52 1.66
+++ rat/lonratedt.pm 2006/07/20 04:17:45 1.82
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Edit Handler for RAT Maps
#
-# $Id: lonratedt.pm,v 1.66 2005/04/07 07:34:52 albertel Exp $
+# $Id: lonratedt.pm,v 1.82 2006/07/20 04:17:45 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
@@ -172,8 +172,11 @@ use Apache::lonsequence;
use Apache::loncommon;
use Apache::lonlocal;
use File::Copy;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
-use vars qw(@order @resources @resparms);
+use vars qw(@order @resources @resparms @zombies);
# Mapread read maps into global arrays @links and @resources, determines status
@@ -188,9 +191,12 @@ sub mapread {
undef @resources;
undef @order;
undef @resparms;
+ undef @zombies;
+
@resources=('');
@order=();
@resparms=();
+ @zombies=();
my ($outtext,$errtext)=&Apache::lonratsrv::loadmap($fn,'');
if ($errtext) { return ($errtext,2); }
@@ -199,7 +205,13 @@ 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;
@@ -296,7 +308,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;
@@ -393,25 +408,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
}
@@ -434,6 +455,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
@@ -443,10 +491,10 @@ sub pastetarget {
foreach (@which) {
if (defined($_)) {
my ($name,$url)=split(/\=/,$_);
- $name=&Apache::lonnet::unescape($name);
- $url=&Apache::lonnet::unescape($url);
+ $name=&unescape($name);
+ $url=&unescape($url);
if ($url) {
- my $idx=$#resources+1;
+ my $idx=&getresidx($url);
$insertorder[$#insertorder+1]=$idx;
my $ext='false';
if ($url=~/^http\:\/\//) { $ext='true'; }
@@ -492,7 +540,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
@@ -536,6 +584,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
@@ -638,13 +691,21 @@ function srchclose() {
// -------------------------------------------------------- Open indexer window
function idxopen(mode) {
- var options="scrollbars=1,resizable=1,menubar=0";
+ var options="scrollbars=1,resizable=1,menubar=0,location=1,toolbar=1";
idxmode=mode;
idxflag=1;
idx=open("$resurl/?launch=1&mode=$mode&catalogmode="+mode,"idxout",options);
idx.focus();
}
+// ------------------------------------------------------ Open groupsort window
+function groupopen(url,recover,bookmarks) {
+ var options="scrollbars=1,resizable=1,menubar=0";
+ idxflag=1;
+ idx=open("/adm/groupsort?mode=$mode&recover="+recover+"&readfile="+url+"&bookmarks="+bookmarks,"idxout",options);
+ idx.focus();
+}
+
// --------------------------------------------------------- Open search window
function srchopen(mode) {
var options="scrollbars=1,resizable=1,menubar=0";
@@ -655,12 +716,13 @@ function srchopen(mode) {
}
// ----------------------------------------------------- launch indexer browser
function groupsearch() {
- srchcheck('groupsearch');
+ srchcheck('import');
}
function groupimport() {
- idxcheck('groupimport');
+ idxcheck('import');
}
+
// ------------------------------------------------------- Do srch status check
function srchcheck(mode) {
if (!srch || srch.closed || srchmode!=mode) {
@@ -695,7 +757,7 @@ function idxcheck(mode) {
}
url += 'element=' + elementname + '';
var title = 'Browser';
- var options = 'scrollbars=1,resizable=1,menubar=0';
+ var options = 'scrollbars=1,resizable=1,menubar=0,toolbar=1,location=1';
options += ',width=700,height=600';
editbrowser = open(url,title,options,'1');
editbrowser.focus();
@@ -812,8 +874,8 @@ sub smpedt {
&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
my ($name,$url)=split(/\:/,$_);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -859,8 +921,8 @@ sub smpedt {
foreach (@targetselect) {
my ($name,$url)=split(/\:/,$resources[$order[$_-1]]);
if ($url) {
- $importdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $importdetail.='&'.&escape($name).'='.
+ &escape($url);
}
}
@@ -880,7 +942,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));
@@ -943,7 +1009,7 @@ sub smpedt {
my ($name,$url)=split(/\=/,$_);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- '<option value="'.$idx.'">'.&Apache::lonnet::unescape($name).
+ '<option value="'.$idx.'">'.&unescape($name).
'</option>';
}
} split(/\&/,$importdetail));
@@ -956,8 +1022,8 @@ sub smpedt {
my ($name,$url)=split(/\:/,$resources[$_]);
unless ($name) { $name=(split(/\//,$url))[-1]; }
unless ($name) { $name='EMPTY'; }
- $targetdetail.='&'.&Apache::lonnet::escape($name).'='.
- &Apache::lonnet::escape($url);
+ $targetdetail.='&'.&escape($name).'='.
+ &escape($url);
$idx++;
$name=~s/\:/\:/g;
'<option value="'.$idx.'">'.$name.'</option>';
@@ -965,14 +1031,13 @@ 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',
'se' => 'Search',
'im' => 'Import',
+ 'bk' => 'Import Bookmarks',
'vi' => 'View',
'lm' => 'Load Map',
'ds' => 'Discard Selected',
@@ -987,11 +1052,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
@@ -1034,8 +1098,16 @@ 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>
@@ -1066,6 +1138,10 @@ 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;groupopen(0,1,1);" value="$lt{'bk'}">
+<input type=button onClick=
+"javascript:impfortarget.value=1;groupopen('$url',1,0);" value="$lt{'reco'}">
$lt{'as'}
<hr>
<input type=submit name="moveup" value="$lt{'mu'}">
@@ -1100,30 +1176,28 @@ $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').
- &Apache::loncommon::help_open_menu('','','','',6,'RAT').
+ $r->print(
+ &Apache::loncommon::start_page('Edit Content of a Map').
+ &Apache::loncommon::help_open_menu('','',6,'RAT').
&buttons($adv));
if ($errtext) {
$r->print($errtext.'<hr />');
@@ -1164,11 +1238,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) {
@@ -1179,7 +1249,7 @@ sub viewmap {
}
}
$r->print('</table>');
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
}
# ================================================================ Main Handler