--- loncom/interface/lonindexer.pm	2012/07/11 12:51:36	1.215
+++ loncom/interface/lonindexer.pm	2014/05/31 16:01:33	1.221
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.215 2012/07/11 12:51:36 www Exp $
+# $Id: lonindexer.pm,v 1.221 2014/05/31 16:01:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,9 +34,8 @@
 ## 1. Description of functions                                               ##
 ## 2. Modules used by this module                                            ##
 ## 3. Choices for different output views (detailed, summary, xml, etc)       ##
-## 4. BEGIN block (to be run once after compilation)                         ##
-## 5. Handling routine called via Apache and mod_perl                        ##
-## 6. Other subroutines                                                      ##
+## 4. Handling routine called via Apache and mod_perl                        ##
+## 5. Other subroutines                                                      ##
 ##                                                                           ##
 ###############################################################################
 
@@ -60,7 +59,6 @@ use LONCAPA qw(:match);
 # ---------------------------------------- variables used throughout the module
 my %hash; # global user-specific gdbm file
 my %dirs; # keys are directories, values are the open/close status
-my %language; # has the reference information present in language.tab
 my %dynhash; # hash of hashes for dynamic metadata
 my %dynread; # hash of directories already read for dynamic metadata
 my %fieldnames; # Metadata fieldnames
@@ -94,15 +92,8 @@ sub handler {
     undef (@Omit);
     %fieldnames=&Apache::lonmeta::fieldnames();
 
-# ------------------------------------- read in machine configuration variables
+# --------------------------------------------------------------- get icon path
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $domain  = $r->dir_config('lonDefDomain');
-    my $role    = $r->dir_config('lonRole');
-    my $loadlim = $r->dir_config('lonLoadLim');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my $sysadm  = $r->dir_config('lonSysEMail');
-    my $lonhost = $r->dir_config('lonHostID');
-    my $tabdir  = $r->dir_config('lonTabDir');
 
 #SB my $fileclr='#ffffe6';
     my $line;
@@ -422,14 +413,9 @@ ENDHEADER
         } else {
             # Only display page header and breadcrumbs in non-popup mode
             &Apache::lonhtmlcommon::clear_breadcrumbs();
-#
-# FIXME: hard link to fhwfdev?
-#
-#
-
             &Apache::lonhtmlcommon::add_breadcrumb({
                 'text'  => 'Browse published resources',
-                'href'  => '/res/fhwfdev/?launch=1',
+                'href'  => '/res/'.$headerdom.'/?launch=1',
             });
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
                                                      {'domain' => $headerdom,})
@@ -1014,7 +1000,7 @@ $r->print ('<input type="hidden" name="a
 # Wishlistlink
         $r->print('</form></td><td><a href="javascript:;" '.
                   'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
-                  'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.
+                  'onclick="set_wishlistlink('."'$plainname','$startdir$listname"."/'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);
         $r->print(&Apache::loncommon::end_data_table_row());
@@ -1264,7 +1250,7 @@ $r->print ('<input type="hidden" name="a
 # Wishlistlink
         $r->print('</td><td><a href="javascript:;" '.
                   'title="'.&mt('Save a link for this folder in Stored Links').'" '.
-                  'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.
+                  'onclick="set_wishlistlink('."'$listname','$startdir$listname"."/'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 # Attributes
@@ -1311,8 +1297,8 @@ $r->print ('<input type="hidden" name="a
 	}
 	if ($hash{'display_attrs_7'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
-    }     
-    if ($hash{'display_attrs_11'} == 1) {
+        }
+        if ($hash{'display_attrs_11'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
 	if ($hash{'display_attrs_12'} == 1) {
@@ -1355,15 +1341,18 @@ sub coursecontext {
     my $filesymb=&Apache::lonnet::symbread($filelink);
     if ($filesymb) {
 	my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
-	$r->print(&mt('Already in this course:<br />[_1] in folder/map [_2].<br />',
-	      &Apache::lonnet::gettitle($resource),
-	      &Apache::lonnet::gettitle($map)));
+	$r->print(
+            &mt('Already in this course:').'<br />'
+           .&mt('[_1] in folder/map [_2]',
+                    &Apache::lonnet::gettitle($resource),
+                    &Apache::lonnet::gettitle($map))
+           .'<br />');
     }
 }
 
 sub showpreview {
     my ($filelink)=@_;
-    if ($filelink=~m-^(/ext/|http://)-) {
+    if ($filelink=~m-^(/ext/|https?://)-) {
 	return &mt('External Resource, preview not enabled');
     }
     my ($curfext)=($filelink=~/\.(\w+)$/);
@@ -1494,18 +1483,6 @@ This module enables a scheme of browsing
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
-=head1 BEGIN SUBROUTINE
-
-This routine is only run once after compilation.
-
-=over 4
-
-=item *
-
-Initializes %language hash table.
-
-=back
-
 =head1 HANDLER SUBROUTINE
 
 This routine is called by Apache and mod_perl.