--- loncom/interface/lonsearchcat.pm	2008/03/18 22:51:57	1.292
+++ loncom/interface/lonsearchcat.pm	2008/08/04 15:28:21	1.297
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.292 2008/03/18 22:51:57 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.297 2008/08/04 15:28:21 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,8 +281,9 @@ sub handler {
             $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 {
@@ -759,11 +760,6 @@ sub setup_basic_search {
                                        $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'.
@@ -926,11 +922,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
@@ -2126,6 +2117,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;
 }
 
@@ -2561,9 +2556,12 @@ END
     my $server; 
     my $status;
     my $revise = &revise_button();
+    my $txt_total = &mt('Total Matches');
+    my $txt_remain = &mt('Time Remaining');
+    my $txt_status = &mt('Status');
     $r->print(<<END);
 <table>
-<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
+<tr><th>$txt_status</th><th>$txt_total</th><th>$txt_remain</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>
@@ -2644,8 +2642,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));