version 1.238, 2005/02/17 08:29:43
|
version 1.239, 2005/03/16 22:46:24
|
Line 1535 sub parse_advanced_search {
|
Line 1535 sub parse_advanced_search {
|
## |
## |
## Deal with restrictions to given domains |
## Deal with restrictions to given domains |
## |
## |
my ($libraries_to_query,$pretty_domains_string) = |
my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) = |
&parse_domain_restrictions(); |
&parse_domain_restrictions(); |
|
push(@queries,$domain_sql_restriction); |
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
$pretty_search_string .= $pretty_domains_string."<br />\n"; |
# |
# |
if (@queries) { |
if (@queries) { |
Line 1544 sub parse_advanced_search {
|
Line 1545 sub parse_advanced_search {
|
} elsif ($customquery) { |
} elsif ($customquery) { |
$query = ''; |
$query = ''; |
} |
} |
# &Apache::lonnet::logthis('query = '.$/.$query); |
&Apache::lonnet::logthis('advanced query = '.$/.$query); |
return ($query,$customquery,$customshow,$libraries_to_query, |
return ($query,$customquery,$customshow,$libraries_to_query, |
$pretty_search_string); |
$pretty_search_string); |
} |
} |
Line 1565 sub parse_domain_restrictions {
|
Line 1566 sub parse_domain_restrictions {
|
# |
# |
my %domain_hash = (); |
my %domain_hash = (); |
my $pretty_domains_string; |
my $pretty_domains_string; |
|
my $domain_sql_restriction; |
foreach (@allowed_domains) { |
foreach (@allowed_domains) { |
$domain_hash{$_}++; |
$domain_hash{$_}++; |
} |
} |
if ($domain_hash{'any'}) { |
if ($domain_hash{'any'}) { |
$pretty_domains_string = "In all LON-CAPA domains."; |
$pretty_domains_string = "In all LON-CAPA domains."; |
|
$domain_sql_restriction = undef; |
} else { |
} else { |
if (@allowed_domains > 1) { |
if (@allowed_domains > 1) { |
$pretty_domains_string = "In LON-CAPA domains:"; |
$pretty_domains_string = "In LON-CAPA domains:"; |
} else { |
} else { |
$pretty_domains_string = "In LON-CAPA domain "; |
$pretty_domains_string = "In LON-CAPA domain "; |
} |
} |
|
$domain_sql_restriction = |
|
'(domain="'.join('" OR domain="',@allowed_domains).'")'; |
foreach (sort @allowed_domains) { |
foreach (sort @allowed_domains) { |
$pretty_domains_string .= "<b>".$_."</b> "; |
$pretty_domains_string .= "<b>".$_."</b> "; |
} |
} |
Line 1585 sub parse_domain_restrictions {
|
Line 1590 sub parse_domain_restrictions {
|
} |
} |
} |
} |
} |
} |
return ($libraries_to_query,$pretty_domains_string); |
return ($libraries_to_query, |
|
$pretty_domains_string, |
|
$domain_sql_restriction); |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 1614 sub parse_basic_search {
|
Line 1621 sub parse_basic_search {
|
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"}); |
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"}); |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
my ($libraries_to_query,$pretty_domains_string) = |
my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) = |
&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 |
Line 1638 sub parse_basic_search {
|
Line 1645 sub parse_basic_search {
|
return; |
return; |
} |
} |
push(@Queries,$SQLQuery); |
push(@Queries,$SQLQuery); |
|
push(@Queries,$domain_sql_restriction); |
#foreach my $q (@Queries) { |
#foreach my $q (@Queries) { |
# &Apache::lonnet::logthis(' '.$q); |
# &Apache::lonnet::logthis(' '.$q); |
#} |
#} |
Line 1648 sub parse_basic_search {
|
Line 1656 sub parse_basic_search {
|
} |
} |
$pretty_search_string .= "<br />\n"; |
$pretty_search_string .= "<br />\n"; |
$pretty_search_string =~ s:^<br /> and ::; |
$pretty_search_string =~ s:^<br /> and ::; |
# &Apache::lonnet::logthis($final_query); |
&Apache::lonnet::logthis('simple search final query = '.$/.$final_query); |
return ($final_query,$pretty_search_string, |
return ($final_query,$pretty_search_string, |
$libraries_to_query); |
$libraries_to_query); |
} |
} |
Line 3384 $prefix <img src="$icon" />
|
Line 3392 $prefix <img src="$icon" />
|
<dd><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
<dd><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" |
target='search_preview'>$values{'url'}</a></dd> |
target='search_preview'>$values{'url'}</a></dd> |
END |
END |
foreach my $field ('title','author','subject','keywords','notes', |
foreach my $field ('title','author','domain','subject','keywords','notes', |
'mimetag','language','creationdate','lastrevisiondate', |
'mimetag','language','creationdate','lastrevisiondate', |
'owner','copyrighttag','hostname','abstract') { |
'owner','copyrighttag','hostname','abstract') { |
$result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n". |
$result .= (' 'x4).'<dt>'.$Translated{$field}.'</dt>'."\n". |
Line 3425 sub xml_sgml_view {
|
Line 3433 sub xml_sgml_view {
|
my ($prefix,%values) = @_; |
my ($prefix,%values) = @_; |
my $xml = '<LonCapaResource>'."\n"; |
my $xml = '<LonCapaResource>'."\n"; |
# The usual suspects |
# The usual suspects |
foreach my $field ('url','title','author','subject','keywords','notes') { |
foreach my $field ('url','title','author','subject','keywords','notes','domain') { |
$xml .= qq{<$field>$values{$field}</$field>}."\n"; |
$xml .= qq{<$field>$values{$field}</$field>}."\n"; |
} |
} |
# |
# |