--- loncom/interface/lonsearchcat.pm	2006/03/23 22:01:58	1.260
+++ loncom/interface/lonsearchcat.pm	2008/02/14 18:04:09	1.291
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.260 2006/03/23 22:01:58 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.291 2008/02/14 18:04:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,6 +78,7 @@ use HTML::Entities();
 use Parse::RecDescent;
 use Apache::lonnavmaps;
 use Apache::lonindexer();
+use LONCAPA;
 
 ######################################################################
 ######################################################################
@@ -137,7 +138,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
              ['catalogmode','launch','acts','mode','form','element','pause',
               'phase','persistent_db_id','table','start','show',
-              'cleargroupsort','titleelement']);
+              'cleargroupsort','titleelement','area','inhibitmenu']);
     ##
     ## The following is a trick - we wait a few seconds if asked to so
     ##     the daemon running the search can get ahead of the daemon
@@ -153,7 +154,7 @@ sub handler {
     ##
     my $domain  = $r->dir_config('lonDefDomain');
     $diropendb= "/home/httpd/perl/tmp/".
-        "$env{'user.domain'}_$env{'user.name'}_searchcat.db";
+        "$env{'user.domain'}_$env{'user.name'}_sel_res.db";
     #
     # set the name of the persistent database
     #          $env{'form.persistent_db_id'} can only have digits in it.
@@ -164,30 +165,38 @@ sub handler {
     }
 
     my $persistent_db_file = "/home/httpd/perl/tmp/".
-        &Apache::lonnet::escape($domain).
-            '_'.&Apache::lonnet::escape($env{'user.name'}).
+        &escape($domain).
+            '_'.&escape($env{'user.name'}).
                 '_'.$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?'.
+	       &Apache::loncommon::inhibit_menu_check().
+               '&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)) {
@@ -199,8 +208,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 &Apache::loncommon::simple_error_page($r,'Search Error',
-							     $msg);
+		&Apache::loncommon::simple_error_page($r,'Search Error',
+						      $msg);
+		return OK;
             }
         }
     } else {
@@ -212,7 +222,7 @@ sub handler {
     untie %groupsearch_db if (tied(%groupsearch_db));
     if (($env{'form.cleargroupsort'} eq '1') || 
         (($env{'form.launch'} eq '1') && 
-         ($env{'form.catalogmode'} eq 'groupsearch'))) {
+         ($env{'form.catalogmode'} eq 'import'))) {
 	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	    &start_fresh_session();
 	    untie %groupsearch_db;
@@ -221,8 +231,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 &Apache::loncommon::simple_error_page($r,'Search Error',
-							 $msg);
+	    &Apache::loncommon::simple_error_page($r,'Search Error',
+						  $msg);
+	    return OK;
 	}
     }
     ##
