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 -N -r1.3 -r1.4
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql 5 Aug 2008 14:54:35 -0000 1.3
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs-postgresql.xql 22 Sep 2008 16:26:56 -0000 1.4
@@ -39,22 +39,32 @@
+
+ postgresql8.3
+
+ update txt set fti =
+ setweight(to_tsvector(coalesce(:title,'')),'A')
+ ||setweight(to_tsvector(coalesce(:keywords,'')),'B')
+ ||to_tsvector(coalesce(:txt,''))
+ where object_id=:object_id
+
+
postgresql8.0
insert into txt (object_id,fti)
values (:object_id,
- setweight(to_tsvector('default',coalesce(:title,'')),'A')
- ||setweight(to_tsvector('default',coalesce(:keywords,'')),'B')
- ||to_tsvector('default',coalesce(:txt,'')))
+ setweight(to_tsvector(coalesce(:title,'')),'A')
+ ||setweight(to_tsvector(coalesce(:keywords,'')),'B')
+ ||to_tsvector(coalesce(:txt,'')))
postgresql8.0
- where fti @@ to_tsquery('default',:query)
+ where fti @@ to_tsquery(:query)
and exists (select 1
from acs_object_party_privilege_map m
where m.object_id = txt.object_id
@@ -67,16 +77,27 @@
postgresql8.0
select txt.object_id $base_query
- order by rank(fti,to_tsquery('default',:query)) desc
+ order by rank(fti,to_tsquery(:query)) desc
$limit_clause $offset_clause
postgresql8.0
- select headline('default',:txt,to_tsquery('default',:query))
+ select headline(:txt,to_tsquery(:query))
+
+ postgresql8.0
+
+ update txt set fti =
+ setweight(to_tsvector('default',coalesce(:title,'')),'A')
+ ||setweight(to_tsvector('default',coalesce(:keywords,'')),'B')
+ ||to_tsvector('default',coalesce(:txt,''))
+ where object_id=:object_id
+
+
+
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 -N -r1.24 -r1.25
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 8 Sep 2008 20:08:33 -0000 1.24
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl 22 Sep 2008 16:26:56 -0000 1.25
@@ -80,13 +80,7 @@
if {$max_size_to_index > 0} {
set txt [string range $txt 0 $max_size_to_index]
}
- db_dml update_index "
- update txt set fti =
- setweight(to_tsvector('default',coalesce(:title,'')),'A')
- ||setweight(to_tsvector('default',coalesce(:keywords,'')),'B')
- ||to_tsvector('default',coalesce(:txt,''))
- where object_id=:object_id
- "
+ db_dml update_index ""
}
}