--- loncom/interface/lonsearchcat.pm	2006/09/26 15:24:18	1.276
+++ loncom/interface/lonsearchcat.pm	2006/12/06 22:22:37	1.278
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.276 2006/09/26 15:24:18 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.278 2006/12/06 22:22:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,6 @@ use HTML::Entities();
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 ######################################################################
@@ -171,25 +170,32 @@ sub handler {
                 '_'.$env{'form.persistent_db_id'}.'_persistent_search.db';
     ##
     &Apache::lonhtmlcommon::clear_breadcrumbs();
+
+    my @allowed_searches = ('portfolio');
+    if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
+        push(@allowed_searches,'res');
+    } 
     if (exists($env{'request.course.id'}) && $env{'request.course.id'} ne '') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-             ({href=>'/adm/searchcat?'.
-                   'catalogmode='.$env{'form.catalogmode'}.
-                   '&launch='.$env{'form.launch'}.
-                   '&mode='.$env{'form.mode'},
-              text=>"Course and Catalog Search",
-              target=>'_top',
-              bug=>'Searching',});
-    } else {
-        &Apache::lonhtmlcommon::add_breadcrumb
-             ({href=>'/adm/searchcat?'.
-                   'catalogmode='.$env{'form.catalogmode'}.
-                   '&launch='.$env{'form.launch'}.
-                   '&mode='.$env{'form.mode'},
-              text=>"Catalog Search",
+        push(@allowed_searches,'course');
+    }
+    my $crumb_text = 'Portfolio Search';
+    if (@allowed_searches == 3) {
+        $crumb_text = 'Course, Portfolio and Catalog Search';
+    } elsif (@allowed_searches ==2) {
+        if (grep(/^res$/,@allowed_searches)) {
+            $crumb_text = 'Portfolio and Catalog Search'; 
+        } elsif (grep(/^course$/,@allowed_searches)) {
+            $crumb_text = 'Portfolio and Course Search';
+        }
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>'/adm/searchcat?'.
+               'catalogmode='.$env{'form.catalogmode'}.
+               '&launch='.$env{'form.launch'}.
+               '&mode='.$env{'form.mode'},
+              text=>"$crumb_text",
               target=>'_top',
               bug=>'Searching',});
-    }
     #
     if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) {
         if (! &get_persistent_form_data($persistent_db_file)) {
@@ -297,12 +303,16 @@ END
     }
     #
     if ($env{'form.searchmode'} eq 'advanced') {
+        my $srchtype = 'Catalog';
+        if ($env{'form.area'} eq 'portfolio') {
+            $srchtype = 'Portfolio';
+        }
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/searchcat?phase=disp_adv&'.
                   'catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
-                  text=>"Advanced Search",
+                  text=>"Advanced $srchtype Search",
                   bug=>'Searching',});
     } elsif ($env{'form.searchmode'} eq 'course search') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -511,7 +521,7 @@ sub course_search {
             my $applies = 0;
             my $symb = $resource->symb();
             my $ressymb = $symb;
-            if ($symb =~ m#(___adm/\w+/\w+)/(\d+)/bulletinboard$#) {
+            if ($symb =~ m#(___adm/$LONCAPA::domain_re/$LONCAPA::username_re)/(\d+)/bulletinboard$#) {
                 $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
                 unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
                     $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
@@ -821,7 +831,11 @@ sub print_advanced_search_form{
 <input type="reset" name="reset" value='$lt{"reset"}' />
 $closebutton
 END
-    my $scrout= &Apache::loncommon::start_page('Advanced Catalog Search');
+    my $srchtype = 'Catalog';
+    if ($env{'form.area'} eq 'portfolio') {
+        $srchtype = 'Portfolio';
+    }
+    my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search");
     $scrout .= <<"ENDHEADER";
 $bread_crumb
 <form method="post" action="/adm/searchcat" name="advsearch">
@@ -832,7 +846,7 @@ ENDHEADER
         '<input type="hidden" name="phase" value="adv_search" />';
     my %fields=&Apache::lonmeta::fieldnames();
     #
-    $scrout .= '<h3>'.&mt('Standard Metadata').'</h3>';
+    $scrout .= '<h3>'.&mt('Standard [_1] Metadata',$srchtype).'</h3>';
     $scrout .= "<table>\n";
     $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
         ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
@@ -1583,7 +1597,11 @@ sub parse_advanced_search {
     }
     #
     if (@queries) {
-	$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
+        if ($env{'form.area'} eq 'portfolio') {
+            $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa  WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))';
+        } else {
+	    $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
+        }
     } elsif ($customquery) {
         $query = '';
     }