@@ -245,19 +256,25 @@ sub handler {
     if (exists($env{'form.mode'})) {
         $hidden_fields .= &hidden_field('mode');
     }
+    if (exists($env{'form.area'})) {
+        $hidden_fields .= &hidden_field('area');
+    }
+    if (exists($env{'form.inhibitmenu'})) {
+        $hidden_fields .= &hidden_field('inhibitmenu');
+    }
     ##
     ## Configure dynamic components of interface
     ##
     if ($env{'form.catalogmode'} eq 'interactive') {
-        $closebutton="<input type='button' name='close' value='CLOSE' ";
+        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
 	    $closebutton .="onClick='parent.close()'";
         } else {
             $closebutton .="onClick='self.close()'";
         }
         $closebutton .=">\n";
-    } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
-        $closebutton="<input type='button' name='close' value='CLOSE' ";
+    } elsif ($env{'form.catalogmode'} eq 'import') {
+        $closebutton="<input type='button' name='close' value='".&mt('CLOSE')."' ";
         if ($env{'form.phase'} =~ /(results|run_search)/) {
 	    $closebutton .="onClick='parent.close()'";
         } else {
@@ -290,16 +307,22 @@ 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'}.
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+		  '&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
-            ({href=>'/adm/searchcat?phase=disp_adv&'.
+            ({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
+		  '&phase=disp_adv'.
                   'catalogmode='.$env{'form.catalogmode'}.
                   '&launch='.$env{'form.launch'}.
                   '&mode='.$env{'form.mode'},
@@ -314,7 +337,8 @@ END
     } elsif ($env{'form.phase'} eq 'disp_adv') {
         &print_advanced_search_form($r,$closebutton,$hidden_fields);
     } elsif ($env{'form.phase'} eq 'results') {
-        &display_results($r,$importbutton,$closebutton,$diropendb);
+        &display_results($r,$importbutton,$closebutton,$diropendb,
+                         $env{'form.area'});
     } elsif ($env{'form.phase'} =~ /^(sort|run_search)$/) {
         my ($query,$customquery,$customshow,$libraries,$pretty_string) =
             &get_persistent_data($persistent_db_file,
@@ -324,7 +348,7 @@ END
             &print_sort_form($r,$pretty_string);
         } elsif ($env{'form.phase'} eq 'run_search') {
             &run_search($r,$query,$customquery,$customshow,
-                        $libraries,$pretty_string);
+                        $libraries,$pretty_string,$env{'form.area'});
         }
     } elsif ($env{'form.phase'} eq 'course_search') {
         &course_search($r);
@@ -354,25 +378,27 @@ END
                          $persistent_db_file);
         #
         # Set up table
-        if (! defined(&create_results_table())) {
+        if (! defined(&create_results_table($env{'form.area'}))) {
 	    my $errorstring=&Apache::lonmysql::get_error();
             &Apache::lonnet::logthis('lonsearchcat.pm: Unable to create '.
                                      'needed table.  lonmysql error:'.
                                      $errorstring);
 
 	    my $msg = 
-		'Unable to create table in which to store search results. '.
+		'Unable to create table in which to save search results. '.
 		'The search has been aborted.';
-	    return &Apache::loncommon::simple_error_page($r,'Search Error',
-							 $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. '.
+		'Unable to properly save search information. '.
 		'The search has been aborted.';
-	    return &Apache::loncommon::simple_error_page($r,'Search Error',
-							 $msg);
+	    &Apache::loncommon::simple_error_page($r,'Search Error',
+						  $msg);
+	    return OK;
 	}
         ##
         ## Print out the frames interface
@@ -501,7 +527,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/#;
@@ -547,7 +573,7 @@ sub course_search {
                 } else {
                     $url .= '?symb=';
                 }
-                $url .= &Apache::lonnet::escape($resource->symb());
+                $url .= &escape($resource->symb());
                 my $title = $resource->compTitle();
                 $r->print('<br /><a href="'.$url.'" target="cat">'.
                      ($title?$title:$url).'</a>&nbsp;&nbsp;-&nbsp;'.$disctype.'<br />');
@@ -583,7 +609,7 @@ sub checkonthis {
     my ($extension)=($url=~/\.(\w+)$/);
     if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' &&
 	($url) && ($fulltext)) {
-	$result.=&Apache::lonnet::ssi_body($url.'?symb='.&Apache::lonnet::escape($symb));
+	$result.=&Apache::lonnet::ssi_body($url.'?symb='.&escape($symb));
     }
     $result=~s/\s+/ /gs;
     my $applies = 0;
@@ -599,7 +625,7 @@ sub checkonthis {
 	   $href=&Apache::lonenc::encrypted($href)
 	       .'?symb='.&Apache::lonenc::encrypted($symb);
        } else {
-	   $href.='?symb='.&Apache::lonnet::escape($symb);
+	   $href.='?symb='.&escape($symb);
        }
        $r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url).
 		 '</a><br />');
@@ -654,76 +680,18 @@ Prints the form for the basic search.  S
 ######################################################################
 sub print_basic_search_form {
     my ($r,$closebutton,$hidden_fields) = @_;
-    my $result = ($env{'form.catalogmode'} ne 'groupsearch');
+    my $result = ($env{'form.catalogmode'} ne 'import');
     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 'import');
     my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
+# Search form for resource space 
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
-        # Define interface components
-        my $userelatedwords= '<label>'.
-            &mt('[_1] use related words',
-                &Apache::lonhtmlcommon::checkbox
-                ('related',$env{'form.related'},'related')).'</label>';
-        my $onlysearchdomain='<label>'.
-            &mt('[_1] only search domain [_2]',
-                &Apache::lonhtmlcommon::checkbox('domains',
-                                                 $env{'form.domains'},
-                                                 $r->dir_config('lonDefDomain')
-                                                 ),
-                $r->dir_config('lonDefDomain')
-                ).'</label>';
-        my $inclext= '<label>'.
-            &mt('[_1] include external resources',
-                &Apache::lonhtmlcommon::checkbox
-                ('inclext',$env{'form.inclext'})).'</label>';
-        my $adv_search_link = 
-            '<a href="/adm/searchcat?'.
-            'phase=disp_adv&'.
-            'catalogmode='.$env{'form.catalogmode'}.
-            '&launch='.$env{'form.launch'}.
-            '&mode='.$env{'form.mode'}.
-            '">'.&mt('Advanced Search').'</a>';
-        #
-        $scrout.='<form name="loncapa_search" method="post" '.
-            'action="/adm/searchcat">'.
-            '<input type="hidden" name="phase" value="basic_search" />'.
-            $hidden_fields;
-        #
-        $scrout .= '<center>'.$/;
-        if ($env{'request.course.id'}) {
-            $scrout .= '<h1>'.&mt('LON-CAPA Catalog Search').'</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',
-             &HTML::Entities::encode($env{'form.basicexp'},'<>&"'),50
-             ).
-             '<br />'.
-            '<font size="-1">'.&searchhelp().'</font>'.'</td>'.
-            '<td><font size="-1">'.
-            '<nobr>'.('&nbsp;'x3).$adv_search_link.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$userelatedwords.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$onlysearchdomain.'</nobr>'.'<br />'.
-            '<nobr>'.('&nbsp;'x1).$inclext.'</nobr>'.'<br />'.
-             '</font></td>'.
-            '</tr>'.$/;
-        #
-        $scrout .= '<tr><td align="center" colspan="2">'.
-            '<font size="-1">'.
-            '<input type="submit" name="basicsubmit" '.
-            'value="'.&mt('Search').'" />'.
-            ('&nbsp;'x2).$closebutton.('&nbsp;'x2).
-            &viewoptions().
-            '</font>'.
-            '</td></tr>'.$/;
-        $scrout .= '</table>'.$/.'</center>'.'</form>';
+        $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
+        $scrout .= '<hr /><br />';
     }
+# Search form for accessible portfolio files
+    $scrout.= &setup_basic_search($r,'portfolio',$hidden_fields,$closebutton);
     if ($env{'request.course.id'}) {
 	my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
                                            'header' => 'Course Search',
@@ -774,6 +742,80 @@ ENDENDCOURSE
     $r->print($scrout);
     return;
 }
+
+sub setup_basic_search {
+    my ($r,$area,$hidden_fields,$closebutton) = @_;
+    # Define interface components
+    my %lt = &Apache::lonlocal::texthash (
+                              res => 'LON-CAPA Catalog Search',
+                              portfolio => 'Portfolio Search',
+    );
+    my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
+    $userelatedwords = '<label>'.&mt('[_1] use related words',
+      &Apache::lonhtmlcommon::checkbox('related',$env{'form.related'},'related')).
+                       '</label>';
+    $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
+      &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
+                                       $r->dir_config('lonDefDomain')),
+				      $r->dir_config('lonDefDomain')).
+                        '</label>';
+    if ($area eq 'res') {
+        $inclext= '<label>'.&mt('[_1] include external resources',
+             &Apache::lonhtmlcommon::checkbox('inclext',$env{'form.inclext'})).
+                  '</label>';
+    }
+    $adv_search_link = '<a href="/adm/searchcat?'.
+	               &Apache::loncommon::inhibit_menu_check().
+		       '&phase=disp_adv'.
+                       '&catalogmode='.$env{'form.catalogmode'}.
+                       '&launch='.$env{'form.launch'}.
+                       '&mode='.$env{'form.mode'}.
+                       '&area='.$area.
+                       '&form='.$env{'form.form'}.
+                       '&titleelement='.$env{'form.titleelement'}.
+                       '&element='.$env{'form.element'}.
+                       '">'.&mt('Advanced Search').'</a>';
+    #
+    $scrout.='<form name="loncapa_search" method="post" '.
+             'action="/adm/searchcat">'.
+             '<input type="hidden" name="phase" value="basic_search" />'.
+             $hidden_fields;
+             if (!exists($env{'form.area'})) {
+                 $scrout .= '<input type="hidden" name="area" value="'.$area.'" />';
+             }
+    #
+    $scrout .= '<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 />'.
+            '<font size="-1">'.&searchhelp().'</font>'.'</td>'.
+            '<td><font size="-1">'.
+            '<nobr>'.('&nbsp;'x3).$adv_search_link.'</nobr>'.'<br />'.
+            '<nobr>'.('&nbsp;'x1).$userelatedwords.'</nobr>'.'<br />'.
+            '<nobr>'.('&nbsp;'x1).$onlysearchdomain.'</nobr>'.'<br />'.
+            '<nobr>'.('&nbsp;'x1).$inclext.'</nobr>'.'<br />'.
+             '</font></td>'.
+            '</tr>'.$/;
+    #
+    $scrout .= '<tr><td align="center" colspan="2">'.
+               '<font size="-1">'.
+               '<input type="submit" name="basicsubmit" '.
+               'value="'.&mt('Search').'" />'.
+               ('&nbsp;'x2).$closebutton.('&nbsp;'x2). &viewoptions().
+               '</font>'.
+               '</td></tr>'.$/;
+    $scrout .= '</table>'.$/.'</center>'.'</form>';
+    return $scrout;
+} 
+
 ######################################################################
 ######################################################################
 
@@ -790,10 +832,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 'import');
     my %lt=&Apache::lonlocal::texthash('srch' => 'Search',
 				       'reset' => 'Reset',
 				       'help' => 'Help');
