--- loncom/interface/lonsearchcat.pm	2016/08/04 20:59:22	1.349
+++ loncom/interface/lonsearchcat.pm	2016/11/15 20:03:50	1.351
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.349 2016/08/04 20:59:22 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.351 2016/11/15 20:03:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -479,14 +479,31 @@ sub setup_basic_search {
                      .&mt('use related words')
                      .'</label>';
 
+    my $anydom = 1;
+    if ($area eq 'res') {
+        unless (&Apache::lonnet::allowed('bre','/res/') eq 'F') {
+            $anydom = 0;
+        }
+    }
+    my $singledom;
+    my ($disabled,$checked);
+    if ($anydom) {
+       $singledom = $r->dir_config('lonDefDomain');
+       if ($env{'form.domains'} eq $singledom) {
+           $checked = 1;
+       }
+    } else {
+       $singledom = $env{'user.domain'};
+       $disabled = ' disabled="disabled"';
+       $checked = 1; 
+    }
     $onlysearchdomain = '<label>'
                        .&Apache::lonhtmlcommon::checkbox(
-                           'domains',
-                           $env{'form.domains'},
-                           $r->dir_config('lonDefDomain'))
+                           'domains',$checked,
+                           $singledom,$disabled)
                        .' '
                        .&mt('only search domain [_1]'
-                               ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+                               ,'<b>'.$singledom.'</b>')
                        .'</label>';
 
     $adv_search_link = '<a href="/adm/searchcat?'.
@@ -661,10 +678,22 @@ function additional_metadata() {
                    $env{'form.category'})
               .&Apache::lonhtmlcommon::row_closure();
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')))
-              .&Apache::loncommon::domain_select('domains',
-                   $env{'form.domains'},1)
-              .&Apache::lonhtmlcommon::row_closure();
+    my $anydomain = 1;
+    if ($env{'form.area'} ne 'portfolio') {
+        unless (&Apache::lonnet::allowed('bre','/res/')) {
+            $anydomain = 0; 
+        }
+    }
+
+    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains')));
+    if ($anydomain) {
+        $scrout .= &Apache::loncommon::domain_select('domains',
+                   $env{'form.domains'},1);
+    } else {
+        $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
+                                                       'domains','','','',[$env{'user.domain'}],'',1);
+    }
+    $scrout .= &Apache::lonhtmlcommon::row_closure();
 
     # Misc metadata
     if ($env{'form.area'} ne 'portfolio') {
@@ -2412,6 +2441,7 @@ END
     ## Prepare for the big loop.
     my $hitcountsum;
     my $oldhitcountsum;
+    my $displaycount;
     my %matches;
     my $server; 
     my $status;
@@ -2536,8 +2566,10 @@ END
             last if ($connection->aborted());
             if ($oldhitcountsum < $hitcountsum) {
                 &update_count_status($r,$hitcountsum);
-                if ($hitcountsum <= $env{'form.show'}) {
+                if (($hitcountsum <= $env{'form.show'}) ||
+                    (!$displaycount && $hitcountsum)) {
                     reload_result_frame($r);
+                    $displaycount = $hitcountsum;
                 }
                 $oldhitcountsum = $hitcountsum;
             }