--- loncom/interface/lonsearchcat.pm	2006/09/27 19:32:11	1.277
+++ loncom/interface/lonsearchcat.pm	2009/02/26 16:17:30	1.305
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.277 2006/09/27 19:32:11 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.305 2009/02/26 16:17:30 schafran 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;
 
 ######################################################################
@@ -139,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','area']);
+              '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
@@ -191,7 +190,8 @@ sub handler {
     }
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>'/adm/searchcat?'.
-               'catalogmode='.$env{'form.catalogmode'}.
+	       &Apache::loncommon::inhibit_menu_check().
+               '&catalogmode='.$env{'form.catalogmode'}.
                '&launch='.$env{'form.launch'}.
                '&mode='.$env{'form.mode'},
               text=>"$crumb_text",
@@ -259,11 +259,14 @@ sub handler {
     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 {
@@ -271,15 +274,16 @@ sub handler {
         }
         $closebutton .=">\n";
     } elsif ($env{'form.catalogmode'} eq 'import') {
-        $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 .= ">";
+        my $txt_import = &mt('IMPORT');
         $importbutton=<<END;
-<input type='button' name='import' value='IMPORT'
+<input type='button' name='import' value='$txt_import'
 onClick='javascript:select_group()'>
 END
     } else {
@@ -309,15 +313,17 @@ END
             $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 $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'},
@@ -380,7 +386,7 @@ END
                                      $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.';
 	    &Apache::loncommon::simple_error_page($r,'Search Error',
 						  $msg);
@@ -389,7 +395,7 @@ END
         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.';
 	    &Apache::loncommon::simple_error_page($r,'Search Error',
 						  $msg);
@@ -513,72 +519,77 @@ sub course_search {
         my $totaldiscussions = 0;
         $r->print('<br /><br /><b>'.&mt('Discussion postings').':</b><br />'); 
         my $navmap = Apache::lonnavmaps::navmap->new();
-        my @allres=$navmap->retrieveResources();
-        my %discussiontime = &Apache::lonnet::dump('discussiontimes',
-                               $env{'course.'.$env{'request.course.id'}.'.domain'},
-                               $env{'course.'.$env{'request.course.id'}.'.num'});
-        foreach my $resource (@allres) {
-            my $result = '';
-            my $applies = 0;
-            my $symb = $resource->symb();
-            my $ressymb = $symb;
-            if ($symb =~ m#(___adm/\w+/\w+)/(\d+)/bulletinboard$#) {
-                $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-                unless ($ressymb =~ m#bulletin___\d+___adm/wrapper#) {
-                    $ressymb=~s#(bulletin___\d+___)#$1adm/wrapper/#;
+        if (defined($navmap)) {
+            my @allres=$navmap->retrieveResources();
+            my %discussiontime = &Apache::lonnet::dump('discussiontimes',
+                                   $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                   $env{'course.'.$env{'request.course.id'}.'.num'});
+            foreach my $resource (@allres) {
+                my $result = '';
+                my $applies = 0;
+                my $symb = $resource->symb();
+                my $ressymb = $symb;
+                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/#;
+                    }
                 }
-            }
-            if (defined($discussiontime{$ressymb})) { 
-                my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
-                     $env{'course.'.$env{'request.course.id'}.'.domain'},
-                     $env{'course.'.$env{'request.course.id'}.'.num'});
-                if ($contrib{'version'}) {
-                    for (my $id=1;$id<=$contrib{'version'};$id++) {
-                        unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { 
-                            if ($contrib{$id.':subject'}) {
-                                $result .= $contrib{$id.':subject'};
-                            }
-                            if ($contrib{$id.':message'}) {
-                                $result .= $contrib{$id.':message'};
-                            }
-                            if ($contrib{$id,':attachmenturl'}) {
-                                if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
-                                    $result .= $1;
+                if (defined($discussiontime{$ressymb})) { 
+                    my %contrib = &Apache::lonnet::restore($ressymb,$env{'request.course.id'},
+                         $env{'course.'.$env{'request.course.id'}.'.domain'},
+                         $env{'course.'.$env{'request.course.id'}.'.num'});
+                    if ($contrib{'version'}) {
+                        for (my $id=1;$id<=$contrib{'version'};$id++) {
+                            unless (($contrib{'hidden'}=~/\.$id\./) || ($contrib{'deleted'}=~/\.$id\./)) { 
+                                if ($contrib{$id.':subject'}) {
+                                    $result .= $contrib{$id.':subject'};
+                                }
+                                if ($contrib{$id.':message'}) {
+                                    $result .= $contrib{$id.':message'};
                                 }
+                                if ($contrib{$id,':attachmenturl'}) {
+                                    if ($contrib{$id,':attachmenturl'} =~ m-/([^/]+)$-) {
+                                        $result .= $1;
+                                    }
+                                }
+                                $applies = &checkwords($result,$applies,@allwords);
                             }
-                            $applies = &checkwords($result,$applies,@allwords);
                         }
                     }
                 }
-            }
 # Does this discussion apply?
-            if ($applies) {
-                my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
-                my $disctype = &mt('resource');
-                if ($url =~ m#/bulletinboard$#) {
-                    if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
-                        $url =~s#^adm/wrapper##;
+                if ($applies) {
+                    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($ressymb);
+                    my $disctype = &mt('resource');
+                    if ($url =~ m#/bulletinboard$#) {
+                        if ($url =~m#^adm/wrapper/adm/.*/bulletinboard$#) {
+                            $url =~s#^adm/wrapper##;
+                        }
+                        $disctype = &mt('discussion board');
+                    } else {
+                        $url = '/res/'.$url;
                     }
-                    $disctype = &mt('bulletin board');
-                } else {
-                    $url = '/res/'.$url;
-                }
-                if ($url =~ /\?/) {
-                    $url .= '&symb=';
+                    if ($url =~ /\?/) {
+                        $url .= '&symb=';
+                    } else {
+                        $url .= '?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 />');
+                    $totaldiscussions++;
                 } else {
-                    $url .= '?symb=';
+                    $r->print(' .');
                 }
-                $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 />');
-                $totaldiscussions++;
-            } else {
-                $r->print(' .');
             }
-        }
-        unless ($totaldiscussions) {
-            $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+            unless ($totaldiscussions) {
+                $r->print('<p>'.&mt('No matches found in postings').'.</p>');
+            }
+        } else {
+            $r->print('<div class="LC_error">'.&mt('An error occurred retrieving information about resources in the course.').'<br />'.&mt('It is recommended that you [_1]re-initialize the course[_2] and then try your search again.','<a href="/adm/roles">','</a>').'</div>');
         }
     }
  
@@ -679,7 +690,7 @@ sub print_basic_search_form {
     my $bread_crumb =
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Search_Basic',
 					    $env{'form.catalogmode'} ne 'import');
-    my $scrout = &Apache::loncommon::start_page('Search').$bread_crumb;
+    my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
 # Search form for resource space 
     if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {
         $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
@@ -693,7 +704,7 @@ sub print_basic_search_form {
 	 'note' => 'Enter terms or phrases, then press "Search" below',
 	 'use' => 'use related words',
 	 'full' =>'fulltext search (time consuming)',
-         'disc' => 'search discussion postings (resources and bulletin boards)',
+         'disc' => 'search discussion postings (resources and discussion boards)',
 					   );
         $scrout.=(<<ENDCOURSESEARCH);
 <form name="loncapa_search" method="post" action="/adm/searchcat">
@@ -751,19 +762,19 @@ sub setup_basic_search {
                        '</label>';
     $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
       &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain'))).
+                                       $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?'.
-                       'phase=disp_adv&'.
-                       'catalogmode='.$env{'form.catalogmode'}.
+	               &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" '.
@@ -788,10 +799,10 @@ sub setup_basic_search {
              '<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 />'.
+            '<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 />'.
              '</font></td>'.
             '</tr>'.$/;
     #
@@ -833,10 +844,21 @@ sub print_advanced_search_form{
 $closebutton
 END
     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();
     }
-    my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search");
+}
+</script>';
+    }
+    my $scrout= &Apache::loncommon::start_page("Advanced $srchtype Search",
+                                               $jscript);
     $scrout .= <<"ENDHEADER";
 $bread_crumb
 <form method="post" action="/adm/searchcat" name="advsearch">
@@ -847,7 +869,7 @@ ENDHEADER
         '<input type="hidden" name="phase" value="adv_search" />';
     my %fields=&Apache::lonmeta::fieldnames();
     #
-    $scrout .= '<h3>'.&mt('Standard [_1] Metadata',$srchtype).'</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";
@@ -878,7 +900,7 @@ ENDHEADER
                                           $env{'form.'.$field.'_related'},
                                           50);
         if ($related_word_search{$field}) {
-            $scrout .= 'related words';
+            $scrout .= &mt('related words');
         } else {
             $scrout .= '</td><td>&nbsp;';
         }
@@ -905,11 +927,6 @@ ENDHEADER
 	    &Apache::loncommon::domain_select('domains',
 						   $env{'form.domains'},1).
 						   '<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
@@ -936,33 +953,33 @@ ENDHEADER
     
     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>'.
-                   '<tr><td>'.&mt('1: ').
-                   '</td><td align="center">'.
-                   '<input type="text" name="addedfield_0" size="10" /></td>'.
-                   '<td align="center"><input type="text" '.
-                   'name="addedvalues_0" size="15" /></td></tr>';
-        for (my $j=1; $j<=$env{'form.numaddedfields'}; $j++) {
+                   &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" /></td>'.
+                       '" size="10" value="'.$env{'form.addedfield_'.$j}.
+                       '" /></td>'.
                        '<td align="center"><input type="text" '.
-                       'name="addedvalues_'.$j.'" size="15" /></td></tr>';
+                       'name="addedvalues_'.$j.'" size="15" value="'.
+                       $env{'form.addedvalues_'.$j}.'" /></td></tr>';
         }
-        my $numadded = 1 + $env{'form.numaddedfields'};
-        $scrout .= '<tr><td colspan="3">&nbsp;</td></tr>'.
-                   '<tr><td align="left" colspan="3">'.
-                   '<input type="button" name="newfield" '.
-                   'value="Additional custom field/value" '.
-                   'onclick="javascript:additional_metadata()" />'.
-                   '<input type="hidden" name="numaddedfelds" value="'.
-                   $numadded.'" /></td></tr></table>';
+        $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
@@ -976,7 +993,7 @@ ENDHEADER
                description=>'Network-wide number of accesses (hits)',},
              { name=>'stdno',
                description=>
-               'Total number of students who have worked on this problem',},
+               'Statistics calculated for number of students',},
              { name => 'avetries',
                description=>'Average number of tries till solved',},
              { name => 'difficulty',
@@ -1023,6 +1040,7 @@ ENDHEADER
     # Creation/Modification date limits
     $scrout .= '<h3>'.&mt('Creation and Modification dates').'</h3>';
     $scrout .= "\n<table>\n";
+    $scrout .= "<tr><td>&nbsp;</td><td>".&mt('Month[_1]Day[_2]Year','&nbsp;'x14,'&nbsp;'x6)."</td></tr>\n";
     my $cafter = 
         &Apache::lonhtmlcommon::date_setter('advsearch',         # formname
                                             'creationdate1', # fieldname
@@ -1041,10 +1059,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', 
@@ -1063,10 +1081,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
@@ -1141,7 +1159,7 @@ Outputs: text for box with view options
 ######################################################################
 ######################################################################
 sub viewoptions {
-    my $scrout;
+    my $scrout = '<span class="LC_nobreak">';
     if (! defined($env{'form.viewselect'})) { 
         $env{'form.viewselect'}='detailed'; 
     }
@@ -1154,8 +1172,9 @@ sub viewoptions {
                                                   $env{'form.show'},
                                                   undef,
                                                   (10,20,50,100,1000,10000));
-    $scrout .= ('&nbsp;'x2).&mt('[_1] Records per Page',$countselect).
-        '</nobr>'.$/;
+    $scrout .= ('&nbsp;'x2)
+              .&mt('[_1] Records per Page',$countselect)
+              .'</span>'.$/;
     return $scrout;
 }
 
@@ -1381,7 +1400,7 @@ 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.
@@ -1414,6 +1433,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);
@@ -1504,9 +1534,25 @@ sub parse_advanced_search {
         #
         # Added metadata fields
         for (my $i=0; $i<$env{'form.numaddedfields'} ; $i++) {
-            if (($env{'form.addedfield_'.$i} ne '') && 
-                ($env{'form.addedvalue_'.$i} ne '')) {
-                my $stuff = 1; #FIXME 
+            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 {
@@ -1599,7 +1645,7 @@ sub parse_advanced_search {
     #
     if (@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).'))';
+            $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 < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
         } else {
 	    $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
         }
@@ -1636,11 +1682,9 @@ sub parse_domain_restrictions {
         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);
@@ -1664,7 +1708,7 @@ sub parse_basic_search {
     #
     # Clean up fields for safety
     for my $field ('basicexp') {
-	$env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;
+	$env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1703,7 +1747,7 @@ sub parse_basic_search {
     #}
     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).')';
+        $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa  WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
     } else {
         $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     }
@@ -1819,7 +1863,7 @@ sub process_phrase_input {
             $item[1];
         }
     term:
-        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E]+/ {
+        /[\w\Q:!@#$%^&*()+_=|{}<>,.;\\\/?\E\-]+/ {
             $item[1];
         }
 ENDGRAMMAR
@@ -2079,6 +2123,10 @@ sub copyright_check {
         ($env{'user.domain'} ne $resdom)) {
         return 0;
     }
+    # Check for custom rights
+    if ($Metadata->{'copyright'} eq 'custom') {
+       return &Apache::lonnet::customaccess('bre',$Metadata->{'url'});
+    }
     return 1;
 }
 
@@ -2107,7 +2155,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;
     }
@@ -2117,7 +2165,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.");
@@ -2226,14 +2274,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;
 }
@@ -2405,13 +2450,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;
 }
@@ -2449,8 +2495,6 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post">
-<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2461,7 +2505,7 @@ END
         pop(@Lines);
     }
     if (@Lines > 2) {
-        $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
+        $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
     }
     $r->print(&mt("Search: [_1]",$pretty_string));
     $r->rflush();
@@ -2475,14 +2519,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;
@@ -2515,18 +2560,22 @@ END
     my $server; 
     my $status;
     my $revise = &revise_button();
-    $r->print(<<END);
-<table>
-<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
-<tr>
-<td><input type="text" name="status"  value="" size="50" /></td>
-<td><input type="text" name="count"   value="" size="10" /></td>
-<td><input type="text" name="seconds" value="" size="8" /></td>
-<td>$revise</td>
-</tr>
-</table>
-</form>
-END
+    $r->print('<form name="statusform" action="" method="post">'."\n".
+              '<input type="hidden" name="acts" value="" />'."\n".
+              '<table border="0"><tr><td>'."\n".
+              &Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Status').'</th>'
+             .'<th>'.&mt('Total Matches').'</th>'
+             .'<th>'.&mt('Time Remaining').'</th>'
+             .&Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::start_data_table_row()
+             .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'
+             .'<td><input type="text" name="count"   value="" size="10" readonly="readonly" /></td>'
+             .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+             .&Apache::loncommon::end_data_table_row()
+             .&Apache::loncommon::end_data_table()
+             .'</td><td>&nbsp;</td><td>'.$revise.'</td></tr></table></form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);
@@ -2598,8 +2647,6 @@ END
                     my %Fields = &parse_raw_result($result,$server,$tabletype);
                     $Fields{'hostname'} = $server;
                     #
-                    # Skip if external and we did not want that
-                    next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//));
                     # Skip based on copyright
                     next if (! &copyright_check(\%Fields));
 
@@ -2720,7 +2767,7 @@ sub display_results {
     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;
@@ -2853,7 +2900,7 @@ sub display_results {
     ## Output links (if necessary) for 'prev' and 'next' pages.
     $r->print
         ('<table width="100%"><tr><td width="25%" align="right">'.
-         '<nobr>'.$sortform.'</nobr>'.
+         '<span class="LC_nobreak">'.$sortform.'</span>'.
          '</td><td width="25%" align="right">'.
          &prev_next_buttons($min,$env{'form.show'},$total_results).
          '</td><td align="right">'.
@@ -2957,8 +3004,8 @@ 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
         }
@@ -2967,7 +3014,7 @@ END
         $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
@@ -3194,6 +3241,7 @@ function changeURL(val) {
 SCRIPT
         }
     }
+    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) {
@@ -3214,7 +3262,7 @@ SCRIPT
     }
     function select_group() {
 	parent.window.location=
-    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+
+    "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import$inhibit_menu&acts="+
 	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 </script>
@@ -3337,7 +3385,7 @@ sub detailed_citation_view {
     $jumpurl=~s|^/ext/|http://|;
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
-        '<a href="'.$jumpurl.'" '.
+        '<a href="'.$jumpurl.'?inhibitmenu=yes" '.
         'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
@@ -3404,11 +3452,8 @@ sub detailed_citation_view {
         if (exists($field->{'type'}) && $field->{'type'} eq 'list') {
             $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
-                $result .= 
-		  &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($item),
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
+                $item = &Apache::lonnet::clutter($item);
+                $result .= &display_url($item,[2,0,1]);
             }
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
@@ -3416,15 +3461,7 @@ sub detailed_citation_view {
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-               if ($jumpurl=~/^http\:\/\//) {
-                 $result.='<tt>'.$jumpurl.'</tt>';
-               } else {
-                 $result .=
-		  &Apache::lonhtmlcommon::crumbs($jumpurl,
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),3,0,1);
-               }
+                $result .= &display_url($jumpurl,[3,0,1]);
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3480,19 +3517,13 @@ sub summary_view {
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
     my $jumpurl=$values{'url'};
-    my $link;
-    if ($jumpurl=~m|^/ext/|) {
-	$jumpurl=~s|^/ext/|http://|;
-	$link='<br /><tt>'.$jumpurl.'</tt>';
-    } else {
-	$link=&Apache::lonhtmlcommon::crumbs($jumpurl,
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
-    }
+    $jumpurl=~s|^/ext/|http://|;
+    my $link = &display_url($jumpurl,[2,0,1]);
+
     $result.=<<END;
-<a href="$jumpurl" 
-   target='preview'>$values{'title'}</a>$link
+<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'}
@@ -3525,16 +3556,10 @@ sub summary_preview {
 sub compact_view {
     my ($prefix,%values) = @_;
     my $jumpurl=$values{'url'};
-    my $link;
-    if ($jumpurl=~m|^/ext/|) {
-	$jumpurl=~s|^/ext/|http://|;
-	$link='<tt>'.$jumpurl.'</tt>';
-    } else {
-        $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
-		  'preview',
-		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1,1,1).' ';
-    }
+    $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'}) && 
@@ -3543,12 +3568,30 @@ sub compact_view {
         if (! defined($tmp)) { $tmp = 'undefined'; }
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
-    $result.='&nbsp;<a href="'.$jumpurl.'" target="preview">'.
-        $values{'title'}.'</a>'.('&nbsp;'x2).$link.
-        '<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;
+}
 
 ######################################################################
 ######################################################################
@@ -3572,7 +3615,7 @@ sub fielded_format_view {
 $prefix <img src="$icon" />
 <dl>
 <dt>URL:</dt>
-    <dd><a href="$jumpurl" 
+    <dd><a href="$jumpurl?inhibitmenu=yes" 
          target='preview'>$values{'url'}</a></dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',