@@ -802,7 +842,22 @@ 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';
+    my $jscript;
+    if ($env{'form.area'} eq 'portfolio') {
+        $srchtype = 'Portfolio';
+        $jscript = '<script type="text/javascript">
+function additional_metadata() {
+    if (document.advsearch.newfield.checked) {
+        document.advsearch.phase.value = "disp_adv";
+        document.advsearch.numaddedfields.value = parseInt(document.advsearch.numaddedfields.value) +1;
+        document.advsearch.submit();
+    }
+}
+</script>';
+    }
+    my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
+                                               $jscript);
     $scrout .= <<"ENDHEADER";
 $bread_crumb
 <form method="post" action="/adm/searchcat" name="advsearch">
@@ -813,7 +868,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 $srchtype Metadata").'</h3>';
     $scrout .= "<table>\n";
     $scrout .= '<tr><td>&nbsp;</td><td colspan="2"><font size="-1">'.
         ('&nbsp;'x2).&searchhelp()."</font></td></tr>\n";
@@ -844,7 +899,7 @@ ENDHEADER
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= 'related words';
+            $scrout .= &mt('related words');
         } else {
             $scrout .= '</td><td>&nbsp;';
         }
@@ -870,20 +925,26 @@ ENDHEADER
 	&titlefield(&mt('Domains')).'</td><td colspan="2">'. 
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
-						   '<br /><label>'.
-            &mt('[_1] include external resources',
-                &Apache::lonhtmlcommon::checkbox
-                ('inclext',$env{'form.inclext'})).'</label></td></tr>'.$/;
+						   '<br /><label>';
+            if ($env{'form.area'} ne 'portfolio') {
+                $scrout .= &mt('[_1] include external resources',
+                           &Apache::lonhtmlcommon::checkbox
+                           ('inclext',$env{'form.inclext'})).'</label>'
+            }
+     $scrout .= '</td></tr>'.$/;
     #
     # Misc metadata
-    $scrout.='<tr><td align="right" valign="top">'.
-	&titlefield(&mt('Copyright/Distribution')).'</td><td colspan="2">'.
-        &Apache::lonmeta::selectbox('copyright',
-                                    $env{'form.copyright'},
-                                    \&Apache::loncommon::copyrightdescription,
-                                    ( undef,
-                                      &Apache::loncommon::copyrightids)
-                                    ).'</td></tr>'.$/;
+    if ($env{'form.area'} ne 'portfolio') {
+        $scrout.='<tr><td align="right" valign="top">'.
+	         &titlefield(&mt('Copyright/Distribution')).
+                 '</td><td colspan="2">'.
+                 &Apache::lonmeta::selectbox('copyright',
+                                             $env{'form.copyright'},
+                                \&Apache::loncommon::copyrightdescription,
+                                       ( undef,
+                                        &Apache::loncommon::copyrightids)
+                                ).'</td></tr>'.$/;
+    }
     $scrout.='<tr><td align="right" valign="top">'.
 	&titlefield(&mt('Language')).'</td><td colspan="2">'.
         &Apache::lonmeta::selectbox('language',
@@ -891,66 +952,99 @@ ENDHEADER
                                     \&Apache::loncommon::languagedescription,
                                     ('any',&Apache::loncommon::languageids)
                                     ).'</td></tr>';
-    $scrout .= "</table>\n";    
-    #
-    # Dynamic metadata
-    $scrout .= '<h3>'.&mt('Problem Statistics').'</h3>';
-    $scrout .= "<table>\n";
-    $scrout .= '<tr><td>&nbsp;</td><td align="center">'.&mt('Minimum').'</td>'.
-        '<td align="center">'.&mt('Maximum').'</td></tr>'."\n";
-    foreach my $statistic 
-        ({ name=>'count',
-           description=>'Network-wide number of accesses (hits)',},
-         { name=>'stdno',
-           description=>
-               'Total number of students who have worked on this problem',},
-         { name => 'avetries',
-           description=>'Average number of tries till solved',},
-         { name => 'difficulty',
-           description=>'Degree of difficulty',},
-         { name => 'disc',
-           description=>'Degree of discrimination'}) {
-        $scrout .= '<tr><td align="right">'.
-            &titlefield(&mt($statistic->{'description'})).
-            '</td><td align="center">'.
-            '<input type="text" name="'.$statistic->{'name'}.'_min" '.
-            'value="" size="6" />'.
-            '</td><td align="center">'.
-            '<input type="text" name="'.$statistic->{'name'}.'_max" '.
-            'value="" size="6" />'.
-            '</td></tr>'.$/;
-    }
     $scrout .= "</table>\n";
