--- loncom/interface/lonsearchcat.pm 2008/08/27 19:50:46 1.299
+++ loncom/interface/lonsearchcat.pm 2008/12/11 14:55:15 1.301
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.299 2008/08/27 19:50:46 raeburn Exp $
+# $Id: lonsearchcat.pm,v 1.301 2008/12/11 14:55:15 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -794,10 +794,10 @@ sub setup_basic_search {
'
'.
''.&searchhelp().''.''.
'
'.
- ''.(' 'x3).$adv_search_link.''.' '.
- ''.(' 'x1).$userelatedwords.''.' '.
- ''.(' 'x1).$onlysearchdomain.''.' '.
- ''.(' 'x1).$inclext.''.' '.
+ ''.(' 'x3).$adv_search_link.''.' '.
+ ''.(' 'x1).$userelatedwords.''.' '.
+ ''.(' 'x1).$onlysearchdomain.''.' '.
+ ''.(' 'x1).$inclext.''.' '.
' | '.
''.$/;
#
@@ -1167,8 +1167,10 @@ sub viewoptions {
$env{'form.show'},
undef,
(10,20,50,100,1000,10000));
- $scrout .= (' 'x2).&mt('[_1] Records per Page',$countselect).
- ''.$/;
+ $scrout .= (' 'x2)
+ .''
+ .&mt('[_1] Records per Page',$countselect)
+ .''.$/;
return $scrout;
}
@@ -1394,7 +1396,7 @@ sub parse_advanced_search {
'lastrevisiondatestart_month','lastrevisiondatestart_day',
'lastrevisiondatestart_year','lastrevisiondateend_month',
'lastrevisiondateend_day','lastrevisiondateend_year') {
- $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
+ $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.\*]//g;
}
foreach ('mode','form','element') {
# is this required? Hmmm.
@@ -1639,7 +1641,7 @@ sub parse_advanced_search {
#
if (@queries) {
if ($env{'form.area'} eq 'portfolio') {
- $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))';
+ $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
} else {
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
}
@@ -1702,7 +1704,7 @@ sub parse_basic_search {
#
# Clean up fields for safety
for my $field ('basicexp') {
- $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;
+ $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
}
foreach ('mode','form','element') {
# is this required? Hmmm.
@@ -1741,7 +1743,7 @@ sub parse_basic_search {
#}
my $final_query;
if ($env{'form.area'} eq 'portfolio') {
- $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND '.join(" AND ",@Queries).')';
+ $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
} else {
$final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
}
@@ -2894,7 +2896,7 @@ sub display_results {
## Output links (if necessary) for 'prev' and 'next' pages.
$r->print
(''.
- ''.$sortform.''.
+ ''.$sortform.''.
' | '.
&prev_next_buttons($min,$env{'form.show'},$total_results).
' | '.
|