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

[www]

www		Wed May 28 17:07:32 2008 EDT

  Modified files:              
    /loncom	production_dns_domain.tab production_dns_hosts.tab 
    /loncom/interface	lonsearchcat.pm 
  Log:
  NSDL is dead.
  
  
Index: loncom/production_dns_domain.tab
diff -u loncom/production_dns_domain.tab:1.32 loncom/production_dns_domain.tab:1.33
--- loncom/production_dns_domain.tab:1.32	Tue May 20 11:50:47 2008
+++ loncom/production_dns_domain.tab	Wed May 28 17:07:11 2008
@@ -164,5 +164,4 @@
 cgabc:Certified General Accountants Association of BC:::en-CA::::cgabcl1
 
 #Gateway
-nsdl:NSDL Gateway:::::::nsdll1
 msudemo:Demo Machine:krb4:MSU.EDU:en-US:East Lansing, MI:-84.483:42.737:msudemol1
Index: loncom/production_dns_hosts.tab
diff -u loncom/production_dns_hosts.tab:1.32 loncom/production_dns_hosts.tab:1.33
--- loncom/production_dns_hosts.tab:1.32	Tue May 20 11:50:47 2008
+++ loncom/production_dns_hosts.tab	Wed May 28 17:07:11 2008
@@ -209,5 +209,4 @@
 authora1:author:access:a1.educog.com
 
 #Gateways 
-nsdll1:nsdl:library:nsdl.lon-capa.org
 msudemol1:msudemo:library:s14.lite.msu.edu
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.292 loncom/interface/lonsearchcat.pm:1.293
--- loncom/interface/lonsearchcat.pm:1.292	Tue Mar 18 18:51:57 2008
+++ loncom/interface/lonsearchcat.pm	Wed May 28 17:07:29 2008
@@ -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.293 2008/05/28 21:07:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -759,11 +759,6 @@
                                        $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 +921,6 @@
 	    &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
@@ -2644,8 +2634,6 @@
                     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));