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.6 -r1.6.2.1 --- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl 27 Oct 2014 16:42:00 -0000 1.6 +++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-install-procs.tcl 29 Apr 2016 07:04:55 -0000 1.6.2.1 @@ -31,12 +31,12 @@ # 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 distinct(typname) from pg_type where typname='tsvector'"] } { - - # if tsearch is installed - ns_log Notice "******* Tsearch2 is compiled and installed. ***********" - # continue with installation - + if { [db_0or1row tsearch_compile_check { + select distinct(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 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 -r1.32 -r1.32.2.1 --- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 29 Jun 2015 18:46:49 -0000 1.32 +++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 29 Apr 2016 07:04:55 -0000 1.32.2.1 @@ -106,19 +106,13 @@ @creation-date 2004-06-05 @param query - @param offset - @param limit - @param user_id - @param df - @param packages list of packages to search for content in. @return - @error } { set packages {} @@ -210,11 +204,9 @@ @creation-date 2004-06-05 @param query - @param txt @return summary containing search query terms - @error } { set query [tsearch2::build_query -query $query]