version 1.218, 2004/04/27 15:45:04
|
version 1.220, 2004/05/03 19:24:14
|
Line 286 END
|
Line 286 END
|
$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'})); |
# |
# |
$ENV{'form.searchmode'} = 'basic'; |
$ENV{'form.searchmode'} = 'basic' if (! exists($ENV{'form.searchmode'})); |
if ($ENV{'form.phase'} eq 'adv_search' || |
if ($ENV{'form.phase'} eq 'adv_search' || |
$ENV{'form.phase'} eq 'disp_adv') { |
$ENV{'form.phase'} eq 'disp_adv') { |
$ENV{'form.searchmode'} = 'advanced'; |
$ENV{'form.searchmode'} = 'advanced'; |
Line 1161 sub parse_advanced_search {
|
Line 1161 sub parse_advanced_search {
|
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondatestart_year','lastrevisiondateend_month', |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
'lastrevisiondateend_day','lastrevisiondateend_year') { |
$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
|
$ENV{'form.'.$field}=~s/(not\s*$|^\s*(and|or)|)//gi; |
} |
} |
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
Line 1425 sub parse_basic_search {
|
Line 1426 sub parse_basic_search {
|
&parse_domain_restrictions(); |
&parse_domain_restrictions(); |
# |
# |
# Check to see if enough of a query is filled in |
# Check to see if enough of a query is filled in |
unless (&filled($ENV{'form.basicexp'})) { |
my $search_string = $ENV{'form.basicexp'}; |
|
$search_string =~ s/(not\s*$|^\s*(and|or)|)//gi; |
|
if (! &filled($search_string)) { |
&output_blank_field_error($r,$closebutton,'phase=disp_basic'); |
&output_blank_field_error($r,$closebutton,'phase=disp_basic'); |
return OK; |
return OK; |
} |
} |
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>'; |
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>'; |
my $search_string = $ENV{'form.basicexp'}; |
|
if ($ENV{'form.related'}) { |
if ($ENV{'form.related'}) { |
my @New_Words; |
my @New_Words; |
($search_string,@New_Words) = &related_version($ENV{'form.basicexp'}); |
($search_string,@New_Words) = &related_version($ENV{'form.basicexp'}); |