version 1.264, 2006/05/12 16:45:41
|
version 1.266, 2006/06/08 07:20:41
|
Line 78 use HTML::Entities();
|
Line 78 use HTML::Entities();
|
use Parse::RecDescent; |
use Parse::RecDescent; |
use Apache::lonnavmaps; |
use Apache::lonnavmaps; |
use Apache::lonindexer(); |
use Apache::lonindexer(); |
|
use lib '/home/httpd/lib/perl/'; |
|
use LONCAPA; |
|
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
Line 153 sub handler {
|
Line 155 sub handler {
|
## |
## |
my $domain = $r->dir_config('lonDefDomain'); |
my $domain = $r->dir_config('lonDefDomain'); |
$diropendb= "/home/httpd/perl/tmp/". |
$diropendb= "/home/httpd/perl/tmp/". |
"$env{'user.domain'}_$env{'user.name'}_searchcat.db"; |
"$env{'user.domain'}_$env{'user.name'}_sel_res.db"; |
# |
# |
# set the name of the persistent database |
# set the name of the persistent database |
# $env{'form.persistent_db_id'} can only have digits in it. |
# $env{'form.persistent_db_id'} can only have digits in it. |
Line 164 sub handler {
|
Line 166 sub handler {
|
} |
} |
|
|
my $persistent_db_file = "/home/httpd/perl/tmp/". |
my $persistent_db_file = "/home/httpd/perl/tmp/". |
&Apache::lonnet::escape($domain). |
&escape($domain). |
'_'.&Apache::lonnet::escape($env{'user.name'}). |
'_'.&escape($env{'user.name'}). |
'_'.$env{'form.persistent_db_id'}.'_persistent_search.db'; |
'_'.$env{'form.persistent_db_id'}.'_persistent_search.db'; |
## |
## |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
Line 551 sub course_search {
|
Line 553 sub course_search {
|
} else { |
} else { |
$url .= '?symb='; |
$url .= '?symb='; |
} |
} |
$url .= &Apache::lonnet::escape($resource->symb()); |
$url .= &escape($resource->symb()); |
my $title = $resource->compTitle(); |
my $title = $resource->compTitle(); |
$r->print('<br /><a href="'.$url.'" target="cat">'. |
$r->print('<br /><a href="'.$url.'" target="cat">'. |
($title?$title:$url).'</a> - '.$disctype.'<br />'); |
($title?$title:$url).'</a> - '.$disctype.'<br />'); |
Line 587 sub checkonthis {
|
Line 589 sub checkonthis {
|
my ($extension)=($url=~/\.(\w+)$/); |
my ($extension)=($url=~/\.(\w+)$/); |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' && |
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi' && |
($url) && ($fulltext)) { |
($url) && ($fulltext)) { |
$result.=&Apache::lonnet::ssi_body($url.'?symb='.&Apache::lonnet::escape($symb)); |
$result.=&Apache::lonnet::ssi_body($url.'?symb='.&escape($symb)); |
} |
} |
$result=~s/\s+/ /gs; |
$result=~s/\s+/ /gs; |
my $applies = 0; |
my $applies = 0; |
Line 603 sub checkonthis {
|
Line 605 sub checkonthis {
|
$href=&Apache::lonenc::encrypted($href) |
$href=&Apache::lonenc::encrypted($href) |
.'?symb='.&Apache::lonenc::encrypted($symb); |
.'?symb='.&Apache::lonenc::encrypted($symb); |
} else { |
} else { |
$href.='?symb='.&Apache::lonnet::escape($symb); |
$href.='?symb='.&escape($symb); |
} |
} |
$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url). |
$r->print('<a href="'.$href.'" target="cat">'.($title?$title:$url). |
'</a><br />'); |
'</a><br />'); |
Line 1147 sub get_persistent_form_data {
|
Line 1149 sub get_persistent_form_data {
|
# End kludge (hopefully) |
# End kludge (hopefully) |
next if (exists($env{$name})); |
next if (exists($env{$name})); |
my @values = map { |
my @values = map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} split(',',$persistent_db{$name}); |
} split(',',$persistent_db{$name}); |
next if (@values <1); |
next if (@values <1); |
if ($arrays_allowed{$name}) { |
if ($arrays_allowed{$name}) { |
Line 1193 sub get_persistent_data {
|
Line 1195 sub get_persistent_data {
|
next; |
next; |
} |
} |
my @values = map { |
my @values = map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} split(',',$persistent_db{$name}); |
} split(',',$persistent_db{$name}); |
if (@values <= 1) { |
if (@values <= 1) { |
push @Values,$values[0]; |
push @Values,$values[0]; |
Line 1230 sub make_persistent {
|
Line 1232 sub make_persistent {
|
foreach my $name (keys(%save)) { |
foreach my $name (keys(%save)) { |
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name})); |
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name})); |
# We handle array references, but not recursively. |
# We handle array references, but not recursively. |
my $store = join(',', map { &Apache::lonnet::escape($_); } @values ); |
my $store = join(',', map { &escape($_); } @values ); |
$persistent_db{$name} = $store; |
$persistent_db{$name} = $store; |
} |
} |
untie(%persistent_db); |
untie(%persistent_db); |
Line 1313 sub parse_advanced_search {
|
Line 1315 sub parse_advanced_search {
|
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
next if (! exists($env{'form.'.$_})); |
next if (! exists($env{'form.'.$_})); |
$env{'form.'.$_}=&Apache::lonnet::unescape($env{'form.'.$_}); |
$env{'form.'.$_}=&unescape($env{'form.'.$_}); |
$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$env{'form.'.$_}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
# Preprocess the category form element. |
# Preprocess the category form element. |
Line 1581 sub parse_basic_search {
|
Line 1583 sub parse_basic_search {
|
foreach ('mode','form','element') { |
foreach ('mode','form','element') { |
# is this required? Hmmm. |
# is this required? Hmmm. |
next unless (exists($env{"form.$_"})); |
next unless (exists($env{"form.$_"})); |
$env{"form.$_"}=&Apache::lonnet::unescape($env{"form.$_"}); |
$env{"form.$_"}=&unescape($env{"form.$_"}); |
$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
$env{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g; |
} |
} |
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); |
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions(); |
Line 2855 sub parse_row {
|
Line 2857 sub parse_row {
|
&set_up_table_structure(); |
&set_up_table_structure(); |
} |
} |
for (my $i=0;$i<=$#Row;$i++) { |
for (my $i=0;$i<=$#Row;$i++) { |
$Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]); |
$Fields{$Datatypes[$i]->{'name'}}=&unescape($Row[$i]); |
} |
} |
$Fields{'language'} = |
$Fields{'language'} = |
&Apache::loncommon::languagedescription($Fields{'language'}); |
&Apache::loncommon::languagedescription($Fields{'language'}); |
Line 2892 sub parse_raw_result {
|
Line 2894 sub parse_raw_result {
|
# conclude from self to others regarding fields |
# conclude from self to others regarding fields |
my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash |
my %Fields=&LONCAPA::lonmetadata::metadata_col_to_hash |
(map { |
(map { |
&Apache::lonnet::unescape($_); |
&unescape($_); |
} (split(/\,/,$result)) ); |
} (split(/\,/,$result)) ); |
return %Fields; |
return %Fields; |
} |
} |
Line 2930 sub handle_custom_fields {
|
Line 2932 sub handle_custom_fields {
|
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
my $tmp=$result; |
my $tmp=$result; |
$tmp=~s/^custom\=//; |
$tmp=~s/^custom\=//; |
my ($k,$v)=map {&Apache::lonnet::unescape($_); |
my ($k,$v)=map {&unescape($_); |
} split(/\,/,$tmp); |
} split(/\,/,$tmp); |
$customhash{$k}=$v; |
$customhash{$k}=$v; |
} |
} |