-    $scrout .= '<h3>'.&mt('Evaluation Data').'</h3>';
-    $scrout .= "<table>\n";
-    $scrout .= '<tr><td>&nbsp;</td><td align="center">'.&mt('Minimum').'</td>'.
-        '<td align="center">'.&mt('Maximum').'</td></tr>'."\n";
-    foreach my $evaluation
-        ( { name => 'clear',
-            description => 'Material presented in clear way'},
-          { name =>'depth',
-            description => 'Material covered with sufficient depth'},
-          { name => 'helpful',
-            description => 'Material is helpful'},
-          { name => 'correct',
-            description => 'Material appears to be correct'},
-          { name => 'technical',
-            description => 'Resource is technically correct'}){
-        $scrout .= '<tr><td align="right">'.
-            &titlefield(&mt($evaluation->{'description'})).
-            '</td><td align="center">'.
-            '<input type="text" name="'.$evaluation->{'name'}.'_min" '.
-            'value="" size="6" />'.
-            '</td><td align="center">'.
-            '<input type="text" name="'.$evaluation->{'name'}.'_max" '.
-            'value="" size="6" />'.
-            '</td></tr>'.$/;
+
+    
+    if ($env{'form.area'} eq 'portfolio') {
+        # Added fields
+        my $curnumadd = $env{'form.numaddedfields'};
+        if ($curnumadd eq '') {
+            $curnumadd = 1;
+        }
+        $scrout .= '<h3>'.&mt('Custom Metadata fields').'</h3>';
+        $scrout .= "<table>\n";
+        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
+                   &mt('Field Name').'</td>'.'<td align="center">'.
+                   &mt('Field Value(s)').'</td></tr>';
+
+        for (my $j=0; $j<$curnumadd; $j++) {
+            my $num = $j+1;
+            $scrout .= '<tr><td>'.&mt('Custom metadata [_1]: ',$num).
+                       '</td><td align="center">'.
+                       '<input type="text" name="addedfield_'.$j.
+                       '" size="10" value="'.$env{'form.addedfield_'.$j}.
+                       '" /></td>'.
+                       '<td align="center"><input type="text" '.
+                       'name="addedvalues_'.$j.'" size="15" value="'.
+                       $env{'form.addedvalues_'.$j}.'" /></td></tr>';
+        }
+        $scrout .= '<tr><td align="left" colspan="3"><label>'.
+                   '<input type="checkbox" name="newfield" '.
+                   'value="1" onclick="javascript:additional_metadata()" />'.
+                   &mt('Another custom field/value pair?').'</label>'.
+                   '<input type="hidden" name="numaddedfields" value="'.
+                   $curnumadd.'" /></td></tr></table>';
+    } else {
+        #
+        # Dynamic metadata
+        $scrout .= '<h3>'.&mt('Problem Statistics').'</h3>';
+        $scrout .= "<table>\n";
+        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
+                   &mt('Minimum').'</td>'.'<td align="center">'.
+                   &mt('Maximum').'</td></tr>'."\n";
+        foreach my $statistic 
+            ({ name=>'count',
+               description=>'Network-wide number of accesses (hits)',},
+             { name=>'stdno',
+               description=>
+               'Statistics calculated for number of students',},
+             { name => 'avetries',
+               description=>'Average number of tries till solved',},
+             { name => 'difficulty',
+               description=>'Degree of difficulty',},
+             { name => 'disc',
+               description=>'Degree of discrimination'}) {
+              $scrout .= '<tr><td align="right">'.
+                         &titlefield(&mt($statistic->{'description'})).
+                         '</td><td align="center">'.
+                         '<input type="text" name="'.$statistic->{'name'}.
+                         '_min" value="" size="6" /></td><td align="center">'.
+                         '<input type="text" name="'.$statistic->{'name'}.
+                         '_max" value="" size="6" /></td></tr>'.$/;
+        }
+        $scrout .= "</table>\n";
+        $scrout .= '<h3>'.&mt('Evaluation Data').'</h3>';
+        $scrout .= "<table>\n";
+        $scrout .= '<tr><td>&nbsp;</td><td align="center">'.
+                   &mt('Minimum').'</td>'.'<td align="center">'.
+                   &mt('Maximum').'</td></tr>'."\n";
+        foreach my $evaluation
+            ( { name => 'clear',
+                description => 'Material presented in clear way'},
+              { name =>'depth',
+                description => 'Material covered with sufficient depth'},
+              { name => 'helpful',
+                description => 'Material is helpful'},
+              { name => 'correct',
+                description => 'Material appears to be correct'},
+              { name => 'technical',
+                description => 'Resource is technically correct'}){
+            $scrout .= '<tr><td align="right">'.
+                       &titlefield(&mt($evaluation->{'description'})).
+                       '</td><td align="center">'.
+                       '<input type="text" name="'.
+                       $evaluation->{'name'}.'_min" value="" size="6" />'.
+                       '</td><td align="center"><input type="text" name="'.
+                       $evaluation->{'name'}.'_max" value="" size="6" />'.
+                       '</td></tr>'.$/;
+        }
+        $scrout .= "</table>\n";
     }
-    $scrout .= "</table>\n";
     #
     # Creation/Modification date limits
     $scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';
     $scrout .= "\n<table>\n";
+    $scrout .= "<tr><td>&nbsp;</td><td>".&mt('(Month - Day - Year)')."</td></tr>\n";
     my $cafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
                                             'creationdate1', # fieldname
@@ -969,10 +1063,10 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= &mt('<tr><td align="right">Created between</td>'.
-                   '<td>[_1]</td></tr>'.
-                   '<tr><td align="right">and </td>'.
-                   '<td>[_2]</td></tr>',$cafter,$cbefore);
+    $scrout .= '<tr><td align="right">'.&mt('Created between').'</td>'
+              .'<td>'.$cafter.'</td></tr>'
+              .'<tr><td align="right">'.&mt('and').'</td>'
+              .'<td>'.$cbefore.'</td></tr>';
     my $lafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',
                                             'revisiondate1', 
@@ -991,10 +1085,10 @@ ENDHEADER
                                             '',          # state
                                             1,           # no_hh_mm_ss
                                             );
-    $scrout .= &mt('<tr><td align="right">Last modified between </td>'.
-                   '<td>[_1]</td></tr>'.
-                   '<tr><td align="right">and</td>'.
-                   '<td>[_2]</td></tr>',$lafter,$lbefore);
+    $scrout .= '<tr><td align="right">'.&mt('Last modified between').'</td>'
+              .'<td>'.$lafter.'</td></tr>'
+              .'<tr><td align="right">'.&mt('and').'</td>'
+              .'<td>'.$lbefore.'</td></tr>';
     $scrout.="</table>\n";
     $scrout.=<<ENDDOCUMENT;
 $advanced_buttons
