--- loncom/interface/lonsearchcat.pm	2007/03/03 01:54:00	1.280
+++ loncom/interface/lonsearchcat.pm	2007/04/13 23:05:40	1.284
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.280 2007/03/03 01:54:00 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.284 2007/04/13 23:05:40 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',
@@ -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" '.
@@ -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.
@@ -1854,7 +1858,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2510,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;
     #