--- loncom/interface/lonsearchcat.pm	2006/03/19 22:08:38	1.258
+++ loncom/interface/lonsearchcat.pm	2006/05/01 19:37:34	1.263
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.258 2006/03/19 22:08:38 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.263 2006/05/01 19:37:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -199,7 +199,9 @@ sub handler {
 		    'We were unable to retrieve data describing your search. '.
 		    'This is a serious error and has been logged. '.
 		    'Please alert your LON-CAPA administrator.';
-		return &error_page($r,$msg);
+		&Apache::loncommon::simple_error_page($r,'Search Error',
+						      $msg);
+		return OK;
             }
         }
     } else {
@@ -220,7 +222,9 @@ sub handler {
             # This is a stupid error to give to the user.  
             # It really tells them nothing.
 	    my $msg = 'Unable to tie hash to db file.';
-	    return &error_page($r,$msg);
+	    &Apache::loncommon::simple_error_page($r,'Search Error',
+						  $msg);
+	    return OK;
 	}
     }
     ##
@@ -361,14 +365,18 @@ END
 	    my $msg = 
 		'Unable to create table in which to store search results. '.
 		'The search has been aborted.';
-	    return &error_page($r,$msg);
+	    &Apache::loncommon::simple_error_page($r,'Search Error',
+						  $msg);
+	    return OK;
         }
         delete($env{'form.launch'});
         if (! &make_form_data_persistent($r,$persistent_db_file)) {
 	    my $msg=
 		'Unable to properly store search information. '.
 		'The search has been aborted.';
-            return &error_page($r,$msg);
+	    &Apache::loncommon::simple_error_page($r,'Search Error',
+						  $msg);
+	    return OK;
 	}
         ##
         ## Print out the frames interface
@@ -380,14 +388,6 @@ END
     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
 # handle the case of missing environment variables being significant.
@@ -660,9 +660,8 @@ sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
     my $result = ($env{'form.catalogmode'} ne 'groupsearch');
     my $bread_crumb =
-        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Search_Basic',
-                                   undef,undef,
-                                   $env{'form.catalogmode'} ne 'groupsearch');
+        &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
+					    $env{'form.catalogmode'} ne 'groupsearch');
     my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         # Define interface components
@@ -794,10 +793,8 @@ Prints the advanced search form.
 sub print_advanced_search_form{
     my ($r,$closebutton,$hidden_fields) = @_;
     my $bread_crumb = 
-        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching',
-                                            'Search_Advanced',
-                                            undef,undef,
-                                  $env{'form.catalogmode'} ne 'groupsearch');
+        &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Advanced',
+					    $env{'form.catalogmode'} ne 'groupsearch');
     my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
 				       'reset' => 'Reset',
 				       'help' => 'Help');
@@ -2109,9 +2106,8 @@ END
     my $start_page = &Apache::loncommon::start_page('Results',$js,
 						    {'only_body' => 1});
     my $breadcrumbs=
-        &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Searching','Searching',undef,undef,
-         $env{'form.catalogmode'} ne 'groupsearch');
+        &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+					    $env{'form.catalogmode'} ne 'groupsearch');
 
     my $result = <<END;
 $start_page
@@ -2339,9 +2335,9 @@ sub run_search {
     #
     my $start_page = &Apache::loncommon::start_page('Search Status',undef,
 						    {'only_body' => 1});
-    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs
-        (undef,'Searching','Searching',undef,undef,
-         $env{'form.catalogmode'} ne 'groupsearch');
+    my $breadcrumbs =
+	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+					    $env{'form.catalogmode'} ne 'groupsearch');
     $r->print(<<END);
 $start_page
 $breadcrumbs
@@ -3125,22 +3121,27 @@ sub print_frames_interface {
         "&persistent_db_id=".$env{'form.persistent_db_id'};
     my $run_search_link = $basic_link."&phase=run_search";
     my $results_link = &results_link();
-    my $html     = &Apache::lonxml::xmlbegin();
-    my $head     = &Apache::loncommon::headtag('LON-CAPA Digital Library Search Results');
-    my $end_head = &Apache::loncommon::endheadtag();
-    my $result = <<"ENDFRAMES";
-$html
-$head
-<script>
+    my $js = <<JS;
+<script type="text/javascript">
 var targetwin = opener;
 var queue = '';
 </script>
-$end_head
-<frameset rows="150,*">
+JS
+
+    my $start_page =
+        &Apache::loncommon::start_page('LON-CAPA Digital Library Search Results',
+				       $js,
+				       {'frameset'    => 1,
+					'add_entries' => {
+					    'rows' => "150,*",},});
+    my $end_page =
+        &Apache::loncommon::end_page({'frameset' => 1});
+
+    my $result = <<"ENDFRAMES";
+$start_page
     <frame name="statusframe"  src="$run_search_link">
     <frame name="resultsframe" src="$results_link">
-</frameset>
-</html>
+$end_page
 ENDFRAMES
 
     $r->print($result);