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 -r1.9 -r1.10
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql	5 Nov 2010 16:35:10 -0000	1.9
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql	2 Apr 2013 11:05:18 -0000	1.10
@@ -23,6 +23,13 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="callback::search::search::impl::tsearch2-driver.base_query">
+  <rdbms><type>postgresql</type><version>8.4</version></rdbms>
+    <querytext>
+      where fti @@ to_tsquery(:query)
+    </querytext>
+  </fullquery>
+
   <fullquery name="callback::search::search::impl::tsearch2-driver.search">
   <rdbms><type>postgresql</type><version>8.3</version></rdbms>
     <querytext>
@@ -37,6 +44,22 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="callback::search::search::impl::tsearch2-driver.search">
+  <rdbms><type>postgresql</type><version>8.4</version></rdbms>
+    <querytext>
+        select distinct(orig_object_id) from acs_permission__permission_p_recursive_array(array(
+        select txt.object_id
+        from
+        [join $from_clauses ","]
+        $base_query
+        [expr {[llength $where_clauses] > 0 ? " and " : ""}]
+        [join $where_clauses " and "]
+        order by ts_rank(fti,to_tsquery(:query)) desc
+        ), :user_id, 'read')
+        $limit_clause $offset_clause
+    </querytext>
+  </fullquery>
+
   <fullquery name="callback::search::search::impl::tsearch2-driver.count">
   <rdbms><type>postgresql</type><version>8.3</version></rdbms>
     <querytext>
@@ -49,6 +72,20 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="dbqd.tsearch2-driver.tcl.tsearch2-driver-procs.callback::search::search::impl::tsearch2-driver.search_result_count">
+  <rdbms><type>postgresql</type><version>8.4</version></rdbms>
+    <querytext>
+      select count(distinct(orig_object_id)) from acs_permission__permission_p_recursive_array(array(
+      select txt.object_id
+      from
+      [join $from_clauses ","]
+      $base_query
+      [expr {[llength $where_clauses] > 0 ? " and " : ""}]
+      [join $where_clauses " and "]
+        ), :user_id, 'read')
+    </querytext>
+  </fullquery>
+
   <fullquery name="tsearch2::summary.summary">
   <rdbms><type>postgresql</type><version>8.3</version></rdbms>
     <querytext>