Index: openacs-4/packages/tsearch2-driver/tsearch2-driver.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tsearch2-driver.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/tsearch2-driver/tsearch2-driver.info	6 Jun 2004 01:33:17 -0000	1.1
+++ openacs-4/packages/tsearch2-driver/tsearch2-driver.info	10 Dec 2004 16:11:05 -0000	1.2
@@ -7,16 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.1d" url="http://openacs.org/repository/download/apm/tsearch2-driver-0.1d.apm">
+    <version name="0.3d" url="http://openacs.org/repository/download/apm/tsearch2-driver-0.3d.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <summary>Full text search support for Search via Tsearch2.</summary>
         <description format="text/html">Provides an implementation for the search packages service contract for searching on postgresql.</description>
         <maturity>0</maturity>
 
-        <provides url="tsearch2-driver" version="0.1d"/>
+        <provides url="tsearch2-driver" version="0.3d"/>
 
         <callbacks>
-            <callback type="after-install"  proc="tsearch2_driver::install::package_install"/>
+      <callback type="before-install" proc="tsearch2_driver::install::preinstall_checks"/>
+      <callback type="after-install"  proc="tsearch2_driver::install::package_install"/>
         </callbacks>
         <parameters>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="permission_check_enabled_p"  default="1" description="Check whether the user is allowed to read the object. This is used to filter the search results w.r.t the privileges of the user performing the query."/>
Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl	6 Jun 2004 17:29:21 -0000	1.2
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl	10 Dec 2004 16:11:05 -0000	1.3
@@ -12,6 +12,64 @@
 
 namespace eval tsearch2_driver::install {}
 
+
+ad_proc -public tsearch2_driver::install::preinstall_checks {
+
+} {
+    
+    Make sure postgresql_contrib and tsearch are installed
+    before allowing the installation of tsearch2_package
+    
+    @author Hamilton Chua (hchua@8tons.dyndns.biz)
+    @creation-date 2004-07-02
+    
+} {
+
+	ns_log Notice " ********** STARTING BEFORE-INSTALL CALLBACK ****************"
+
+	# check if tsearch2 is installed
+	# in psql we do this by checking the presense of a data type tsvector
+	# select typname from pg_type where typename='tsvector';
+		
+	if { [db_0or1row "tsearch_compile_check" "select typname from pg_type where typname='tsvector'"] } {
+	
+		# if tsearch is installed
+		ns_log Notice "******* Tsearch2 is compiled and installed. ***********"
+		# continue with installation
+			
+	} else {
+	
+		# tsearch not installed
+		ns_log Notice "******* Tsearch2 is not installed. ***********"
+
+                # RPM, Debian, source default locations
+                set locs [list "/usr/share/pgsql/contrib/tsearch2.sql" \
+                              "/usr/local/pgsql/contrib/tsearch2.sql" \
+                              "/usr/share/postgresql/contrib/tsearch2.sql"]
+                foreach loc $locs {
+                    if { [file exists $loc] } {
+                        set sql_file_loc $loc
+                        break
+                    }
+                }
+		# Check if we've found it, run the sql file		
+		if { [exists_and_not_null sql_file_loc] } {
+			# we found tsearch2.sql let's run it
+			db_source_sql_file $sql_file_loc
+		} else {
+			# we could not find tserach2.sql, abort the install
+			ns_log Notice "************************************************"
+			ns_log Notice "********* Can't locate tsearch2.sql. ***********"
+			ns_log Notice "********* Install tsearch2.sql manually ********"
+			ns_log Notice "************************************************"
+			ad_script_abort
+		}
+		
+	}
+	ns_log Notice " ********** ENDING BEFORE-INSTALL CALLBACK ****************"
+	     
+}
+
 ad_proc -public tsearch2_driver::install::package_install {
 } {