--- loncom/interface/lonsearchcat.pm	2025/03/18 18:57:28	1.361
+++ loncom/interface/lonsearchcat.pm	2025/03/19 15:44:44	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.361 2025/03/18 18:57:28 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.364 2025/03/19 15:44:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,12 +170,26 @@ sub handler {
     ##
     &Apache::lonhtmlcommon::clear_breadcrumbs();
 
-    my @allowed_searches = ('portfolio');
+    my $crumb_text;
+    my @allowed_searches;
+    if ($env{'form.catalogmode'} eq 'import') {
+        $env{'form.area'} = 'res';
+        $crumb_text = 'Content Library Search';
+    } else {
+        push(@allowed_searches,'portfolio');
+    }
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
         push(@allowed_searches,'res');
-    } 
-    my $crumb_text = 'Portfolio Search';
+    } else {
+        unless ($env{'form.catalogmode'} eq 'import') {
+            $env{'form.area'} = 'portfolio';
+            $crumb_text = 'Portfolio Search';
+        }
+    }
     if (@allowed_searches ==2) {
+       unless (($env{'form.area'} eq 'portfolio') || ($env{'form.area'} eq 'res')) {
+           delete($env{'form.area'});
+       }
        $crumb_text = 'Portfolio and Content Library Search'; 
     }
     my $target = '_top';
@@ -192,7 +206,8 @@ sub handler {
 	       &Apache::loncommon::inhibit_menu_check().
                '&catalogmode='.$env{'form.catalogmode'}.
                '&launch='.$env{'form.launch'}.
-               '&mode='.$env{'form.mode'},
+               '&mode='.$env{'form.mode'}.
+               '&area='.$env{'form.area'},
               text=>"$crumb_text",
               target=>$target,
               bug=>'Searching',});
@@ -317,10 +332,23 @@ END
                   '&phase=disp_adv'.
                   '&catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
-                  '&mode='.$env{'form.mode'},
+                  '&mode='.$env{'form.mode'}.
+                  '&area='.$env{'form.area'},
                   text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
-    } 
+    } elsif (($env{'form.phase'} eq 'results') ||
+             ($env{'form.phase'} =~ /^(sort|run_search)$/)) {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+              '&phase=disp_adv'.
+              '&catalogmode='.$env{'form.catalogmode'}.
+              '&launch='.$env{'form.launch'}.
+              '&mode='.$env{'form.mode'}.
+              '&area='.$env{'form.area'}.
+              '&searchmode='.$env{'form.searchmode'},
+              text=>"Search Results",
+              bug=>'Searching',});
+    }
     ##
     ## Switch on the phase
     ##
@@ -437,6 +465,42 @@ sub hidden_field {
     return '<input type="hidden" name="'.$name.'" value="'.$value.'" />'.$/;
 }
 
+sub start_search_tabs {
+    my $area;
+    my %lt = &Apache::lonlocal::texthash (
+                              res => 'Content Library Search',
+                              portfolio => 'Portfolio Search',
+    );
+    my $output = '<ul class="LC_TabContentBigger" id="main">';
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
+        unless ($env{'form.area'} eq 'portfolio') {
+            $area = 'res';
+        }
+        $output .= "\n".'<li'.($area eq 'res'?' class="active"':'').
+                   '><a href="/adm/searchcat?area=res&amp;catalogmode='.$env{'form.catalogmode'}.'">'.
+                   '<b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'res'}.
+                   '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>';
+        unless ($env{'form.catalogmode'}) {
+            $output .= '<li'.($area ne 'res'?' class="active"':'').
+                       '><a href="/adm/searchcat?area=portfolio"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'portfolio'}.
+                       '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li></ul>';
+        }
+    } else {
+        $area = 'portfolio';
+        $output .= "\n".'<li class="active">'.
+                   '<a href="/adm/searchcat?area=portfolio"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.$lt{'portfolio'}.
+                   '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li></ul>';
+    }
+    $output .= '<div class="LC_Box" style="clear:both;margin:0;">'.
+               '<div id="maincoursedoc" style="margin:0 0;padding:0 0;">'.
+               '<div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">';
+    return $output;
+}
+
+sub end_search_tabs {
+    return '</div></div></div>';
+}
+
 ######################################################################
 
 =pod
