version 1.247, 2005/11/26 02:42:45
|
version 1.248, 2005/11/29 20:25:44
|
Line 283 END
|
Line 283 END
|
## Sanity checks on form elements |
## Sanity checks on form elements |
## |
## |
if (!defined($env{'form.viewselect'})) { |
if (!defined($env{'form.viewselect'})) { |
if (($env{'form.catalogmode'} eq 'groupsearch') || |
$env{'form.viewselect'} ="summary"; |
($env{'form.catalogmode'} eq 'interactive')) { |
|
$env{'form.viewselect'} ="Compact View"; |
|
} else { |
|
$env{'form.viewselect'} ="Detailed Citation View"; |
|
} |
|
} |
} |
$env{'form.phase'} = 'disp_basic' if (! exists($env{'form.phase'})); |
$env{'form.phase'} = 'disp_basic' if (! exists($env{'form.phase'})); |
$env{'form.show'} = 20 if (! exists($env{'form.show'})); |
$env{'form.show'} = 20 if (! exists($env{'form.show'})); |
Line 708 sub print_basic_search_form {
|
Line 703 sub print_basic_search_form {
|
), |
), |
$r->dir_config('lonDefDomain') |
$r->dir_config('lonDefDomain') |
).'</label>'; |
).'</label>'; |
|
my $inclext= '<label>'. |
|
&mt('[_1] include external resources', |
|
&Apache::lonhtmlcommon::checkbox |
|
('inclext',$env{'form.inclext'})).'</label>'; |
my $adv_search_link = |
my $adv_search_link = |
'<a href="/adm/searchcat?'. |
'<a href="/adm/searchcat?'. |
'phase=disp_adv&'. |
'phase=disp_adv&'. |
Line 740 sub print_basic_search_form {
|
Line 739 sub print_basic_search_form {
|
'<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'. |
'<nobr>'.(' 'x3).$adv_search_link.'</nobr>'.'<br />'. |
'<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'. |
'<nobr>'.(' 'x1).$userelatedwords.'</nobr>'.'<br />'. |
'<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'. |
'<nobr>'.(' 'x1).$onlysearchdomain.'</nobr>'.'<br />'. |
'</font></td>'. |
'<nobr>'.(' 'x1).$inclext.'</nobr>'.'<br />'. |
|
'</font></td>'. |
'</tr>'.$/; |
'</tr>'.$/; |
# |
# |
$scrout .= '<tr><td align="center" colspan="2">'. |
$scrout .= '<tr><td align="center" colspan="2">'. |
Line 902 ENDHEADER
|
Line 902 ENDHEADER
|
&titlefield(&mt('Domains')).'</td><td colspan="2">'. |
&titlefield(&mt('Domains')).'</td><td colspan="2">'. |
&Apache::loncommon::domain_select('domains', |
&Apache::loncommon::domain_select('domains', |
$env{'form.domains'},1). |
$env{'form.domains'},1). |
'</td></tr>'.$/; |
'<br /><label>'. |
|
&mt('[_1] include external resources', |
|
&Apache::lonhtmlcommon::checkbox |
|
('inclext',$env{'form.inclext'})).'</label></td></tr>'.$/; |
# |
# |
# Misc metadata |
# Misc metadata |
$scrout.='<tr><td align="right" valign="top">'. |
$scrout.='<tr><td align="right" valign="top">'. |
Line 2522 END
|
Line 2525 END
|
my %Fields = &parse_raw_result($result,$server); |
my %Fields = &parse_raw_result($result,$server); |
$Fields{'hostname'} = $server; |
$Fields{'hostname'} = $server; |
# |
# |
|
# Skip if external and we did not want that |
|
next if ((! $env{'form.inclext'}) && ($Fields{'url'}=~/^\/ext\//)); |
# Skip based on copyright |
# Skip based on copyright |
next if (! ©right_check(\%Fields)); |
next if (! ©right_check(\%Fields)); |
|
|
# |
# |
# Store the result in the mysql database |
# Store the result in the mysql database |
my $result = &Apache::lonmysql::store_row($table,\%Fields); |
my $result = &Apache::lonmysql::store_row($table,\%Fields); |
Line 2725 sub display_results {
|
Line 2731 sub display_results {
|
} |
} |
my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields; |
my %sort_fields = map {$_->{'key'},$_->{'desc'}} @fields; |
$sort_fields{'select_form_order'} = \@field_order; |
$sort_fields{'select_form_order'} = \@field_order; |
$env{'form.sortorder'} = 'asc' if (! exists($env{'form.sortorder'})); |
$env{'form.sortorder'} = 'desc' if (! exists($env{'form.sortorder'})); |
|
$env{'form.sortfield'} = 'count' if (! exists($env{'form.sortfield'})); |
|
if (! exists($env{'form.sortorder'})) { |
|
if ($env{'form.sortfield'}=~/^(count|stdno|disc|clear|technical|correct|helpful)$/) { |
|
$env{'form.sortorder'}='desc'; |
|
} else { |
|
$env{'form.sortorder'}='asc'; |
|
} |
|
} |
my $sortform = &mt('Sort by [_1] [_2]', |
my $sortform = &mt('Sort by [_1] [_2]', |
&Apache::loncommon::select_form($env{'form.sortfield'}, |
&Apache::loncommon::select_form($env{'form.sortfield'}, |
'sortfield', |
'sortfield', |