@@ -1148,7 +1242,7 @@ sub get_persistent_form_data {
         # End kludge (hopefully)
         next if (exists($env{$name}));
         my @values = map { 
-            &Apache::lonnet::unescape($_);
+            &unescape($_);
         } split(',',$persistent_db{$name});
         next if (@values <1);
         if ($arrays_allowed{$name}) {
@@ -1194,7 +1288,7 @@ sub get_persistent_data {
             next;
         }
         my @values = map { 
-            &Apache::lonnet::unescape($_);
+            &unescape($_);
         } split(',',$persistent_db{$name});
         if (@values <= 1) {
             push @Values,$values[0];
@@ -1231,7 +1325,7 @@ sub make_persistent {
     foreach my $name (keys(%save)) {
         my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
         # We handle array references, but not recursively.
-        my $store = join(',', map { &Apache::lonnet::escape($_); } @values );
+        my $store = join(',', map { &escape($_); } @values );
         $persistent_db{$name} = $store;
     }
     untie(%persistent_db);
@@ -1309,12 +1403,12 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
-	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g;
+	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
 	next if (! exists($env{'form.'.$_}));
-	$env{'form.'.$_}=&Apache::lonnet::unescape($env{'form.'.$_});
+	$env{'form.'.$_}=&unescape($env{'form.'.$_});
 	$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g;
     }
     # Preprocess the category form element.
@@ -1342,6 +1436,17 @@ sub parse_advanced_search {
             $fillflag++;
         }
     }
+    if ($env{'form.area'} eq 'portfolio') {
+        # Added metadata fields
+        for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
+            my $field = $env{'form.addedfield_'.$i};
+            $field =~ s/^\s*(\S*)\s*$/$1/;
+            $field =~ s/\W/_/g;
+            if ($field ne '') {
+                $fillflag++;
+            }
+        }
+    }
     if (! $fillflag) {
 	&output_blank_field_error($r,$closebutton,
                                   'phase=disp_adv',$hidden_fields);
@@ -1428,29 +1533,56 @@ sub parse_advanced_search {
             &Apache::loncommon::copyrightdescription($env{'form.copyright'}).
                 "<br />\n";
     }
-    #
-    # Statistics
-    foreach my $field (@StatsFields,@EvalFields) {
-        my ($min,$max);
-        if (exists($env{'form.'.$field.'_min'}) && 
-            $env{'form.'.$field.'_min'} ne '') {
-            $min = $env{'form.'.$field.'_min'};
-        }
-        if (exists($env{'form.'.$field.'_max'}) &&
-            $env{'form.'.$field.'_max'} ne '') {
-            $max = $env{'form.'.$field.'_max'};
-        }
-        next if (! defined($max) && ! defined($min));
-        if (defined($min) && defined($max)) {
-            ($min,$max) = sort {$a <=>$b} ($min,$max);
-        }
-        if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
-            push(@queries,'('.$field.'>'.$min.')');
-            $pretty_search_string.=$font.$field.'</font>&gt;'.$min.'<br />';
-        }
-        if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
-            push(@queries,'('.$field.'<'.$max.')');
-            $pretty_search_string.=$font.$field.'</font>&lt;'.$max.'<br />';
+    if ($env{'form.area'} eq 'portfolio') {
+        #
+        # Added metadata fields
+        for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
+            my $field = $env{'form.addedfield_'.$i};
+            $field =~ s/^\s*(\S*)\s*$/$1/;
+            $field =~ s/\W/_/g;
+            $field =~ tr/A-Z/a-z/; 
+            if ($field ne '') {
+                my $value = $env{'form.addedvalues_'.$i};
+                if ($value ne '') {
+                    $value =~ s/'/''/g; #' stupid emacs
+                    my ($error,$query) = 
+                        &process_phrase_input($value,0,'pf.value');
+                    if (!defined($error)) {
+                        push(@queries,"pf.field = '$field' AND $query");
+                        $pretty_search_string .=
+                            $font.$field.'</font>: '.
+                            $env{'form.addedvalues_'.$i}.'<br />';
+                    }
+                } else {
+                    push(@queries,"pf.field = '$field' AND pf.value IS NULL");
+                }
+            }
+        }
+    } else {
+        #
+        # Statistics
+        foreach my $field (@StatsFields,@EvalFields) {
+            my ($min,$max);
+            if (exists($env{'form.'.$field.'_min'}) && 
+                $env{'form.'.$field.'_min'} ne '') {
+                $min = $env{'form.'.$field.'_min'};
+            }
+            if (exists($env{'form.'.$field.'_max'}) &&
+                $env{'form.'.$field.'_max'} ne '') {
+                $max = $env{'form.'.$field.'_max'};
+            }
+            next if (! defined($max) && ! defined($min));
+            if (defined($min) && defined($max)) {
+                ($min,$max) = sort {$a <=>$b} ($min,$max);
+            }
+            if (defined($min) && $min =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+                push(@queries,'('.$field.'>'.$min.')');
+                $pretty_search_string.=$font.$field.'</font>&gt;'.$min.'<br />';
+            }
+            if (defined($max) && $max =~ /^(\d+\.\d+|\d+|\.\d+)$/) {
+                push(@queries,'('.$field.'<'.$max.')');
+                $pretty_search_string.=$font.$field.'</font>&lt;'.$max.'<br />';
+            }
         }
     }
     #
@@ -1515,7 +1647,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, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.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 = '';
     }
@@ -1539,21 +1675,19 @@ sub parse_domain_restrictions {
         $domain_hash{$_}++;
     }
     if ($domain_hash{'any'}) {
-        $pretty_domains_string = "In all LON-CAPA domains.";
+        $pretty_domains_string = &mt("in all LON-CAPA domains.");
     } else {
         if (@allowed_domains > 1) {
-            $pretty_domains_string = "In LON-CAPA domains:";
+            $pretty_domains_string = &mt("in LON-CAPA domains:");
         } else {
-            $pretty_domains_string = "In LON-CAPA domain ";
+            $pretty_domains_string = &mt("in LON-CAPA domain ");
         }
         foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";
         }
-        foreach (keys(%Apache::lonnet::libserv)) {
-            if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
-                push @$libraries_to_query,$_;
-            }
-        }
+	my %servers = &Apache::lonnet::get_servers(\@allowed_domains,
+						   'library');
+	$libraries_to_query = [keys(%servers)];
     }
     return ($libraries_to_query,
             $pretty_domains_string);
@@ -1582,7 +1716,7 @@ sub parse_basic_search {
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
 	next unless (exists($env{"form.$_"}));
-	$env{"form.$_"}=&Apache::lonnet::unescape($env{"form.$_"});
+	$env{"form.$_"}=&unescape($env{"form.$_"});
 	$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
     }
     my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions();
@@ -1595,10 +1729,13 @@ sub parse_basic_search {
     }
     my $pretty_search_string=$search_string;
     my @Queries;
-    my $searchfield = 'concat_ws(" ",'.join(',',
-                                            ('title','author','subject',
-                                             'notes','abstract','keywords')
-                                            ).')';
+    my @fields = ('title','author','subject','notes','abstract','keywords');
+    my $searchfield;
+    if ($env{'form.area'} eq 'portfolio') {
+        $searchfield = 'concat_ws(" ",pm.'.join(',pm.',@fields).')';
+    } else {
+        $searchfield = 'concat_ws(" ",'.join(',',@fields).')';
+    }
     my ($error,$SQLQuery) = &process_phrase_input($search_string,
                                                     $env{'form.related'},
                                                     $searchfield);
@@ -1611,14 +1748,22 @@ sub parse_basic_search {
     #foreach my $q (@Queries) {
     #    &Apache::lonnet::logthis('    '.$q);
     #}
-    my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
+    my $final_query;
+    if ($env{'form.area'} eq 'portfolio') {
+        $final_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 {
+        $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
+    }
     #
+    if ($env{'form.related'}) {
+	$pretty_search_string.=' '.&mt('(including related words)');
+    }
     if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
         $pretty_search_string .= ' '.$pretty_domains_string;
     }
     $pretty_search_string .= "<br />\n";
     $pretty_search_string =~ s:^<br /> and ::;
-    #&Apache::lonnet::logthis('simple search final query = '.$/.$final_query);
+    &Apache::lonnet::logthis('simple search final query = '.$/.$final_query);
     return ($final_query,$pretty_search_string,
             $libraries_to_query);
 }