@@ -453,19 +517,31 @@ Prints the form for the basic search.  S
 ######################################################################
 sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                              res => 'Content Library Search',
+                              portfolio => 'Portfolio Search',
+    );
     my $result = ($env{'form.catalogmode'} ne 'import');
+    my $area;
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
 					    $env{'form.catalogmode'} ne 'import');
-    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
-# Search form for resource space 
+    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb.
+                 '<div class="LC_landmark" role="main">'."\n".
+                 &start_search_tabs();
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
-        $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
-        $scrout .= '<hr /><br />';
-    }
+        if ($env{'form.area'} eq 'portfolio') {
 # Search form for accessible portfolio files
-    $scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
-    $scrout .= &Apache::loncommon::end_page();
+            $scrout .= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
+        } else {
+# Search form for resource space
+            $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
+        }
+    } else {
+# Search form for accessible portfolio files
+        $scrout .= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
+    }
+    $scrout .= &end_search_tabs().&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -535,29 +611,20 @@ sub setup_basic_search {
                  $scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
              }
     #
-    $scrout .= '<div align="center">'.$/;
-#    if ($env{'request.course.id'}) {
-        $scrout .= '<h1>'.$lt{$area}.'</h1>';
-#    } else {
-        # No need to tell them they are searching
-#        $scrout.= ('<br />'x2);
-#    }
-    $scrout.='<table>'.
-             '<tr><td align="center" valign="top">'.
-             &Apache::lonhtmlcommon::textbox('basicexp',
-                                             $env{'form.basicexp'},50).
-             '<br />'.
-            '<span class="LC_fontsize_medium">'.&searchhelp().'</span>'.'</td>'.
-            '<td>'.
-            '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
-            '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
-             '</td>'.
-            '</tr>'.
-            '</table>'.$/;
+    $scrout .= '<div class="LC_floatleft">'.
+               '<label>'.
+               &Apache::lonhtmlcommon::textbox('basicexp',
+                                               $env{'form.basicexp'},50).
+               '<br />'.
+               '<span class="LC_fontsize_medium">'.&searchhelp().'</span></label></div>'.
+               '<div class="LC_floatleft" style="text-align: left;">'.
+               '<span class="LC_nobreak">'.('&nbsp;'x3).$adv_search_link.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$userelatedwords.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$onlysearchdomain.'</span>'.'<br />'.
+               '<span class="LC_nobreak">'.('&nbsp;'x1).$inclext.'</span>'.'<br />'.
+               '</div><br clear="both" />'.$/;
     #
-    $scrout .= '<p>'
+    $scrout .= '<div><p>'
               .&viewoptions()
               .'</p>'
               .'<p>'
@@ -565,9 +632,9 @@ sub setup_basic_search {
               .'value="'.&mt('Search').'" />'
               .' '
               .$closebutton
-              .'</p>';
+              .'</p></div>';
     #
-    $scrout .= '</div>'.'</form>';
+    $scrout .= '</form>';
     return $scrout;
 } 
 
@@ -617,7 +684,8 @@ function additional_metadata() {
     }
     my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
                                                $jscript);
-    $scrout .= $bread_crumb.'<div class="LC_landmark" role="main">'."\n";
+    $scrout .= $bread_crumb.'<div class="LC_landmark" role="main">'."\n".
+               &start_search_tabs();
 
     $scrout .= '<form method="post" action="/adm/searchcat" name="advsearch">'
               .$hidden_fields 
