--- loncom/interface/lonsearchcat.pm	2007/01/19 14:23:23	1.279
+++ loncom/interface/lonsearchcat.pm	2007/05/01 02:13:40	1.285
@@ -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.285 2007/05/01 02:13:40 www 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',
@@ -763,6 +764,9 @@ sub setup_basic_search {
                        '&launch='.$env{'form.launch'}.
                        '&mode='.$env{'form.mode'}.
                        '&area='.$area.
+                       '&form='.$env{'form.form'}.
+                       '&titleelement='.$env{'form.titleelement'}.
+                       '&element='.$env{'form.element'}.
                        '">'.&mt('Advanced Search').'</a>';
     #
     $scrout.='<form name="loncapa_search" method="post" '.
@@ -986,7 +990,7 @@ ENDHEADER
                description=>'Network-wide number of accesses (hits)',},
              { name=>'stdno',
                description=>
-               'Total number of students who have worked on this problem',},
+               'Statistics calculated for number of students',},
              { name => 'avetries',
                description=>'Average number of tries till solved',},
              { name => 'difficulty',
@@ -1391,7 +1395,7 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
-	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1532,7 +1536,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 +1677,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);
@@ -1856,7 +1858,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2512,7 +2514,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;
     #