--- loncom/interface/lonsearchcat.pm	2016/08/04 21:23:57	1.331.4.12
+++ loncom/interface/lonsearchcat.pm	2025/03/18 18:57:28	1.361
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.12 2016/08/04 21:23:57 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.361 2025/03/18 18:57:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,16 @@ sub handler {
     } 
     my $crumb_text = 'Portfolio Search';
     if (@allowed_searches ==2) {
-       $crumb_text = 'Portfolio and Catalog Search'; 
+       $crumb_text = 'Portfolio and Content Library Search'; 
+    }
+    my $target = '_top';
+    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
+        if ($env{'form.phase'} =~ /^(sort|run_search)$/) {
+            $target = '_parent';
+        } else {
+            $target = '_self';
+        }
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
@@ -185,7 +194,7 @@ sub handler {
                '&launch='.$env{'form.launch'}.
                '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
-              target=>'_top',
+              target=>$target,
               bug=>'Searching',});
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
@@ -299,7 +308,7 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
-        my $srchtype = 'Catalog';
+        my $srchtype = 'Content Library';
         if ($env{'form.area'} eq 'portfolio') {
             $srchtype = 'Portfolio';
         }
@@ -328,10 +337,10 @@ END
                  ['query','customquery','customshow',
                   'libraries','pretty_string','domains']);
         if ($env{'form.phase'} eq 'sort') {
-            &print_sort_form($r,$pretty_string);
+            &print_sort_form($r,$pretty_string,$target);
         } elsif ($env{'form.phase'} eq 'run_search') {
             &run_search($r,$query,$customquery,$customshow,
-                        $libraries,$pretty_string,$env{'form.area'},$domainsref);
+                        $libraries,$pretty_string,$env{'form.area'},$domainsref,$target);
         }
     } elsif(($env{'form.phase'} eq 'basic_search') ||
             ($env{'form.phase'} eq 'adv_search')) {
@@ -390,7 +399,7 @@ END
         }
     }
     return OK;
-} 
+}
 
 #
 # The mechanism used to store values away and retrieve them does not
