--- loncom/interface/lonsearchcat.pm 2007/07/11 20:32:15 1.288 +++ loncom/interface/lonsearchcat.pm 2008/05/28 21:07:29 1.293 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.288 2007/07/11 20:32:15 albertel Exp $ +# $Id: lonsearchcat.pm,v 1.293 2008/05/28 21:07:29 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -266,7 +266,7 @@ sub handler { ## Configure dynamic components of interface ## if ($env{'form.catalogmode'} eq 'interactive') { - $closebutton="dir_config('lonDefDomain')), $r->dir_config('lonDefDomain')). ''; - if ($area eq 'res') { - $inclext= ''; - } $adv_search_link = ''; my %fields=&Apache::lonmeta::fieldnames(); # - $scrout .= '
'. (' 'x2).&searchhelp()." | ';
}
@@ -926,11 +921,6 @@ ENDHEADER
&Apache::loncommon::domain_select('domains',
$env{'form.domains'},1).
' ' - } $scrout .= ' | '.$/;
#
# Misc metadata
@@ -1044,6 +1034,7 @@ ENDHEADER
# Creation/Modification date limits
$scrout .= '
".&mt('Month[_1]Day[_2]Year',' 'x14,' 'x6)." | |
Created between | '. - '[_1] |
and | '. - '[_2] |
'.&mt('Created between').' | ' + .''.$cafter.' |
'.&mt('and').' | ' + .''.$cbefore.' |
Last modified between | '. - '[_1] |
and | '. - '[_2] |
'.&mt('Last modified between').' | ' + .''.$lafter.' |
'.&mt('and').' | ' + .''.$lbefore.' |
-Search: $pretty_query_string -
- -END + $result.='' + .&mt('There are [_1] matches to your query.',$total_results) + .' '.$revise.'
' + .''.&mt('Search: ').$pretty_query_string + .'
'; $r->print($result.&Apache::loncommon::end_page()); return; } @@ -2451,13 +2439,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{ }; return $result; } @@ -2645,8 +2634,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 (! ©right_check(\%Fields));