--- rat/lonratedt.pm 2004/11/17 20:14:23 1.63 +++ 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.63 2004/11/17 20:14:23 raeburn 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 = ''; - if ($ENV{'environment.remote'} eq 'off') { - $frameset = ''; + my %layout = ('border' => "0"); + if ($env{'environment.remote'} eq 'off') { + $layout{'rows'} = "1,250,*"; + } else { + $layout{'rows'} = "1,70,*"; } - $r->print(< - - - -$frameset - - - - - +'; + + 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(< + + +$end_page ENDDOCUMENT } @@ -434,6 +455,33 @@ sub buttons { return $output.'

'; } +# ------------------------------------- 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,8 +584,13 @@ 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; + $env{'form.output'}=$output; return &Apache::lonratsrv::loadmap($fn,&Apache::lonratsrv::savemap($fn,'')); } @@ -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(); @@ -709,7 +771,7 @@ sub smpedt { my $buttons=&buttons(2); my $tmpfn=&Apache::lonnet::filelocation('',$url).'.tmp'; my $targetmsg=''; - if ($ENV{'form.save'}) { + if ($env{'form.save'}) { copy($tmpfn,&Apache::lonnet::filelocation('',$url)); unlink($tmpfn); my ($errtext,$fatal)= @@ -720,7 +782,7 @@ sub smpedt { $targetmsg=''.&mt('An error occured while saving.').'
'; } } - if ($ENV{'form.revert'}) { + if ($env{'form.revert'}) { $targetmsg=''.&mt('Reverted.').'
'; unlink($tmpfn); my ($errtext,$fatal)= @@ -733,34 +795,18 @@ sub smpedt { } # ---------------------------------------------------------- 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'}); - } - } + 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'}; + my $targetdetail=$env{'form.targetdetail'}; + my $importdetail=$env{'form.curimpdetail'}; # ---------------------------------------------------- Importing from groupsort - if (($ENV{'form.importdetail'}) && (!$ENV{'form.impfortarget'})) { + if (($env{'form.importdetail'}) && (!$env{'form.impfortarget'})) { $importdetail=''; - my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + my @curimport=split(/\&/,$env{'form.curimpdetail'}); my $lastsel; @@ -777,7 +823,7 @@ sub smpedt { } } - $importdetail.='&'.$ENV{'form.importdetail'}; + $importdetail.='&'.$env{'form.importdetail'}; for (my $i=$lastsel+1;$i<=$#curimport;$i++) { my ($name,$url)=split(/\=/,$curimport[$i]); @@ -789,12 +835,12 @@ sub smpedt { $importdetail=~s/^\&//; # ------------------------------------------------------------------- Clear all - } elsif ($ENV{'form.clear'}) { + } elsif ($env{'form.clear'}) { $importdetail=''; # ------------------------------------------------------------ Discard selected - } elsif ($ENV{'form.discard'}) { + } elsif ($env{'form.discard'}) { $importdetail=''; - my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + my @curimport=split(/\&/,$env{'form.curimpdetail'}); foreach (@importselect) { $curimport[$_]=''; } @@ -805,9 +851,9 @@ sub smpedt { } } # --------------------------------------------------------- Loading another map - } elsif ($ENV{'form.loadmap'}) { + } elsif ($env{'form.loadmap'}) { $importdetail=''; - my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + my @curimport=split(/\&/,$env{'form.curimpdetail'}); my $lastsel; @@ -825,11 +871,11 @@ sub smpedt { } foreach ( - &Apache::lonsequence::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).'='. - &Apache::lonnet::escape($url); + $importdetail.='&'.&escape($name).'='. + &escape($url); } } @@ -843,19 +889,19 @@ sub smpedt { $importdetail=~s/^\&//; # ------------------------------------------------ Groupimport/search to target - } elsif ($ENV{'form.importdetail'}) { + } elsif ($env{'form.importdetail'}) { my $lastsel; if (defined($targetselect[-1])) { $lastsel=$targetselect[-1]; } else { $lastsel=$#order+1; } - &pastetarget($lastsel,split(/\&/,$ENV{'form.importdetail'})); + &pastetarget($lastsel,split(/\&/,$env{'form.importdetail'})); &storemap(&Apache::lonnet::filelocation('',$url)); # ------------------------------------------------------------------------- Cut - } elsif (($ENV{'form.cut'}) || ($ENV{'form.copy'})) { + } elsif (($env{'form.cut'}) || ($env{'form.copy'})) { $importdetail=''; - my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + my @curimport=split(/\&/,$env{'form.curimpdetail'}); my $lastsel; @@ -875,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); } } @@ -889,21 +935,25 @@ sub smpedt { $importdetail=~s/\&+/\&/g; $importdetail=~s/^\&//; - if ($ENV{'form.cut'}) { + 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]; } + if ($include) { + $neworder[$#neworder+1]=$order[$i]; + } else { + &makezombie($order[$i]); + } } @order=@neworder; &storemap(&Apache::lonnet::filelocation('',$url)); } # ----------------------------------------------------------------------- Paste - } elsif ($ENV{'form.paste'}) { + } elsif ($env{'form.paste'}) { my $lastsel; if (defined($targetselect[-1])) { $lastsel=$targetselect[-1]; @@ -911,14 +961,14 @@ sub smpedt { $lastsel=$#order+1; } my @newsequence; - my @curimport=split(/\&/,$ENV{'form.curimpdetail'}); + 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'}) { + } elsif ($env{'form.moveup'}) { foreach (sort @targetselect) { if ($_-1>0) { my $movethis=$order[$_-1]; @@ -928,7 +978,7 @@ sub smpedt { } &storemap(&Apache::lonnet::filelocation('',$url)); # ------------------------------------------------------------------ Move down - } elsif ($ENV{'form.movedown'}) { + } elsif ($env{'form.movedown'}) { foreach (reverse sort @targetselect) { if ($_-1<$#order) { my $movethis=$order[$_-1]; @@ -938,10 +988,10 @@ sub smpedt { } &storemap(&Apache::lonnet::filelocation('',$url)); # --------------------------------------------------------------------- Rename - } elsif ($ENV{'form.renameres'}) { - my $residx=$Apache::lonratedt::order[$ENV{'form.renameidx'}-1]; + } 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=$env{'form.renametitle'}; $name=~s/\:/\&colon\;/g; $Apache::lonratedt::resources[$residx]=$name.':'.join(':',@resrest); &storemap(&Apache::lonnet::filelocation('',$url)); @@ -959,7 +1009,7 @@ sub smpedt { my ($name,$url)=split(/\=/,$_); unless ($name) { $name=(split(/\//,$url))[-1]; } unless ($name) { $name='EMPTY'; } - ''; } } split(/\&/,$importdetail)); @@ -972,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; ''; @@ -981,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', @@ -1003,11 +1052,10 @@ sub smpedt { 'cs' => 'Cut selected', 'ps' => 'Copy selected', 'pas' => 'Paste after selected', + 'reco' => 'Recover Deleted' ); - $r->print(< - - - -$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(<$errtext - +$end_page ENDSMPHEAD } # ----------------------------------------------------------------- No such dir sub nodir { my ($r,$dir)=@_; - $dir=~s/^\/home\/\w+\/public\_html//; - $r->print(< - -

No such directory: $dir

- - -ENDNODIR + $dir=~s{^/home/\w+/public_html}{}; + $r->print(&Apache::loncommon::start_page(undef,undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF',}). + "

No such directory: $dir

". + &Apache::loncommon::end_page()); } # ---------------------------------------------------------------- View Handler sub viewmap { my ($r,$url,$adv,$errtext)=@_; - $r->print(''. - &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.'

'); @@ -1149,6 +1207,14 @@ sub viewmap { if ($adv) { $r->print('

'.&mt('Map contents are not shown in order.').'

'); } + $r->print( ''. + ''. + ''. + ''. + ''. + ''. + ''); + my @backgroundColors = ("#FFFFFF", "#F6F6F6"); foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) { if (defined($_)) { $idx++; @@ -1157,16 +1223,33 @@ sub viewmap { $title=~s/\&colon\;/\:/g; $url=~s/\&colon\;/\:/g; unless ($title) { $title=(split(/\//,$url))[-1] }; - unless ($title) { $title='Empty'; } + unless ($title) { $title=''.&mt('Empty').''; } + 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(''."\n"); } } - $r->print(''); + $r->print('

'.&mt('Type').'	'.&mt('Title in map').'	'.&mt('Filename of resource').'	'.&mt('Link to published resource').'	'.&mt('Link to resource in Construction Space').'
'. + '	'.&Apache::lonratsrv::qtescape($title). + '	'.$filename.'	'); + if ($url) { + $r->print(''.&mt('Resource space').''); + } + $r->print('	'); if ($url) { - $r->print(''); + $r->print(''. + &mt('Construction space').''); } - $r->print(&Apache::lonratsrv::qtescape($title)); - if ($url) { $r->print(''); } - $r->print(" \n"); + $r->print('

'); + $r->print(&Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -1177,7 +1260,7 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - my $target = $ENV{'form.grade_target'}; + my $target = $env{'form.grade_target'}; if ($target eq 'meta') { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -1196,8 +1279,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>); @@ -1215,9 +1298,9 @@ 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'}) { + } elsif ($env{'form.forcesmp'}) { &smpedt($r,$url,$errtext); } else { &viewmap($r,$url,$adv,$errtext);