Index: openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql-8.3.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/Attic/tsearch2-driver-procs-postgresql-8.3.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql-8.3.xql 5 Aug 2008 14:33:46 -0000 1.1 @@ -0,0 +1,39 @@ + + postgresql8.3 + + + + insert into txt (object_id,fti) + values (:object_id, + setweight(to_tsvector(coalesce(:title,'')),'A') + ||setweight(to_tsvector(coalesce(:keywords,'')),'B') + ||to_tsvector(coalesce(:txt,''))) + + + + + + where fti @@ to_tsquery(:query) + and exists (select 1 + from acs_object_party_privilege_map m + where m.object_id = txt.object_id + and m.party_id = :user_id + and m.privilege = 'read') + + + + + + select txt.object_id $base_query + order by ts_rank(fti,to_tsquery(:query)) desc + $limit_clause $offset_clause + + + + + + select ts_headline(:txt,to_tsquery(:query)) + + + + 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.1 -r1.2 --- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql 5 Aug 2008 13:51:59 -0000 1.1 +++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql 5 Aug 2008 14:33:46 -0000 1.2 @@ -1,44 +1,4 @@ - postgresql8.3 - - - - insert into txt (object_id,fti) - values (:object_id, - setweight(to_tsvector(coalesce(:title,'')),'A') - ||setweight(to_tsvector(coalesce(:keywords,'')),'B') - ||to_tsvector(coalesce(:txt,''))) - - - - - - where fti @@ to_tsquery(:query) - and exists (select 1 - from acs_object_party_privilege_map m - where m.object_id = txt.object_id - and m.party_id = :user_id - and m.privilege = 'read') - - - - - - select txt.object_id $base_query - order by ts_rank(fti,to_tsquery(:query)) desc - $limit_clause $offset_clause - - - - - - select ts_headline(:txt,to_tsquery(:query)) - - - - - - postgresql8.0 @@ -77,5 +37,3 @@ - -