--- loncom/interface/lonsearchcat.pm 2009/07/31 17:58:16 1.314
+++ loncom/interface/lonsearchcat.pm 2010/05/03 16:41:51 1.321
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.314 2009/07/31 17:58:16 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.321 2010/05/03 16:41:51 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -118,8 +118,6 @@ sub handler {
# This is set and used in &handler() and is also used in
# &output_results().
- my $loaderror=&Apache::lonnet::overloaderror($r);
- if ($loaderror) { return $loaderror; }
#
my $closebutton; # button that closes the search window
# This button is different for the RAT compared to
@@ -268,23 +266,23 @@ sub handler {
if ($env{'form.catalogmode'} eq 'interactive') {
$closebutton="
+onclick='javascript:select_group()' />
END
} else {
$closebutton = '';
@@ -324,7 +322,7 @@ END
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
'&phase=disp_adv'.
- 'catalogmode='.$env{'form.catalogmode'}.
+ '&catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'},
text=>"Course Search",
@@ -492,7 +490,7 @@ sub course_search {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/searchcat?'.&Apache::loncommon::inhibit_menu_check().
'&phase=disp_adv'.
- 'catalogmode='.$env{'form.catalogmode'}.
+ '&catalogmode='.$env{'form.catalogmode'}.
'&launch='.$env{'form.launch'}.
'&mode='.$env{'form.mode'},
text=>"Course Search",
@@ -770,14 +768,26 @@ sub setup_basic_search {
portfolio => 'Portfolio Search',
);
my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
- $userelatedwords = '';
- $onlysearchdomain = '';
+
+ $userelatedwords = '';
+
+ $onlysearchdomain = '';
+
$adv_search_link = '\n";
} else {
if ($field->{'special'} eq 'url link') {
- $result .= &display_url($jumpurl,[3,0,1]);
+ $result .= '
'.&display_url($jumpurl,1).'
';
} else {
$result.= &mt($field->{'translate'},
$values{$field->{'name'}});
@@ -3603,7 +3613,7 @@ sub summary_view {
}
my $jumpurl=$values{'url'};
$jumpurl=~s|^/ext/|http://|;
- my $link = &display_url($jumpurl,[2,0,1]);
+ my $link = '
'.&display_url($jumpurl,1).'
';
$result.=<
'.$closebutton.'
$errormsg
$end_page ENDPAGE