Diff for /loncom/interface/lonsearchcat.pm between versions 1.258 and 1.259

version 1.258, 2006/03/19 22:08:38 version 1.259, 2006/03/21 21:07:31
Line 199  sub handler { Line 199  sub handler {
     'We were unable to retrieve data describing your search. '.      'We were unable to retrieve data describing your search. '.
     'This is a serious error and has been logged. '.      'This is a serious error and has been logged. '.
     'Please alert your LON-CAPA administrator.';      'Please alert your LON-CAPA administrator.';
  return &error_page($r,$msg);   return &Apache::loncommon::simple_error_page($r,'Search Error',
        $msg);
             }              }
         }          }
     } else {      } else {
Line 220  sub handler { Line 221  sub handler {
             # This is a stupid error to give to the user.                # This is a stupid error to give to the user.  
             # It really tells them nothing.              # It really tells them nothing.
     my $msg = 'Unable to tie hash to db file.';      my $msg = 'Unable to tie hash to db file.';
     return &error_page($r,$msg);      return &Apache::loncommon::simple_error_page($r,'Search Error',
    $msg);
  }   }
     }      }
     ##      ##
Line 361  END Line 363  END
     my $msg =       my $msg = 
  'Unable to create table in which to store search results. '.   'Unable to create table in which to store search results. '.
  'The search has been aborted.';   'The search has been aborted.';
     return &error_page($r,$msg);      return &Apache::loncommon::simple_error_page($r,'Search Error',
    $msg);
         }          }
         delete($env{'form.launch'});          delete($env{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {          if (! &make_form_data_persistent($r,$persistent_db_file)) {
     my $msg=      my $msg=
  'Unable to properly store search information. '.   'Unable to properly store search information. '.
  'The search has been aborted.';   'The search has been aborted.';
             return &error_page($r,$msg);      return &Apache::loncommon::simple_error_page($r,'Search Error',
    $msg);
  }   }
         ##          ##
         ## Print out the frames interface          ## Print out the frames interface
Line 380  END Line 384  END
     return OK;      return OK;
 }   } 
   
 sub error_page {  
     my ($r,$msg) = @_;  
     $r->print(&Apache::loncommon::start_page('Search Error').  
       &mt($msg).  
       &Apache::loncommon::end_page());  
     return OK;  
 }  
   
 #  #
 # The mechanism used to store values away and retrieve them does not  # The mechanism used to store values away and retrieve them does not
 # handle the case of missing environment variables being significant.  # handle the case of missing environment variables being significant.

Removed from v.1.258  
changed lines
  Added in v.1.259


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>