- V4.0.3.0.0:

  Updated to OpenACS 5.7

tcl/tsearch2-driver-procs-postgresql.xql

@@ -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>

tcl/tsearch2-driver-procs.tcl

@@ -179,7 +179,7 @@ ad_proc -callback search::search -impl tsearch2-driver {
     
     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]
 

tsearch2-driver.info

@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.6.0" url="http://openacs.org/repository/download/apm/tsearch2-driver-5.6.0.apm">
+    <version name="5.7.0" url="http://openacs.org/repository/download/apm/tsearch2-driver-5.7.0.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <summary>Full text search support for Search via Tsearch2.</summary>
-        <release-date>2010-06-17</release-date>
+        <release-date>2011-06-12</release-date>
         <description format="text/html">Provides an implementation for the search packages service contract for searching on postgresql.</description>
         <maturity>3</maturity>
 
-        <provides url="tsearch2-driver" version="5.6.0"/>
-        <requires url="search" version="5.6.0"/>
+        <provides url="tsearch2-driver" version="5.7.0"/>
+        <requires url="search" version="5.7.0"/>
 
         <callbacks>
             <callback type="before-install" proc="tsearch2_driver::install::preinstall_checks"/>