@@ -433,7 +442,7 @@ sub hidden_field {
 =pod
 
 =over 4
-
+ 
 =item &print_basic_search_form() 
 
 Prints the form for the basic search.  Sorry the name is so cryptic.
@@ -465,7 +474,7 @@ sub setup_basic_search {
     my ($r,$area,$hidden_fields,$closebutton) = @_;
     # Define interface components
     my %lt = &Apache::lonlocal::texthash (
-                              res => 'LON-CAPA Catalog Search',
+                              res => 'Content Library Search',
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
@@ -479,14 +488,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?'.
@@ -521,7 +547,7 @@ sub setup_basic_search {
              &Apache::lonhtmlcommon::textbox('basicexp',
                                              $env{'form.basicexp'},50).
              '<br />'.
-            '<span class="LC_fontsize_small">'.&searchhelp().'</span>'.'</td>'.
+            '<span class="LC_fontsize_medium">'.&searchhelp().'</span>'.'</td>'.
             '<td>'.
             '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
             '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
@@ -573,7 +599,7 @@ sub print_advanced_search_form{
 $closebutton
 </p>
 END
-    my $srchtype = 'Catalog';
+    my $srchtype = 'Content Library';
     my $jscript;
     if ($env{'form.area'} eq 'portfolio') {
         $srchtype = 'Portfolio';
@@ -591,7 +617,7 @@ function additional_metadata() {
     }
     my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
                                                $jscript);
-    $scrout .= $bread_crumb;
+    $scrout .= $bread_crumb.'<div class="LC_landmark" role="main">'."\n";
 
     $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
               .$hidden_fields 
@@ -610,7 +636,7 @@ function additional_metadata() {
 
     # Standard Metadata
     $scrout .= &Apache::lonhtmlcommon::row_headline()
-              .'<h3>'.&mt("Standard $srchtype Metadata").'</h3>'
+              .'<h2 class="LC_heading_2">'.&mt("Standard $srchtype Metadata").'</h2>'
               .&searchhelp()
               .&Apache::lonhtmlcommon::row_closure();
     my %related_word_search = 
@@ -630,47 +656,68 @@ function additional_metadata() {
     foreach my $field ('title','author','subject','owner','authorspace',
                        'modifyinguser','keywords','notes','abstract',
                        'standards','mime') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="'.$field.'">'.
+                                                     &titlefield($fields{$field}).'</label>')
                   .&Apache::lonmeta::prettyinput($field,
-                                          $env{'form.'.$field},
+                                          $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           $related_word_search{$field},
-                                          '',
+                                          '&nbsp;&nbsp;',
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= &mt('related words');
+            $scrout .= '<label for="'.$field.'_related">'.&mt('related words').'</label>';
         } else {
             $scrout .= '';
         }
         $scrout .= &Apache::lonhtmlcommon::row_closure();
     }
     foreach my $field ('lowestgradelevel','highestgradelevel') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield($fields{$field}))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="'.$field.'">'.
+                                                     &titlefield($fields{$field}).'</label>')
                   .&Apache::lonmeta::prettyinput($field,
-                                          $env{'form.'.$field},
+                                          $env{'form.'.$field},'',
                                           $field,
                                           'advsearch',
                                           0)
                   .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('MIME Type Category')))
+    $scrout .= &Apache::lonhtmlcommon::row_title('<label for="category">'.
+                                                 &titlefield(&mt('MIME Type Category')).'</label>')
               .&Apache::loncommon::filecategoryselect('category',
-                   $env{'form.category'})
+                   $env{'form.category'},'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('<label for="domains">'.
+                                                 &titlefield(&mt('Domains')).'</label>');
+    if ($anydomain) {
+        my $defdom = &Apache::lonnet::default_login_domain();
+        my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom);
+        $scrout .= &Apache::loncommon::domain_select('domains',
+                   $env{'form.domains'},1,$trusted,$untrusted,'domains');
+    } else {
+        $scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'},
+                                                       'domains','','','',
+                                                       [$env{'user.domain'}],'',1,'domains');
+    }
+    $scrout .= &Apache::lonhtmlcommon::row_closure();
 
     # Misc metadata
     if ($env{'form.area'} ne 'portfolio') {
-        $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Copyright/Distribution')))
+        $scrout .= &Apache::lonhtmlcommon::row_title('<label for="copyright">'.
+                                                     &titlefield(&mt('Copyright/Distribution')).'</label>')
                   .&Apache::lonmeta::selectbox('copyright',
-                                             $env{'form.copyright'},
+                                             $env{'form.copyright'},'',
+                                             'copyright', 
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
@@ -678,9 +725,10 @@ function additional_metadata() {
                   .&Apache::lonhtmlcommon::row_closure();
     }
 
-    $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Language')))
+    $scrout .= &Apache::lonhtmlcommon::row_title('<label for="language">'.
+                                                 &titlefield(&mt('Language'))'</label>')
               .&Apache::lonmeta::selectbox('language',
-                                    $env{'form.language'},
+                                    $env{'form.language'},'','language',
                                     \&Apache::loncommon::languagedescription,
                                     ('any',&Apache::loncommon::languageids)
                                     )
@@ -693,26 +741,32 @@ function additional_metadata() {
         if ($curnumadd eq '') {
             $curnumadd = 1;
         }
+        my $customlabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Custom Metadata fields').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure()
-                  .&Apache::lonhtmlcommon::row_title('')
+                  .&Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$customlabel.'</span>',
+                                                     '','','',1)
                   .&mt('Field Name').' | '.&mt('Field Value(s)')
                   .&Apache::lonhtmlcommon::row_closure();
 
         for (my $j=0; $j<$curnumadd; $j++) {
             my $num = $j+1;
+            my $namelabel = &mt('name of custom metadata field [_1]',$num);
+            my $valuelabel = &mt('value of custom metadata field [_1]',$num);
             $scrout .= &Apache::lonhtmlcommon::row_title(&mt('Custom metadata [_1]',$num))
-                      .'<input type="text"'
+                      .'<input type="text" id="addedfield_'.$j.'"'
                       .' name="addedfield_'.$j.'" size="10"'
-                      .' value="'.$env{'form.addedfield_'.$j}.'" />'
+                      .' value="'.$env{'form.addedfield_'.$j}.'" aria-label="'.$namelabel.'" />'
                       .' '
                       .'<input type="text" '
                       .'name="addedvalues_'.$j.'" size="15"'
-                      .' value="'.$env{'form.addedvalues_'.$j}.'" />'
+                      .' value="'.$env{'form.addedvalues_'.$j}.'" aria-label="'.$valuelabel.'" />'
                       .&Apache::lonhtmlcommon::row_closure();
         }
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        my $addcustomlabel = &mt('Add metadata field option'); 
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$addcustomlabel.'</span>',
+                                                     '','','',1)
                   .'<label>'
                   .'<input type="checkbox" name="newfield"'
                   .' value="1" onclick="javascript:additional_metadata()" />'
@@ -723,65 +777,90 @@ function additional_metadata() {
 } else {
         #
         # Dynamic metadata
+        my $statslabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Problem Statistics').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure();
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$statslabel.'</span>',
+                                                     '','','',1)
                   .&mt('Minimum').' | '.&mt('Maximum')
                   .&Apache::lonhtmlcommon::row_closure();
         foreach my $statistic 
             ({ name=>'count',
-               description=>'Network-wide number of accesses (hits)',},
+               description=>'Network-wide number of accesses (hits)',
+               minlabel => 'minimum hit count',
+               maxlabel => 'maximum hit count'},
              { name=>'stdno',
                description=>
-               'Statistics calculated for number of students',},
+               'Statistics calculated for number of students',
+               minlabel => 'minimum number of students in calculation',
+               maxlabel => 'maximum number of students in calculation'},
              { name => 'avetries',
-               description=>'Average number of tries till solved',},
+               description=>'Average number of tries till solved',
+               minlabel => 'minimum average tries till solved',
+               maxlabel => 'maximum average tries till solved'},
              { name => 'difficulty',
-               description=>'Degree of difficulty',},
+               description=>'Degree of difficulty',
+               minlabel => 'minimum degree of difficulty',
+               maxlabel => 'maximum degree of difficulty'},
              { name => 'disc',
-               description=>'Degree of discrimination'}) {
+               description=>'Degree of discrimination',
+               minlabel => 'minimum degree of discrimination',
+               maxlabel => 'maximum degree of discrimination'}) {
               $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($statistic->{'description'})))
                         .'<input type="text" name="'.$statistic->{'name'}
