X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fsearch.html;h=7f72435882ca3ea12404a549ac200c19188a7253;hp=b14bded1058bd43393180202de5ab5a8f94d9635;hb=d453a487d95258e1f11f134fc5864f7e6458a6ef;hpb=7bdf17a005cf4c0fe8b6b6ad1ce97abaa52a4510 diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index b14bded10..7f7243588 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -68,6 +68,8 @@ # # or a coderef that returns the same # 'redirect' => + my $DEBUG = 0; + my(%opt) = @_; #warn join(' / ', map { "$_ => $opt{$_}" } keys %opt ). "\n"; @@ -118,6 +120,7 @@ my $header = $opt{'header'}; my $rows; if ( ref($opt{'query'}) ) { + #eval "use FS::$opt{'query'};"; $rows = [ qsearch( $opt{'query'}->{'table'}, @@ -127,7 +130,9 @@ '', (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '') ) ]; + } else { + 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}; + } + 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 @@ -437,7 +449,7 @@ <% } %> <% } else { %> <% foreach ( @$row ) { %> - <%= $_ %> + <%= $_ %> <% } %> <% } %>