[LON-CAPA-cvs] cvs: loncom /interface lonindexer.pm lonsearchcat.pm

[albertel]

albertel		Mon Jul 31 15:46:00 2006 EDT

  Modified files:              
    /loncom/interface	lonindexer.pm lonsearchcat.pm 
  Log:
  - style
  
  
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.150 loncom/interface/lonindexer.pm:1.151
--- loncom/interface/lonindexer.pm:1.150	Fri Jul 28 15:16:08 2006
+++ loncom/interface/lonindexer.pm	Mon Jul 31 15:45:57 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.150 2006/07/28 19:16:08 www Exp $
+# $Id: lonindexer.pm,v 1.151 2006/07/31 19:45:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1163,7 +1163,7 @@
 
 sub showpreview {
     my ($filelink)=@_;
-    if ($filelink=~/^(\/ext\/|http\:\/\/)/) {
+    if ($filelink=~m-^(/ext/|http://)-) {
 	return &mt('External Resource, preview not enabled');
     }
     my ($curfext)=($filelink=~/\.(\w+)$/);
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.274 loncom/interface/lonsearchcat.pm:1.275
--- loncom/interface/lonsearchcat.pm:1.274	Fri Jul 28 15:16:08 2006
+++ loncom/interface/lonsearchcat.pm	Mon Jul 31 15:45:58 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.274 2006/07/28 19:16:08 www Exp $
+# $Id: lonsearchcat.pm,v 1.275 2006/07/31 19:45:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3200,7 +3200,7 @@
     my ($prefix,%values) = @_;
     my $result;
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
         '<a href="'.$jumpurl.'" '.
@@ -3347,8 +3347,8 @@
     }
     my $jumpurl=$values{'url'};
     my $link;
-    if ($jumpurl=~/^\/ext\//) {
-	$jumpurl=~s/^\/ext\//http\:\/\//;
+    if ($jumpurl=~m|^/ext/|) {
+	$jumpurl=~s|^/ext/|http://|;
 	$link='<br /><tt>'.$jumpurl.'</tt>';
     } else {
 	$link=&Apache::lonhtmlcommon::crumbs($jumpurl,
@@ -3392,8 +3392,8 @@
     my ($prefix,%values) = @_;
     my $jumpurl=$values{'url'};
     my $link;
-    if ($jumpurl=~/^\/ext\//) {
-	$jumpurl=~s/^\/ext\//http\:\/\//;
+    if ($jumpurl=~m|^/ext/|) {
+	$jumpurl=~s|^/ext/|http://|;
 	$link='<tt>'.$jumpurl.'</tt>';
     } else {
         $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
@@ -3432,7 +3432,7 @@
     my $icon=&Apache::loncommon::icon($values{'url'});
     my %Translated = &Apache::lonmeta::fieldnames();
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
 
     my $result=<<END;
 $prefix <img src="$icon" />