@@ -717,7 +785,7 @@ function additional_metadata() {
                                                      &titlefield(&mt('Copyright/Distribution')).'</label>')
                   .&Apache::lonmeta::selectbox('copyright',
                                              $env{'form.copyright'},'',
-                                             'copyright', 
+                                             'copyright',
                                 \&Apache::loncommon::copyrightdescription,
                                        ( undef,
                                         &Apache::loncommon::copyrightids)
@@ -726,7 +794,7 @@ function additional_metadata() {
     }
 
     $scrout .= &Apache::lonhtmlcommon::row_title('<label for="language">'.
-                                                 &titlefield(&mt('Language'))'</label>')
+                                                 &titlefield(&mt('Language')).'</label>')
               .&Apache::lonmeta::selectbox('language',
                                     $env{'form.language'},'','language',
                                     \&Apache::loncommon::languagedescription,
@@ -764,7 +832,7 @@ function additional_metadata() {
                       .' value="'.$env{'form.addedvalues_'.$j}.'" aria-label="'.$valuelabel.'" />'
                       .&Apache::lonhtmlcommon::row_closure();
         }
-        my $addcustomlabel = &mt('Add metadata field option'); 
+        my $addcustomlabel = &mt('Add metadata field option');
         $scrout .= &Apache::lonhtmlcommon::row_title('<span class="LC_visually_hidden">'.$addcustomlabel.'</span>',
                                                      '','','',1)
                   .'<label>'
@@ -919,7 +987,7 @@ function additional_metadata() {
     $scrout .= $advanced_buttons
               .'</form>';
 
-    $scrout .= '</div>'.&Apache::loncommon::end_page();
+    $scrout .= &end_search_tabs().'</div>'.&Apache::loncommon::end_page();
     $r->print($scrout);
     return;
 }
@@ -1301,8 +1369,10 @@ sub parse_advanced_search {
     }
     if (! $fillflag) {
 	&output_blank_field_error($r,$closebutton,
-                                  'phase=disp_adv',$hidden_fields);
-	return ;
+                                  'phase=disp_adv&amp;area='.$env{'form.area'}.
+                                  '&amp;catalogmode='.$env{'form.catalogmode'},
+                                  $hidden_fields);
+	return;
     }
     # Turn the form input into a SQL-based query
     my $query='';