-                        .'_min" value="" size="6" />'
+                        .'_min" value="" size="6" aria-label="'.&mt($statistic->{'minlabel'}).'" />'
                         .' '
                         .'<input type="text" name="'.$statistic->{'name'}
-                        .'_max" value="" size="6" />'
+                        .'_max" value="" size="6" aria-label="'.&mt($statistic->{'maxlabel'}).'" />'
                         .&Apache::lonhtmlcommon::row_closure();
         }
-
+        my $evallabel = &mt('Text box description');
         $scrout .= &Apache::lonhtmlcommon::row_headline()
                   .'<h3>'.&mt('Evaluation Data').'</h3>'
                   .&Apache::lonhtmlcommon::row_closure();
-        $scrout .= &Apache::lonhtmlcommon::row_title('')
+        $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$evallabel.'</span>',
+                                                     '','','',1)
                   .&mt('Minimum').' | '.&mt('Maximum')
                   .&Apache::lonhtmlcommon::row_closure();
         foreach my $evaluation
             ( { name => 'clear',
-                description => 'Material presented in clear way'},
+                description => 'Material presented in clear way',
+                minlabel => 'minimum score: clarity',
+                maxlabel => 'maximum score: clarity'},
               { name =>'depth',
-                description => 'Material covered with sufficient depth'},
+                description => 'Material covered with sufficient depth',
+                minlabel => 'minimum score: coverage depth',
+                maxlabel => 'maximum score: coverage depth'},
               { name => 'helpful',
-                description => 'Material is helpful'},
+                description => 'Material is helpful',
+                minlabel => 'minimum score: content helpful',
+                maxlabel => 'maximum score: content helpful'},
               { name => 'correct',
-                description => 'Material appears to be correct'},
+                description => 'Material appears to be correct',
+                minlabel => 'minimum score: correctness',
+                maxlabel => 'maximum score: correctness'},
               { name => 'technical',
-                description => 'Resource is technically correct'}){
+                description => 'Resource is technically correct',
+                minlabel => 'minimum score: technical correctness',
+                maxlabel => 'maximum score: technical correctness'}) {
             $scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt($evaluation->{'description'})))
                       .'<input type="text" name="'
