[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm

[matthew]

matthew		Mon May 10 14:59:18 2004 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
  Log:
  Include menu link in breadcrumbs when we are not doing a groupsearch.
  Added 'authorspace' to the list of searchable fields.
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.226 loncom/interface/lonsearchcat.pm:1.227
--- loncom/interface/lonsearchcat.pm:1.226	Mon May 10 09:06:29 2004
+++ loncom/interface/lonsearchcat.pm	Mon May 10 14:59:18 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.226 2004/05/10 13:06:29 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.227 2004/05/10 18:59:18 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -174,6 +174,7 @@
                    '&launch='.$ENV{'form.launch'}.
                    '&mode='.$ENV{'form.mode'},
               text=>"Course and Catalog Search",
+              target=>'_top',
               bug=>'Searching',});
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -182,6 +183,7 @@
                    '&launch='.$ENV{'form.launch'}.
                    '&mode='.$ENV{'form.mode'},
               text=>"Catalog Search",
+              target=>'_top',
               bug=>'Searching',});
     }
     #
@@ -559,9 +561,11 @@
 ######################################################################
 sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
+    my $result = ($ENV{'form.catalogmode'} ne 'groupsearch');
     my $bodytag=&Apache::loncommon::bodytag('Search').
         &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching',
-                                            undef,undef,! $ENV{'form.launch'});
+                                   undef,undef,
+                                   $ENV{'form.catalogmode'} ne 'groupsearch');
     my $scrout = &search_html_header().$bodytag;
     if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
         # Define interface components
@@ -689,11 +693,9 @@
 sub print_advanced_search_form{
     my ($r,$closebutton,$hidden_fields) = @_;
     my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search').
-        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching',
-                                            'Searching',
-                                            undef,undef,
-                                            ! $ENV{'form.launch'});
-
+        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching',
+                                  undef,undef,
+                                  $ENV{'form.catalogmode'} ne 'groupsearch');
     my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
 				       'reset' => 'Reset',
 				       'help' => 'Help');
@@ -1188,7 +1190,7 @@
 sub parse_advanced_search {
     my ($r,$closebutton,$hidden_fields)=@_;
     my @BasicFields = ('title','author','subject','keywords','url','version',
-                       'notes','abstract','extension','owner',
+                       'notes','abstract','extension','owner','authorspace',
 #                       'custommetadata','customshow',
                        'modifyinguser','standards','mime');
     my @StatsFields = &statfields();
@@ -1873,7 +1875,7 @@
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1).
         &Apache::lonhtmlcommon::breadcrumbs
         (undef,'Searching','Searching',undef,undef,
-         ! ($ENV{'form.catalogmode'} eq 'groupsearch'));
+         $ENV{'form.catalogmode'} ne 'groupsearch');
 
     ##
     my %SortableFields=&Apache::lonlocal::texthash( 
@@ -2140,10 +2142,9 @@
 sub run_search {
     my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
     my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
-    $bodytag.=
-        &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching','Searching',
-                                            undef,undef,! $ENV{'form.launch'});
-
+    $bodytag.=&Apache::lonhtmlcommon::breadcrumbs
+        (undef,'Searching','Searching',undef,undef,
+         $ENV{'form.catalogmode'} ne 'groupsearch');
     my $connection = $r->connection;
     #
     # Print run_search header