@@ -1721,7 +1866,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2009,7 +2154,7 @@ sub ensure_db_and_table {
     ##
     if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
         $r->print("Unable to retrieve search results.  ".
-                  "Unable to determine the table results were stored in.  ".
+                  "Unable to determine the table results were saved in.  ".
 		  &Apache::loncommon::end_page());
         return undef;
     }
@@ -2019,7 +2164,7 @@ sub ensure_db_and_table {
     my $connection_result = &Apache::lonmysql::connect_to_db();
     if (!defined($connection_result)) {
         $r->print("Unable to connect to the MySQL database where your results".
-                  " are stored.".
+                  " are saved.".
 		  &Apache::loncommon::end_page());
         &Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
                                  " connect to database.");
@@ -2103,17 +2248,17 @@ sub print_sort_form {
 END
 
     my $start_page = &Apache::loncommon::start_page('Results',$js,
-						    {'only_body' => 1});
+						    {'no_title' => 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 'import');
 
     my $result = <<END;
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="POST">
-<input type="hidden" name="Queue" value="" />
+<form name="statusform" action="" method="post" target="_top">
+<input type="hidden" name="catalogmode" value="import" />
+<input type="hidden" name="acts" value="" />
 END
 
 #<h2>Sort Results</h2>
@@ -2128,14 +2273,11 @@ END
 #    }
 #    $result.="</select>\n";
     my $revise = &revise_button();
-    $result.=<<END;
-<p>
-There are $total_results matches to your query. $revise
-</p><p>
-Search:$pretty_query_string
-</p>
-</form>
-END
+    $result.='<p>'
+            .&mt('There are [_1] matches to your query.',$total_results)
+            .' '.$revise.'</p>'
+            .'<p>'.&mt('Search: ').$pretty_query_string
+            .'</p></form>';
     $r->print($result.&Apache::loncommon::end_page());
     return;
 }
@@ -2172,7 +2314,7 @@ my @Fullindicies;
 Creates the table of search results by calling lonmysql.  Stores the
 table id in $env{'form.table'}
 
-Inputs: none.
+Inputs: search area - either res or portfolio 
 
 Returns: the identifier of the table on success, undef on error.
 
@@ -2181,8 +2323,9 @@ Returns: the identifier of the table on
 ######################################################################
 ######################################################################
 sub set_up_table_structure {
+    my ($tabletype) = @_;
     my ($datatypes,$fullindicies) = 
-        &LONCAPA::lonmetadata::describe_metadata_storage();
+        &LONCAPA::lonmetadata::describe_metadata_storage($tabletype);
     # Copy the table description before modifying it...
     @Datatypes = @{$datatypes};
     unshift(@Datatypes,{name => 'id',  
@@ -2195,7 +2338,12 @@ sub set_up_table_structure {
 }
 
 sub create_results_table {
-    &set_up_table_structure();
+    my ($area) = @_;
+    if ($area eq 'portfolio') {
+        &set_up_table_structure('portfolio_search');
+    } else {
+        &set_up_table_structure('metadata');
+    }
     my $table = &Apache::lonmysql::create_table
         ( { columns => \@Datatypes,
             FULLTEXT => [{'columns' => \@Fullindicies},],
@@ -2301,13 +2449,14 @@ Returns: html string for a 'revise searc
 ######################################################################
 ######################################################################
 sub revise_button {
+    my $revisetext = &mt('Revise search');
     my $revise_phase = 'disp_basic';
     $revise_phase = 'disp_adv' if ($env{'form.searchmode'} eq 'advanced');
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$env{'form.persistent_db_id'}.
             '&cleargroupsort=1'.
             '&phase='.$revise_phase;
-    my $result = qq{<input type="button" value="Revise search" name="revise"} .
+    my $result = qq{<input type="button" value="$revisetext" name="revise"} .
         qq{ onClick="parent.location='$newloc';" /> };
     return $result;
 }
@@ -2327,22 +2476,26 @@ results into MySQL.
 ######################################################################
 ######################################################################
 sub run_search {
-    my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
-
+    my ($r,$query,$customquery,$customshow,$serverlist,
+        $pretty_string,$area) = @_;
+    my $tabletype = 'metadata';
+    if ($area eq 'portfolio') {
+        $tabletype = 'portfolio_search';
+    }
     my $connection = $r->connection;
     #
     # Print run_search header
     #
     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');
+						    {'no_title' => 1});
+    my $breadcrumbs =
+	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
+					    $env{'form.catalogmode'} ne 'import');
     $r->print(<<END);
 $start_page
 $breadcrumbs
 <form name="statusform" action="" method="post">
-<input type="hidden" name="Queue" value="" />
+<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2367,14 +2520,15 @@ END
             @Servers_to_contact = ($serverlist);
         }
     } else {
-        @Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
+	my %all_library_servers = &Apache::lonnet::all_library();
+        @Servers_to_contact = sort(keys(%all_library_servers));
     }
     my %Server_status;
     #
     # Check on the mysql table we will use to store results.
     my $table =$env{'form.table'};
     if (! defined($table) || $table eq '' || $table =~ /\D/ ) {
-        $r->print("Unable to determine table id to store search results in.".
+        $r->print("Unable to determine table id to save search results in.".
                   "The search has been aborted.".
 		  &Apache::loncommon::end_page());
         return;
@@ -2403,6 +2557,7 @@ END
     ##
     ## Prepare for the big loop.
     my $hitcountsum;
+    my %matches;
     my $server; 
     my $status;
     my $revise = &revise_button();
@@ -2457,7 +2612,7 @@ END
                 delete ($Server_status{$server});
                 next;
             }
-            $status=~s|/||g; 
+            $status=~s|/||g;
        	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$status;
             if (-e $datafile && ! -e "$datafile.end") {
                 &update_status($r,&mt('Receiving results from [_1]',$server));
@@ -2486,7 +2641,7 @@ END
                     next if (! $result);
                     #
                     # Parse the result.
-                    my %Fields = &parse_raw_result($result,$server);
+                    my %Fields = &parse_raw_result($result,$server,$tabletype);
                     $Fields{'hostname'} = $server;
                     #
                     # Skip if external and we did not want that
@@ -2494,6 +2649,12 @@ END
                     # Skip based on copyright
                     next if (! &copyright_check(\%Fields));
 
+                    if ($area eq 'portfolio') {
+                        next if (defined($matches{$Fields{'url'}}));
+                        # Skip if inaccessible
+                        next if (!&Apache::lonnet::portfolio_access($Fields{'url'}));
+                        $matches{$Fields{'url'}} = 1; 
+                    }
                     #
                     # Store the result in the mysql database
                     my $result = &Apache::lonmysql::store_row($table,\%Fields);
@@ -2527,7 +2688,7 @@ END
     # results to get, so let the client know the top frame needs to be
     # loaded from /adm/searchcat
     $r->print(&Apache::loncommon::end_page());
-#    if ($env{'form.catalogmode'} ne 'groupsearch') {
+#    if ($env{'form.catalogmode'} ne 'import') {
         $r->print("<script>".
                       "window.location='/adm/searchcat?".
                       "phase=sort&".
@@ -2580,7 +2741,7 @@ Prints the results out for selection and
 ######################################################################
 ######################################################################
 sub display_results {
-    my ($r,$importbutton,$closebutton,$diropendb) = @_;
+    my ($r,$importbutton,$closebutton,$diropendb,$area) = @_;
     my $connection = $r->connection;
     $r->print(&search_results_header($importbutton,$closebutton));
     ##
@@ -2594,18 +2755,18 @@ sub display_results {
     }
     ##
     ## $checkbox_num is a count of the number of checkboxes output on the 
-    ## page this is used only during catalogmode=groupsearch.
+    ## page this is used only during catalogmode=import.
     my $checkbox_num = 0;
     ##
     ## Get the catalog controls setup
     ##
     my $action = "/adm/searchcat?phase=results";
     ##
-    ## Deal with groupsearch by opening the groupsearch db file.
-    if ($env{'form.catalogmode'} eq 'groupsearch') {
+    ## Deal with import by opening the import db file.
+    if ($env{'form.catalogmode'} eq 'import') {
         if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
                   &GDBM_WRCREAT(),0640)) {
-            $r->print('Unable to store import results.</form>'.
+            $r->print('Unable to save import results.</form>'.
 		      &Apache::loncommon::end_page());
             $r->rflush();
             return;
@@ -2650,7 +2811,8 @@ sub display_results {
     $r->print(&hidden_field('table').
               &hidden_field('phase').
               &hidden_field('persistent_db_id').
-              &hidden_field('start')
+              &hidden_field('start').
+              &hidden_field('area')
               );
     #
     # Build sorting selector
@@ -2671,6 +2833,16 @@ sub display_results {
          {key =>'lowestgradelevel'},
          {key =>'highestgradelevel'},
          {key =>'standards',desc=>'Standards'},
+        );
+    if ($area eq 'portfolio') {
+        push(@fields,
+       (
+         {key => 'scope'},
+         {key => 'keynum'},
+       ));
+    } else {
+        push(@fields,
+       (
          {key =>'count',desc=>'Number of accesses'},
          {key =>'stdno',desc=>'Students Attempting'},
          {key =>'avetries',desc=>'Average Number of Tries'},
@@ -2681,7 +2853,8 @@ sub display_results {
          {key =>'correct',desc=>'Evaluation: Material is Correct'},
          {key =>'helpful',desc=>'Evaluation: Material is Helpful'},
          {key =>'depth',desc=>'Evaluation: Material has Depth'},
-         );
+       ));
+    }
     my %fieldnames = &Apache::lonmeta::fieldnames();
     my @field_order;
     foreach my $field_data (@fields) {
@@ -2698,7 +2871,13 @@ sub display_results {
     my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields;
     $sort_fields{'select_form_order'} = \@field_order;
     $env{'form.sortorder'} = 'desc' if (! exists($env{'form.sortorder'}));
-    $env{'form.sortfield'} = 'count' if (! exists($env{'form.sortfield'}));
+    if (! exists($env{'form.sortfield'})) {
+        if ($area eq 'portfolio') {
+            $env{'form.sortfield'} = 'owner';
+        } else {
+            $env{'form.sortfield'} = 'count';
+        }
+    }
     if (! exists($env{'form.sortorder'})) {
 	if ($env{'form.sortfield'}=~/^(count|stdno|disc|clear|technical|correct|helpful)$/) {
 	    $env{'form.sortorder'}='desc';
@@ -2762,12 +2941,16 @@ sub display_results {
     my @Results = &Apache::lonmysql::get_rows($table,$sort_command);
     ##
     ## Loop through the results and output them.
+    my $tabletype = 'metadata';
+    if ($area eq 'portfolio') {
+        $tabletype = 'portfolio_search';
+    }
     foreach my $row (@Results) {
         if ($connection->aborted()) {
             &cleanup();
             return;
         }
-        my %Fields = %{&parse_row(@$row)};
+        my %Fields = %{&parse_row($tabletype,@$row)};
         my $output="<p>\n";
         if (! defined($Fields{'title'}) || $Fields{'title'} eq '') {
             $Fields{'title'} = 'Untitled';
@@ -2820,17 +3003,17 @@ sub catalogmode_output {
         $title=~ s/\'/\\\'/g;
         if ($env{'form.catalogmode'} eq 'interactive') {
             $output.=<<END 
-<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
-onClick="javascript:select_data('$title','$url')">
+<font size='-1'><input type="button" name="returnvalues" value="select"
+onClick="javascript:select_data('$title','$url')" />
 </font>
 END
         }
-    } elsif ($env{'form.catalogmode'} eq 'groupsearch') {
+    } elsif ($env{'form.catalogmode'} eq 'import') {
         $groupsearch_db{"pre_${fnum}_link"}=$url;
         $groupsearch_db{"pre_${fnum}_title"}=$title;
         $output.=<<END;
 <font size='-1'>
-<input type="checkbox" name="returnvalues" value="SELECT"
+<input type="checkbox" name="returnvalues" value="select"
 onClick="javascript:queue($checkbox_num,$fnum)" />
 </font>
 END
@@ -2851,13 +3034,13 @@ Parse a row returned from the database.
 ######################################################################
 ######################################################################
 sub parse_row {
-    my @Row = @_;
+    my ($tabletype,@Row) = @_;
     my %Fields;
     if (! scalar(@Datatypes)) {
-        &set_up_table_structure();
+        &set_up_table_structure($tabletype);
     }
     for (my $i=0;$i<=$#Row;$i++) {
-        $Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
+        $Fields{$Datatypes[$i]->{'name'}}=&unescape($Row[$i]);
     }
     $Fields{'language'} = 
         &Apache::loncommon::languagedescription($Fields{'language'});
@@ -2890,12 +3073,13 @@ The 'title' field is set to "Untitled" i
 ###########################################################
 ###########################################################
 sub parse_raw_result {
-    my ($result,$hostname) = @_;
+    my ($result,$hostname,$tabletype) = @_;
     # conclude from self to others regarding fields
     my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash
-        (map {
-            &Apache::lonnet::unescape($_);
-        } (split(/\,/,$result)) );
+        ($tabletype,
+         map {
+            &unescape($_);
+         } (split(/\,/,$result)) );
     return %Fields;
 }
 
@@ -2932,7 +3116,7 @@ sub handle_custom_fields {
         if ($result=~/^(custom\=.*)$/) { # grab all custom metadata
             my $tmp=$result;
             $tmp=~s/^custom\=//;
-            my ($k,$v)=map {&Apache::lonnet::unescape($_);
+            my ($k,$v)=map {&unescape($_);
                         } split(/\,/,$tmp);
             $customhash{$k}=$v;
         }
@@ -2964,7 +3148,7 @@ The following environment variables are
 
 =item 'form.catalogmode' 
 
-Checked for 'interactive' and 'groupsearch'.
+Checked for 'interactive' and 'import'.
 
 =item 'form.mode'
 
@@ -3056,28 +3240,29 @@ function changeURL(val) {
 SCRIPT
         }
     }
-    $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'groupsearch';
+    my $inhibit_menu = "&".&Apache::loncommon::inhibit_menu_check();
+    $js.=<<SCRIPT if $env{'form.catalogmode'} eq 'import';
 <script type="text/javascript">
     function queue(checkbox_num,val) {
         if (document.forms.results.returnvalues.length != "undefined" &&
             typeof(document.forms.results.returnvalues.length) == "number") {
             if (document.forms.results.returnvalues[checkbox_num].checked) {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
             } else {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
             }
         } else {
             if (document.forms.results.returnvalues.checked) {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
             } else {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
             }
         }
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=groupsearch&acts="+
-	    parent.statusframe.document.forms.statusform.elements.Queue.value;
+    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
+	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 </script>
 SCRIPT
@@ -3086,25 +3271,12 @@ SCRIPT
 						     {'only_body' =>1});
     my $result=<<END;
 $start_page
-<form name="results" method="post" action="/adm/searchcat" >
-<input type="hidden" name="Queue" value="" />
+<form name="results" method="post" action="/adm/searchcat">
 $importbutton
 END
     return $result;
 }
 
-######################################################################
-######################################################################
-sub search_status_header {
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef,
-						    {'only_body' => 1});
-    return <<ENDSTATUS;
-$start_page
-<h3>Search Status</h3>
-Sending search request to LON-CAPA servers.<br />
-ENDSTATUS
-}
-
 sub results_link {
     my $basic_link   = "/adm/searchcat?"."&table=".$env{'form.table'}.
         "&persistent_db_id=".$env{'form.persistent_db_id'};
@@ -3127,16 +3299,21 @@ var targetwin = opener;
 var queue = '';
 </script>
 JS
-    my $html     = &Apache::lonxml::xmlbegin();
-    my $head     = &Apache::loncommon::head('LON-CAPA Digital Library Search Results',$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";
-$html
-$head
-<frameset rows="150,*">
+$start_page
     <frame name="statusframe"  src="$run_search_link">
     <frame name="resultsframe" src="$results_link">
-</frameset>
-</html>
+$end_page
 ENDFRAMES
 
     $r->print($result);
@@ -3204,11 +3381,11 @@ sub detailed_citation_view {
     my ($prefix,%values) = @_;
     my $result;
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
     $result .= '<b>'.$prefix.
-        '<img src="'.&Apache::loncommon::icon($values{'url'}).' " />'.'&nbsp;'.
-        '<a href="'.$jumpurl.'" '.
-        'target="search_preview">'.$values{'title'}."</a></b>\n";
+        '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
+        '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
+        'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
         ' <i>'.$values{'owner'}.'</i><br />';
@@ -3272,25 +3449,18 @@ sub detailed_citation_view {
         next if (! exists($values{$field->{'name'}}) ||
                  $values{$field->{'name'}} eq '');
         if (exists($field->{'type'}) && $field->{'type'} eq 'list') {
-            $result .= '<b>'.&mt($field->{'translate'}).'</b><ul>';
+            $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
-                $result .= '<li>'.
-                    '<a target="search_preview" '.
-                    'href="'.$jumpurl.'">'.$item.'</a></li>';
+                $item = &Apache::lonnet::clutter($item);
+                $result .= &display_url($item,[2,0,1]);
             }
-            $result .= '</ul>';
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
                           sprintf($field->{'format'},
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-                $result.= 
-                     &mt($field->{'translate'},
-                         '<a href="'.$jumpurl.'" '.
-                         'target="search_preview">'.
-                         $values{$field->{'name'}}.
-                         '</a>');
+                $result .= &display_url($jumpurl,[3,0,1]);
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3346,11 +3516,13 @@ sub summary_view {
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
+    my $link = &display_url($jumpurl,[2,0,1]);
 
     $result.=<<END;
-<a href="$jumpurl" 
-   target='search_preview'>$values{'title'}</a><br />
+<a href="$jumpurl?inhibitmenu=yes" 
+   target='preview'>$values{'title'}</a> <br />
+$link <br />
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
 $values{'copyrighttag'}<br />
 $values{'extrashow'}
@@ -3383,8 +3555,10 @@ sub summary_preview {
 sub compact_view {
     my ($prefix,%values) = @_;
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
 
+    my $link = &display_url($jumpurl,[1,1,1]);
+    
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
     if (exists($env{'form.sortfield'}) && 
@@ -3393,12 +3567,30 @@ sub compact_view {
         if (! defined($tmp)) { $tmp = 'undefined'; }
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
-    $result.='&nbsp;<a href="'.$jumpurl.'" target="search_preview">'.
-        $values{'title'}.'</a>'.('&nbsp;'x2).
-        '<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
+    $jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
+    $result.=' <span class="LC_nobreak">'.
+	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.
+        &HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
+	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
     return $result;
 }
 
+sub display_url {
+    my ($url,$crumb_args) = @_;
+    my $link;
+    if ($url=~m|^/ext/|) {
+	$url=~s|^/ext/|http://|;
+	$link='<span class="LC_filename">'.$url.'</span>';
+    } elsif ($url=~m{^(http://|/uploaded/)}) {
+	$link='<span class="LC_filename">'.$url.'</span>';
+    } else {
+        $link=&Apache::lonhtmlcommon::crumbs($url,
+		  'preview',
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),@{$crumb_args}).' ';
+    }
+    return $link;
+}
 
 ######################################################################
 ######################################################################
@@ -3416,14 +3608,14 @@ sub fielded_format_view {
     my $icon=&Apache::loncommon::icon($values{'url'});
     my %Translated = &Apache::lonmeta::fieldnames();
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
+    $jumpurl=~s|^/ext/|http://|;
 
     my $result=<<END;
 $prefix <img src="$icon" />
 <dl>
 <dt>URL:</dt>
-    <dd><a href="$jumpurl" 
-         target='search_preview'>$values{'url'}</a></dd>
+    <dd><a href="$jumpurl?inhibitmenu=yes" 
+         target='preview'>$values{'url'}</a></dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',
                        'mimetag','language','creationdate','lastrevisiondate',