--- loncom/interface/lonsearchcat.pm	2007/03/12 17:06:15	1.281
+++ loncom/interface/lonsearchcat.pm	2007/05/02 01:33:49	1.286
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.281 2007/03/12 17:06:15 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.286 2007/05/02 01:33:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -379,7 +379,7 @@ END
                                      $errorstring);
 
 	    my $msg = 
-		'Unable to create table in which to store search results. '.
+		'Unable to create table in which to save search results. '.
 		'The search has been aborted.';
 	    &Apache::loncommon::simple_error_page($r,'Search Error',
 						  $msg);
@@ -388,7 +388,7 @@ END
         delete($env{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {
 	    my $msg=
-		'Unable to properly store search information. '.
+		'Unable to properly save search information. '.
 		'The search has been aborted.';
 	    &Apache::loncommon::simple_error_page($r,'Search Error',
 						  $msg);
@@ -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.
@@ -1854,7 +1858,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2142,7 +2146,7 @@ sub ensure_db_and_table {
     ##
     if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
         $r->print("Unable to retrieve search results.  ".
-                  "Unable to determine the table results were stored in.  ".
+                  "Unable to determine the table results were saved in.  ".
 		  &Apache::loncommon::end_page());
         return undef;
     }
@@ -2152,7 +2156,7 @@ sub ensure_db_and_table {
     my $connection_result = &Apache::lonmysql::connect_to_db();
     if (!defined($connection_result)) {
         $r->print("Unable to connect to the MySQL database where your results".
-                  " are stored.".
+                  " are saved.".
 		  &Apache::loncommon::end_page());
         &Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
                                  " connect to database.");
@@ -2518,7 +2522,7 @@ END
     # Check on the mysql table we will use to store results.
     my $table =$env{'form.table'};
     if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
-        $r->print("Unable to determine table id to store search results in.".
+        $r->print("Unable to determine table id to save search results in.".
                   "The search has been aborted.".
 		  &Apache::loncommon::end_page());
         return;
@@ -2756,7 +2760,7 @@ sub display_results {
     if ($env{'form.catalogmode'} eq 'import') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                   &GDBM_WRCREAT(),0640)) {
-            $r->print('Unable to store import results.</form>'.
+            $r->print('Unable to save import results.</form>'.
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;