[freeside-commits] freeside/httemplate/search svc_www.cgi,1.9,1.10

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv2666

Modified Files:
	svc_www.cgi 
Log Message:
fix up svc_www searching

Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_www.cgi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- svc_www.cgi	3 Feb 2007 11:36:30 -0000	1.9
+++ svc_www.cgi	14 Feb 2007 01:43:19 -0000	1.10
@@ -84,7 +84,7 @@
     : '';
 
 
-my $count_query = 'SELECT COUNT(*) FROM svc_www';
+my $count_query = "SELECT COUNT(*) FROM svc_www $addl_from $extra_sql";
 my $sql_query = {
   'table'     => 'svc_www',
   'hashref'   => {},
@@ -94,7 +94,7 @@
                    'cust_main.custnum',
                    FS::UI::Web::cust_sql_fields(),
                  ),
-  'extra_sql' => $orderby,
+  'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,
 };