projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zip code report
[freeside.git]
/
httemplate
/
search
/
elements
/
search.html
diff --git
a/httemplate/search/elements/search.html
b/httemplate/search/elements/search.html
index
b14bded
..
7f72435
100644
(file)
--- a/
httemplate/search/elements/search.html
+++ b/
httemplate/search/elements/search.html
@@
-68,6
+68,8
@@
# # or a coderef that returns the same
# 'redirect' =>
# # or a coderef that returns the same
# 'redirect' =>
+ my $DEBUG = 0;
+
my(%opt) = @_;
#warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
my(%opt) = @_;
#warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n";
@@
-118,6
+120,7
@@
my $header = $opt{'header'};
my $rows;
if ( ref($opt{'query'}) ) {
my $header = $opt{'header'};
my $rows;
if ( ref($opt{'query'}) ) {
+
#eval "use FS::$opt{'query'};";
$rows = [ qsearch(
$opt{'query'}->{'table'},
#eval "use FS::$opt{'query'};";
$rows = [ qsearch(
$opt{'query'}->{'table'},
@@
-127,7
+130,9
@@
'',
(exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
) ];
'',
(exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
) ];
+
} else {
} else {
+
my $sth = dbh->prepare("$opt{'query'} $limit")
or die "Error preparing $opt{'query'}: ". dbh->errstr;
$sth->execute
my $sth = dbh->prepare("$opt{'query'} $limit")
or die "Error preparing $opt{'query'}: ". dbh->errstr;
$sth->execute
@@
-137,8
+142,15
@@
$rows = $sth->fetchall_arrayref;
$header ||= $sth->{NAME};
$rows = $sth->fetchall_arrayref;
$header ||= $sth->{NAME};
+
}
}
+ warn scalar(@$rows). ' rows returned from '.
+ ( ref($opt{'query'}) ? 'qsearch query' : 'literal SQL query' )
+ if $DEBUG || $opt{'debug'};
+
+ # display the results - csv, xls or html
+
if ( $type eq 'csv' ) {
#http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
if ( $type eq 'csv' ) {
#http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes
@@
-437,7
+449,7
@@
<% } %>
<% } else { %>
<% foreach ( @$row ) { %>
<% } %>
<% } else { %>
<% foreach ( @$row ) { %>
- <TD CLASS="grid" BGCOLOR="
$bgcolor
"><%= $_ %></TD>
+ <TD CLASS="grid" BGCOLOR="
<%= $bgcolor %>
"><%= $_ %></TD>
<% } %>
<% } %>
</TR>
<% } %>
<% } %>
</TR>