-                      .$evaluation->{'name'}.'_min" value="" size="6" />'
+                      .$evaluation->{'name'}.'_min" value="" size="6" aria-label="'.&mt($evaluation->{'minlabel'}).'" />'
                       .' '
                       .'<input type="text" name="'
-                      .$evaluation->{'name'}.'_max" value="" size="6" />'
+                      .$evaluation->{'name'}.'_max" value="" size="6" aria-label="'.&mt($evaluation->{'maxlabel'}).'" />'
                       .&Apache::lonhtmlcommon::row_closure();
         }
     }
     #
     # Creation/Modification date limits
+    my $dateslabel = &mt('Text box description');
     $scrout .= &Apache::lonhtmlcommon::row_headline()
               .'<h3>'.&mt('Creation and Modification dates').'</h3>'
               .&Apache::lonhtmlcommon::row_closure();
-    $scrout .= &Apache::lonhtmlcommon::row_title('')
+    $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$dateslabel.'</span>',
+                                                 '','','',1)
               .&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)
               .&Apache::lonhtmlcommon::row_closure();
 
@@ -840,7 +919,7 @@ function additional_metadata() {
     $scrout .= $advanced_buttons
               .'</form>';
 
-    $scrout .= &Apache::loncommon::end_page();
+    $scrout .= '</div>'.&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -913,20 +992,20 @@ sub viewoptions {
     if (! defined($env{'form.viewselect'})) { 
         $env{'form.viewselect'}='detailed'; 
     }
-    $scrout .= '<span class="LC_nobreak">'
+    $scrout .= '<span class="LC_nobreak"><label>'
               .&mt('Type:').' '
               .&Apache::lonmeta::selectbox('viewselect',
-                   $env{'form.viewselect'},
+                   $env{'form.viewselect'},'','',
                    \&viewoptiontext,
                    sort(keys(%Views)))
-              .'</span>';
+              .'</label></span>';
     my $countselect = &Apache::lonmeta::selectbox('show',
-                                                  $env{'form.show'},
+                                                  $env{'form.show'},'','',
                                                   undef,
                                                   (10,20,50,100,1000,10000));
-    $scrout .= ' <span class="LC_nobreak">'
+    $scrout .= ' <span class="LC_nobreak"><label>'
               .&mt('Records per Page:').' '.$countselect
-              .'</span>'.$/;
+              .'</label></span>'.$/;
     return $scrout;
 }
 
@@ -1852,6 +1931,8 @@ sub build_date_queries {
             my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore);
             # Correct for year being relative to 1900
             $cayear+=1900; $cbyear+=1900;
+            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
+            $camon++; $cbmon++;
             my $cquery=
                 '(creationdate BETWEEN '.
                 "'".$cayear.'-'.$camon.'-'.$caday."'".
@@ -1870,6 +1951,8 @@ sub build_date_queries {
             my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore);
             # Correct for year being relative to 1900
             $mayear+=1900; $mbyear+=1900;
+            # Correct month; localtime gives month 0..11 but MySQL expects 1..12
+            $mamon++; $mbmon++;
             my $mquery=
                 '(lastrevisiondate BETWEEN '.
                 "'".$mayear.'-'.$mamon.'-'.$maday."'".
@@ -2019,7 +2102,7 @@ a link to change the search query.
 ######################################################################
 ######################################################################
 sub print_sort_form {
-    my ($r,$pretty_query_string) = @_;
+    my ($r,$pretty_query_string,$target) = @_;
 
     ##
     my %SortableFields=&Apache::lonlocal::texthash( 
@@ -2052,29 +2135,20 @@ sub print_sort_form {
         &Apache::lonnet::logthis(&Apache::lonmysql::get_error());
         return;
     }
-    my $js =<<END;
-<script type="text/javascript">
-// <![CDATA[
-    function change_sort() {
-        var newloc = "/adm/searchcat?phase=results";
-        newloc += "&persistent_db_id=$env{'form.persistent_db_id'}";
-        newloc += "&sortby=";
-        newloc += document.forms.statusform.elements.sortby.value;
-        parent.resultsframe.location= newloc;
+    my $args;
+    if ($target eq '_parent') {
+        $args = {'links_target' => $target};
     }
-// ]]>
-</script>
-END
-
-    my $start_page = &Apache::loncommon::start_page('Results');
+    my $start_page = &Apache::loncommon::start_page('Results',undef,$args);
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import');
+					    $env{'form.catalogmode'} ne 'import',
+                                            '','','','','','',$target);
 
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post" target="_top">
+<form name="statusform" action="" method="post" target="$target">
 <input type="hidden" name="catalogmode" value="import" />
 <input type="hidden" name="acts" value="" />
 END
@@ -2325,7 +2399,7 @@ results into MySQL.
 ######################################################################
 sub run_search {
     my ($r,$query,$customquery,$customshow,$serverlist,
-        $pretty_string,$area,$domainsref) = @_;
+        $pretty_string,$area,$domainsref,$target) = @_;
     my $tabletype = 'metadata';
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
@@ -2334,10 +2408,15 @@ sub run_search {
     #
     # Print run_search header
     #
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef);
+    my $args;
+    if ($target eq '_parent') {
+        $args = {'links_target' => $target};
+    }
+    my $start_page = &Apache::loncommon::start_page('Search Status',undef,$args);
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
-					    $env{'form.catalogmode'} ne 'import');
+					    $env{'form.catalogmode'} ne 'import',
+                                            '','','','','','',$target);
     $r->print(<<END);
 $start_page
 $breadcrumbs
@@ -2385,8 +2464,6 @@ END
         %all_library_servers = (%library_servers,%older_library_servers);
         @Servers_to_contact = sort(keys(%all_library_servers));
         foreach my $server (@Servers_to_contact) {
-            my %possdoms;
-            map { $possdoms{$_}=1;  } &Apache::lonnet::machine_domains($all_library_servers{$server});
             $domains_by_server{$server} =
                 join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
         }
@@ -2426,6 +2503,7 @@ END
     ## Prepare for the big loop.
     my $hitcountsum;
     my $oldhitcountsum;
+    my $displaycount;
     my %matches;
     my $server; 
     my $status;
@@ -2472,7 +2550,7 @@ END
                 &update_status($r,
                        &mt('waiting on [_1]',join(' ',keys(%Server_status))));
             }
