X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsql.html;h=54d6c2d798cc5e6652c92e4b8f63a1be3db8149b;hp=5f64ebc2860a12085b848199894442f4dd911be5;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1

diff --git a/httemplate/search/sql.html b/httemplate/search/sql.html
index 5f64ebc28..54d6c2d79 100644
--- a/httemplate/search/sql.html
+++ b/httemplate/search/sql.html
@@ -1,13 +1,18 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                'title' => 'Query Results',
                'name'  => 'rows',
-               'query' => 'SELECT '. ( $cgi->param('sql')
-                                       || eidiot('Empty query') ),
-    )
-%>
+               'query' => "SELECT $sql",
+               'count_query' => $count,          
+&>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Raw SQL');
 
+my $sql = $cgi->param('sql') or errorpage('Empty query');
+$sql =~ s/;+\s*$//; #remove trailing ;
+
+my $count = $sql;
+$count =~ s/.* FROM /SELECT COUNT(*) FROM /i;
+
 </%init>