--- loncom/interface/lonsearchcat.pm	2015/03/12 03:04:45	1.331.4.11
+++ loncom/interface/lonsearchcat.pm	2013/09/01 22:39:39	1.336
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.331.4.11 2015/03/12 03:04:45 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.336 2013/09/01 22:39:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,8 @@ search (on a server basis) is displayed
 
 =head1 Internals
 
+=over 4
+
 =cut
 
 ###############################################################################
@@ -170,7 +172,7 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
     my @allowed_searches = ('portfolio');
-    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         push(@allowed_searches,'res');
     } 
     my $crumb_text = 'Portfolio Search';
@@ -193,15 +195,12 @@ sub handler {
                 &Apache::lonnet::logthis('lonsearchcat:'.
                                          'Unable to recover data from '.
                                          $persistent_db_file);
-                my $msg =
-                    &mt('We were unable to retrieve data describing your search.').
-                    ' '.&mt('This is a serious error and has been logged.').
-                    '<br />'.
-                    &mt('Please alert your LON-CAPA administrator.');
-                &Apache::loncommon::simple_error_page(
-                    $r,'Search Error',
-                    $msg,
-                    {'no_auto_mt_msg' => 1});
+		my $msg =
+		    'We were unable to retrieve data describing your search. '.
+		    'This is a serious error and has been logged. '.
+		    'Please alert your LON-CAPA administrator.';
+		&Apache::loncommon::simple_error_page($r,'Search Error',
+						      $msg);
 		return OK;
             }
         }
@@ -429,9 +428,7 @@ sub hidden_field {
 
 ######################################################################
 
-=pod
-
-=over 4
+=pod 
 
 =item &print_basic_search_form() 
 
@@ -449,7 +446,7 @@ sub print_basic_search_form {
 					    $env{'form.catalogmode'} ne 'import');
     my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
 # Search form for resource space 
-    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
         $scrout .= '<hr /><br />';
     }
@@ -1018,7 +1015,7 @@ This function is the reverse of &make_pe
 Retrieve persistent data from %persistent_db.  Retrieved items will have their
 values unescaped.  If the item is 'domains; then the returned
 value will be a hash pointer.  Otherwise, if the item contains
-commas (before unescaping), the returned value will be an array pointer.
+commas (before unescaping), the returned value will be an array pointer. 
 
 =cut
 
@@ -1074,7 +1071,7 @@ Store variables away to the %persistent_
 Values will be escaped.  Values that are array pointers will have their
 elements escaped and concatenated in a comma separated string. Values 
 that are hash pointers will have their keys and values escaped and 
-concatenated in a comma separated string.
+concatenated in a comma separated string
 
 =cut
 
@@ -2090,7 +2087,7 @@ END
 #    $result.="</select>\n";
     my $revise = &revise_button();
     $result.='<p>'
-            .&mt('Total of [quant,_1,match,matches] to your query.',$total_results)
+            .&mt('There are [_1] matches to your query.',$total_results)
             .' '.$revise.'</p>'
             .'<p>'.&mt('Search: ').$pretty_query_string
             .'</p></form>';
@@ -2362,7 +2359,7 @@ END
                 my $major = $1;
                 my $minor = $2;
                 if (($major < 2) || (($major == 2) && ($minor < 11))) {
-                    map { $older_library_servers{$_} = 1; }
+                    map { $older_library_servers{$_} = 1; } 
                         &Apache::lonnet::machine_ids($library_servers{$key});
                 }
             }
@@ -2372,7 +2369,7 @@ END
         foreach my $server (@Servers_to_contact) {
             my %possdoms;
             map { $possdoms{$_}=1;  } &Apache::lonnet::machine_domains($all_library_servers{$server});
-            $domains_by_server{$server} =
+            $domains_by_server{$server} = 
                 join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
         }
     }
@@ -3151,8 +3148,7 @@ SCRIPT
 
     my $start_page  = &Apache::loncommon::start_page(undef,$js,
 						     {'only_body' =>1,
-                                                      'add_wishlist' =>1,
-                                                      'add_modal' =>1});
+                                                      'add_wishlist' =>1});
     my $result=<<END;
 $start_page
 <form name="results" method="post" action="/adm/searchcat">
@@ -3800,7 +3796,7 @@ Cleans the global %groupsearch_db by rem
 ######################################################################
 sub start_fresh_session {
     delete $groupsearch_db{'mode_catalog'};
-    foreach (keys(%groupsearch_db)) {
+    foreach (keys %groupsearch_db) {
         if ($_ =~ /^pre_/) {
             delete $groupsearch_db{$_};
         }