Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql	13 Mar 2009 18:57:19 -0000	1.8
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql	5 Nov 2010 16:35:10 -0000	1.9
@@ -37,6 +37,18 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="callback::search::search::impl::tsearch2-driver.count">
+  <rdbms><type>postgresql</type><version>8.3</version></rdbms>
+    <querytext>
+      select count(*)
+      from
+      [join $from_clauses ","]
+      $base_query
+      [expr {[llength $where_clauses] > 0 ? " and " : ""}]
+      [join $where_clauses " and "]
+    </querytext>
+  </fullquery>
+
   <fullquery name="tsearch2::summary.summary">
   <rdbms><type>postgresql</type><version>8.3</version></rdbms>
     <querytext>
@@ -92,6 +104,18 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="callback::search::search::impl::tsearch2-driver.count">
+  <rdbms><type>postgresql</type><version>8.2</version></rdbms>
+    <querytext>
+      select count(*)
+      from
+      [join $from_clauses ","]
+      $base_query
+      [expr {[llength $where_clauses] > 0 ? " and " : ""}]
+      [join $where_clauses " and "]
+    </querytext>
+  </fullquery>
+
   <fullquery name="tsearch2::summary.summary">
   <rdbms><type>postgresql</type><version>8.0</version></rdbms>
     <querytext>
Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	12 Jul 2009 01:12:33 -0000	1.27
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	5 Nov 2010 16:35:10 -0000	1.28
@@ -179,7 +179,7 @@
     
     set results_ids [db_list search {}]
 
-    set count [db_string count "select count(*) from txt $base_query"]
+    set count [db_string count {}]
 
     set stop_words [list]