--- loncom/interface/lonsearchcat.pm	2007/01/19 14:23:23	1.279
+++ loncom/interface/lonsearchcat.pm	2007/03/12 17:09:23	1.282
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.279 2007/01/19 14:23:23 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.282 2007/03/12 17:09:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -750,7 +750,8 @@ sub setup_basic_search {
                        '</label>';
     $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
       &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain'))).
+                                       $r->dir_config('lonDefDomain')),
+				      $r->dir_config('lonDefDomain')).
                         '</label>';
     if ($area eq 'res') {
         $inclext= '<label>'.&mt('[_1] include external resources',
@@ -1532,7 +1533,7 @@ sub parse_advanced_search {
             if ($field ne '') {
                 my $value = $env{'form.addedvalues_'.$i};
                 if ($value ne '') {
-                    $value =~ s/'/''/g;
+                    $value =~ s/'/''/g; #' stupid emacs
                     my ($error,$query) = 
                         &process_phrase_input($value,0,'pf.value');
                     if (!defined($error)) {
@@ -1673,11 +1674,9 @@ sub parse_domain_restrictions {
         foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";
         }
-        foreach (keys(%Apache::lonnet::libserv)) {
-            if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
-                push @$libraries_to_query,$_;
-            }
-        }
+	my %servers = &Apache::lonnet::get_servers(\@allowed_domains,
+						   'library');
+	$libraries_to_query = [keys(%servers)];
     }
     return ($libraries_to_query,
             $pretty_domains_string);
@@ -2512,7 +2511,8 @@ END
             @Servers_to_contact = ($serverlist);
         }
     } else {
-        @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
+	my %all_library_servers = &Apache::lonnet::all_library();
+        @Servers_to_contact = sort(keys(%all_library_servers));
     }
     my %Server_status;
     #