version 1.180, 2007/08/31 03:21:27
|
version 1.181, 2007/08/31 12:33:32
|
Line 699 ENDFORMINFO
|
Line 699 ENDFORMINFO
|
if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) { |
if (($instsrch->{'srchterm'} ne '') && ($instsrch->{'srchdomain'} ne '')) { |
$newuser = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'}; |
$newuser = $instsrch->{'srchterm'}.':'.$instsrch->{'srchdomain'}; |
} |
} |
my (%dirsrch_results,%inst_results); |
my (%dirsrch_results,%inst_results,$dirsrchres); |
if ($newuser) { |
if ($newuser) { |
if (&directorysrch_check($instsrch) eq 'ok') { |
if (&directorysrch_check($instsrch) eq 'ok') { |
%dirsrch_results = &Apache::lonnet::inst_directory_query($instsrch); |
($dirsrchres,%dirsrch_results) = &Apache::lonnet::inst_directory_query($instsrch); |
if (ref($dirsrch_results{$newuser}) eq 'HASH') { |
if ($dirsrchres eq 'ok') { |
%inst_results = %{$dirsrch_results{$newuser}}; |
if (ref($dirsrch_results{$newuser}) eq 'HASH') { |
|
%inst_results = %{$dirsrch_results{$newuser}}; |
|
} |
} |
} |
} |
} |
} |
} |
Line 2211 sub user_search_result {
|
Line 2213 sub user_search_result {
|
my %allhomes; |
my %allhomes; |
my %inst_matches; |
my %inst_matches; |
my %srch_results; |
my %srch_results; |
my ($response,$currstate,$forcenewuser); |
my ($response,$currstate,$forcenewuser,$dirsrchres); |
$srch->{'srchterm'} =~ s/^\s+//; |
$srch->{'srchterm'} =~ s/^\s+//; |
$srch->{'srchterm'} =~ s/\s+$//; |
$srch->{'srchterm'} =~ s/\s+$//; |
|
|
Line 2324 sub user_search_result {
|
Line 2326 sub user_search_result {
|
} elsif ($srch->{'srchin'} eq 'alc') { |
} elsif ($srch->{'srchin'} eq 'alc') { |
$currstate = 'query'; |
$currstate = 'query'; |
} elsif ($srch->{'srchin'} eq 'instd') { |
} elsif ($srch->{'srchin'} eq 'instd') { |
%srch_results = &Apache::lonnet::inst_directory_query($srch); |
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
($currstate,$response,$forcenewuser) = |
if ($dirsrchres eq 'ok') { |
&build_search_response($srch,%srch_results); |
($currstate,$response,$forcenewuser) = |
|
&build_search_response($srch,%srch_results); |
|
} else { |
|
my $showdom = &display_domain_info($srch->{'srchdomain'}); |
|
$response = '<span class="LC_warning">'. |
|
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
|
'</span><br />'. |
|
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
|
'<br /><br />'; |
|
} |
} |
} |
} else { |
} else { |
if ($srch->{'srchin'} eq 'dom') { |
if ($srch->{'srchin'} eq 'dom') { |
Line 2388 sub user_search_result {
|
Line 2399 sub user_search_result {
|
} elsif ($srch->{'srchin'} eq 'alc') { |
} elsif ($srch->{'srchin'} eq 'alc') { |
$currstate = 'query'; |
$currstate = 'query'; |
} elsif ($srch->{'srchin'} eq 'instd') { |
} elsif ($srch->{'srchin'} eq 'instd') { |
%srch_results = &Apache::lonnet::inst_directory_query($srch); |
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
($currstate,$response,$forcenewuser) = |
if ($dirsrchres eq 'ok') { |
&build_search_response($srch,%srch_results); |
($currstate,$response,$forcenewuser) = |
|
&build_search_response($srch,%srch_results); |
|
} else { |
|
my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'. |
|
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
|
'</span><br />'. |
|
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
|
'<br /><br />'; |
|
} |
} |
} |
} |
} |
return ($currstate,$response,$forcenewuser,\%srch_results); |
return ($currstate,$response,$forcenewuser,\%srch_results); |