-            sleep(0.1); 
+            sleep(0.1);
         }
         #
         # Loop through the servers we have contacted but do not
@@ -2525,8 +2603,8 @@ END
 
                     if ($area eq 'portfolio') {
                         next if (defined($matches{$Fields{'url'}}));
-                        # Skip if inaccessible
-                        next if (!&Apache::lonnet::portfolio_access($Fields{'url'}));
+                        # Skip unless access control set to public or passphrase-protected
+                        next unless (($Fields{'scope'} eq 'public') || ($Fields{'scope'} eq 'guest'));
                         $matches{$Fields{'url'}} = 1; 
                     }
                     #
@@ -2550,8 +2628,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;
             }
@@ -2657,11 +2737,11 @@ sub display_results {
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
-        }
+        } 
         # untie %groupsearch_db if the connection gets aborted before the end
         $r->register_cleanup(sub {
             untie %groupsearch_db if (tied(%groupsearch_db));
-        }); 
+        });
     }
     ##
     ## Prepare the table for querying
@@ -3214,7 +3294,6 @@ sub print_frames_interface {
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
-// <![CDATA[
 var targetwin = opener;
 var queue = '';
 
@@ -3237,7 +3316,6 @@ function done_loading_results() {
         update_results(new_location);
     }
 }
-// ]]>
 </script>
 JS
 
@@ -3548,18 +3626,13 @@ sub display_url {
         # (because the search opens in a new window, it gets
         # confusing when the links open a tab in the
         # parent window; ideally we should not force windows)
-        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\"";
+        my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\""; 
         $link=&Apache::lonhtmlcommon::crumbs(
                   $url,
                   'preview',
                   '',
-                  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
+                  '',
                   $skiplast,$onclick).' ';
-        # replace the links to open in a new window
-        # (because the search opens in a new window, it gets
-        # confusing when the links open a tab in the
-        # parent window; ideally we should not force windows)
-        $link =~ s/(href="[^"]*")/\1 onclick="window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;"/g;
     }
     return $link;
 }