--- loncom/metadata_database/searchcat.pl	2013/08/22 09:30:21	1.81
+++ loncom/metadata_database/searchcat.pl	2016/01/27 22:22:59	1.83
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # searchcat.pl "Search Catalog" batch script
 #
-# $Id: searchcat.pl,v 1.81 2013/08/22 09:30:21 bisitz Exp $
+# $Id: searchcat.pl,v 1.83 2016/01/27 22:22:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -374,7 +374,7 @@ foreach my $dom (@domains) {
                     my $hostname = &Apache::lonnet::hostname($lonhost);
                     my $replytoaddress = 'do-not-reply@'.$hostname;
                     $msg->add('Reply-to',$replytoaddress);
-                    $msg->add('From',"www@$hostname");
+                    $msg->add('From','www@'.$hostname);
                     $msg->add('Content-type','text/plain; charset=UTF-8');
                     if (my $fh = $msg->open()) {
                         print $fh 
@@ -460,7 +460,7 @@ sub descend_tree {
         closedir(DIR);
         $depth ++;
         foreach my $item (@contents) {
-            if ($depth < 4) {
+            if (($depth < 4) && (length($item) == 1)) {
                 &descend_tree($dom,$dir.'/'.$item,$depth,$allportusers,$alldomusers);
             } else {
                 if (-e $dir.'/'.$item.'/file_permissions.db') {