[LON-CAPA-cvs] cvs: rat / lonratedt.pm lonsequence.pm

[albertel]

albertel		Thu Nov  2 16:27:59 2006 EDT

  Modified files:              
    /rat	lonratedt.pm lonsequence.pm 
  Log:
  - complete switch to LONCAPA::map
  
  
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.84 rat/lonratedt.pm:1.85
--- rat/lonratedt.pm:1.84	Thu Nov  2 16:03:28 2006
+++ rat/lonratedt.pm	Thu Nov  2 16:27:58 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.84 2006/11/02 21:03:28 albertel Exp $
+# $Id: lonratedt.pm,v 1.85 2006/11/02 21:27:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,15 +167,12 @@
 use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet;
-use Apache::lonratsrv;
-use Apache::lonsequence;
-use Apache::loncommon;
+use Apache::lonsequence();
+use Apache::loncommon();
 use Apache::lonlocal;
 use LONCAPA::map();
 use File::Copy;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
- 
 
 
 # --------------------------------------------------------- Build up RAT screen
@@ -807,7 +804,7 @@
             $url=~s/\&colon\;/\:/g;
             unless ($title) { $title=(split(/\//,$url))[-1] };
             unless ($title) { $title='<i>'.&mt('Empty').'</i>'; }
-            my $resurl = &Apache::lonratsrv::qtescape($url);
+            my $resurl = &LONCAPA::map::qtescape($url);
             my $resfilepath = $Apache::lonnet::perlvar{'lonDocRoot'}.$resurl;
             my $filename; 
             if ($resurl =~ m#/([^/]+)$#) {
@@ -818,7 +815,7 @@
             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>'.&LONCAPA::map::qtescape($title).
                       '</td><td>'.$filename.'</td><td>');
             if ($url) {
 		$r->print('<a href="'.$resurl.'">'.&mt('Resource space').'</a>');
Index: rat/lonsequence.pm
diff -u rat/lonsequence.pm:1.28 rat/lonsequence.pm:1.29
--- rat/lonsequence.pm:1.28	Thu Nov  2 16:15:22 2006
+++ rat/lonsequence.pm	Thu Nov  2 16:27:58 2006
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.28 2006/11/02 21:15:22 albertel Exp $
+# $Id: lonsequence.pm,v 1.29 2006/11/02 21:27:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,7 +34,6 @@
 use Apache::Constants qw(:common :http REDIRECT);
 use GDBM_File;
 use LONCAPA::map();
-use Apache::lonratsrv();
 use Apache::lonpageflip();
 use Apache::loncommon();
 use Apache::lonlocal;
@@ -189,9 +188,9 @@
 <input type='hidden' name='title' value='$title'>
 ENDCHECKBOX
                 }
-		$r->print('<a href="'.&Apache::lonratsrv::qtescape($url).'">');
+		$r->print('<a href="'.&LONCAPA::map::qtescape($url).'">');
             }
-            $r->print(&Apache::lonratsrv::qtescape($title));
+            $r->print(&LONCAPA::map::qtescape($title));
             if ($url) { $r->print('</a>'); }
             if ($successtied) {
 		$r->print('</form>');