--- rat/lonsequence.pm 2006/04/04 15:32:12 1.26 +++ rat/lonsequence.pm 2006/11/02 21:27:58 1.29 @@ -2,7 +2,7 @@ # # Sequence Handler # -# $Id: lonsequence.pm,v 1.26 2006/04/04 15:32:12 albertel Exp $ +# $Id: lonsequence.pm,v 1.29 2006/11/02 21:27:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,8 +26,6 @@ # # http://www.lon-capa.org/ # -# (Handler to resolve ambiguous file locations -# package Apache::lonsequence; @@ -35,10 +33,9 @@ use strict; use Apache::lonnet; use Apache::Constants qw(:common :http REDIRECT); use GDBM_File; -use Apache::lonratedt; -use Apache::lonratsrv; -use Apache::lonpageflip; -use Apache::loncommon; +use LONCAPA::map(); +use Apache::lonpageflip(); +use Apache::loncommon(); use Apache::lonlocal; my %selhash; @@ -50,7 +47,7 @@ sub attemptread { my $fn=shift; &Apache::lonnet::repcopy($fn); if (-e $fn) { - return &Apache::lonratedt::attemptread($fn); + return &LONCAPA::map::attemptread($fn); } else { return (); } @@ -60,7 +57,7 @@ sub mapread { my $fn=shift; &Apache::lonnet::repcopy($fn); if (-e $fn) { - return &Apache::lonratedt::mapread($fn,''); + return &LONCAPA::map::mapread($fn,''); } else { return (); } @@ -108,7 +105,7 @@ onClick="javascript:select_group()"> ENDSELECT my $diropendb = - "/home/httpd/perl/tmp/$env{'user.domain'}\_$env{'user.name'}_groupsec.db"; + "/home/httpd/perl/tmp/$env{'user.domain'}\_$env{'user.name'}_sel_res.db"; if (tie(%selhash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { if ($env{'form.launch'} eq '1') { &start_fresh_session(); @@ -116,7 +113,7 @@ ENDSELECT $successtied=1; # - Evaluate actions from previous page (both cumulatively and chronologically) - if ($env{'form.catalogmode'} eq 'groupimport') { + if ($env{'form.catalogmode'} eq 'import') { my $acts=$env{'form.acts'}; my @Acts=split(/b/,$acts); my %ahash; @@ -191,9 +188,9 @@ value='$url' onClick='javascript:queue(" ENDCHECKBOX } - $r->print(''); + $r->print(''); } - $r->print(&Apache::lonratsrv::qtescape($title)); + $r->print(&LONCAPA::map::qtescape($title)); if ($url) { $r->print(''); } if ($successtied) { $r->print('');