@@ -1315,7 +1385,9 @@ sub parse_advanced_search {
             &process_phrase_input($env{'form.'.$field},
                                   $env{'form.'.$field.'_related'},$field);
         if (defined($error)) {
-            &output_unparsed_phrase_error($r,$closebutton,'phase=disp_adv',
+            &output_unparsed_phrase_error($r,$closebutton,
+                                         'phase=disp_adv&amp;area='.$env{'form.area'}.
+                                         '&amp;catalogmode='.$env{'form.catalogmode'}.
                                          $hidden_fields,$field);
             return;
         } else {
@@ -1599,7 +1671,9 @@ sub parse_basic_search {
     # Check to see if enough of a query is filled in
     my $search_string = $env{'form.basicexp'};
     if (! &filled($search_string)) {
-	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
+	&output_blank_field_error($r,$closebutton,'phase=disp_basic'.
+                                  '&amp;area='.$env{'form.area'}.
+                                  '&amp;catalogmode='.$env{'form.catalogmode'});
 	return OK;
     }
     my $pretty_search_string=$search_string;
@@ -1615,7 +1689,9 @@ sub parse_basic_search {
                                                     $env{'form.related'},
                                                     $searchfield);
     if ($error) {
-        &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic',
+        &output_unparsed_phrase_error($r,$closebutton,'phase=disp_basic'.
+                                      '&amp;area='.$env{'form.area'}.
+                                      '&amp;catalogmode='.$env{'form.catalogmode'},
                                       '','basicexp');
         return;
     }
@@ -2144,10 +2220,10 @@ sub print_sort_form {
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import',
                                             '','','','','','',$target);
-
     my $result = <<END;
 $start_page
 $breadcrumbs
+<div class="LC_landmark" role="main">
 <form name="statusform" action="" method="post" target="$target">
 <input type="hidden" name="catalogmode" value="import" />
 <input type="hidden" name="acts" value="" />
@@ -2170,7 +2246,7 @@ END
             .' '.$revise.'</p>'
             .'<p>'.&mt('Search: ').$pretty_query_string
             .'</p></form>';
-    $r->print($result.&Apache::loncommon::end_page());
+    $r->print($result.'</div>'.&Apache::loncommon::end_page());
     return;
 }
 
@@ -2307,7 +2383,8 @@ SCRIPT
 sub reload_result_frame {
     my ($r) = @_;
     my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.
-        $env{'form.persistent_db_id'};
+        $env{'form.persistent_db_id'}.'&area='.$env{'form.area'}.
+        '&catalogmode='.$env{'form.catalogmode'};
     $r->print(<<SCRIPT);
 <script type="text/javascript">
     parent.update_results("$newloc");
@@ -2377,7 +2454,9 @@ sub revise_button {
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
             '&amp;cleargroupsort=1'.
-            '&amp;phase='.$revise_phase;
+            '&amp;phase='.$revise_phase.
+            '&amp;area='.$env{'form.area'}.
+            '&amp;catalogmode='.$env{'form.catalogmode'};
     my $result = qq{<input type="button" value="$revisetext" name="revise"} .
         qq{ onclick="parent.location='$newloc';" /> };
     return $result;
@@ -2420,6 +2499,7 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
+<div class="LC_landmark" role="main">
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2647,11 +2727,11 @@ END
     # We have run out of time or run out of servers to talk to and
     # results to get, so let the client know the top frame needs to be
     # loaded from /adm/searchcat
-    $r->print(&Apache::loncommon::end_page());
+    $r->print('</div>'.&Apache::loncommon::end_page());
 #    if ($env{'form.catalogmode'} ne 'import') {
          $r->print(<<SCRIPT);
 <script>
-window.location='/adm/searchcat?phase=sort&persistent_db_id=$env{'form.persistent_db_id'}';
+window.location='/adm/searchcat?phase=sort&area=$env{"form.area"}&catalogmode=$env{"form.catalogmode"}&persistent_db_id=$env{"form.persistent_db_id"}';
 </script>
 SCRIPT
 #    }
@@ -2711,7 +2791,8 @@ sub display_results {
     if (!defined($viewfunction)) {
         $r->print('<p class="LC_error">'
                  .&mt('Internal Error - Bad view selected.')
-                 .'</p>'."\n");
+                 .'</p>'."\n"
+                 .'</form></div>'.&Apache::loncommon::end_page());
         $r->rflush();
         return;
     }
@@ -2722,7 +2803,8 @@ sub display_results {
     ##
     ## Get the catalog controls setup
     ##
-    my $action = "/adm/searchcat?phase=results";
+    my $action = '/adm/searchcat?phase=results&amp;area='.$env{'form.area'}.
+                 '&amp;catalogmode='.$env{'form.catalogmode'};
     ##
     ## Deal with import by opening the import db file.
     if ($env{'form.catalogmode'} eq 'import') {
@@ -2733,7 +2815,7 @@ sub display_results {
             $r->print('<p class="LC_error">'.
               &mt('Unable to save import results.').
               '</p>'.
-              '</form>'.
+              '</form></div>'.
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
@@ -2754,7 +2836,7 @@ sub display_results {
         $r->print('<p class="LC_error">'.
           &mt('A MySQL error has occurred.').
           '</p>'.
-          '</form>'.
+          '</form></div>'.
 		  &Apache::loncommon::end_page());
         &Apache::lonnet::logthis("lonmysql was unable to determine the number".
                                  " of rows in table ".$table);
@@ -2859,17 +2941,18 @@ sub display_results {
 	    $env{'form.sortorder'}='asc';
 	}
     }
-    my $sortform = '<span class="LC_nobreak">'
-                  .&mt('Sort by:').' '
+    my $sortform = '<span class="LC_nobreak"><span id="LC_sortby">'
+                  .&mt('Sort by:').'</span> '
                   .&Apache::loncommon::select_form($env{'form.sortfield'},
-                                                      'sortfield',
-                                                      \%sort_fields)
+                                                   'sortfield',
+                                                   \%sort_fields,'','','',
+                                                   'LC_sortby')
                   .' '
                   .&Apache::loncommon::select_form($env{'form.sortorder'},
-                                                      'sortorder',
-                                                      {asc =>&mt('Ascending'),
-                                                       desc=>&mt('Descending')
-                                                       })
+                                                   'sortorder',
+                                                   {asc =>&mt('Ascending'),
+                                                    desc=>&mt('Descending')
+                                                   },'','','','LC_sortby')
                   .'</span>';
     ##
     ## Display links for 'prev' and 'next' pages (if necessary) and Display Options
@@ -2883,15 +2966,15 @@ sub display_results {
     );
 
     if ($total_results == 0) {
-        $r->print('<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
-                  "</form>".
+        $r->print('<h1 class="LC_search_results">'.&mt('There are currently no results.').'</h1>'.
+                  '</form></div>'.
 		  &Apache::loncommon::end_page());
         return;
     } else {
-        $r->print('<div>'.
+        $r->print('<h1 class="LC_search_results">'.
                   mt('Results [_1] to [_2] out of [_3]',
                      $min,$max,$total_results).
-                  "</div>\n");
+                  "</h1>\n");
     }
     ##
     ## Get results from MySQL table
@@ -2921,7 +3004,14 @@ sub display_results {
     if ($area eq 'portfolio') {
         $tabletype = 'portfolio_search';
     }
-    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row().
+              '<th>'.&mt('Data').'</th>');
+    if (($env{'form.viewselect'} eq 'detailedpreview') ||
+        ($env{'form.viewselect'} eq 'summarypreview')) {
+        $r->print('<th>'.&mt('Preview').'</th>');
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
     foreach my $row (@Results) {
         if ($connection->aborted()) {
             &cleanup();
@@ -2959,7 +3049,7 @@ sub display_results {
                                 $env{'form.persistent_db_id'})
         );
     }
-    $r->print("</form>".&Apache::loncommon::end_page());
+    $r->print('</form></div>'.&Apache::loncommon::end_page());
     $r->rflush();
     untie %groupsearch_db if (tied(%groupsearch_db));
     return;
@@ -3270,6 +3360,7 @@ SCRIPT
                                                       'add_modal' =>1});
     my $result=<<END;
 $start_page
+<div class="LC_landmark" role="main">
 <form name="results" method="post" action="/adm/searchcat">
 $importbutton
 END
@@ -3278,6 +3369,8 @@ END
 
 sub results_link {
     my $basic_link   = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+        "&amp;area=".$env{'form.area'}.
+        "&amp;catalogmode=".$env{'form.catalogmode'}.
         "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
     my $results_link = $basic_link."&amp;phase=results".
         "&amp;pause=1"."&amp;start=1";
@@ -3288,12 +3381,15 @@ sub results_link {
 ######################################################################
 sub print_frames_interface {
     my $r = shift;
-    my $basic_link = "/adm/searchcat?"."&amp;table=".$env{'form.table'}.
+    my $basic_link = "/adm/searchcat?table=".$env{'form.table'}.
+        "&amp;area=".$env{'form.area'}.
+        "&amp;catalogmode=".$env{'form.catalogmode'}.
         "&amp;persistent_db_id=".$env{'form.persistent_db_id'};
     my $run_search_link = $basic_link."&amp;phase=run_search";
     my $results_link = &results_link();
     my $js = <<JS;
 <script type="text/javascript">
+// <![CDATA[
 var targetwin = opener;
 var queue = '';
 
@@ -3316,6 +3412,7 @@ function done_loading_results() {
         update_results(new_location);
     }
 }
+// ]]>
 </script>
 JS