Index: openacs-4/packages/openfts-driver/openfts-driver.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openfts-driver/openfts-driver.info,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/openfts-driver/openfts-driver.info	11 Dec 2003 21:40:09 -0000	1.7
+++ openacs-4/packages/openfts-driver/openfts-driver.info	10 Mar 2005 01:42:15 -0000	1.8
@@ -7,13 +7,13 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.2" url="http://openacs.org/repository/download/apm/openfts-driver-4.2.apm">
+    <version name="4.3d1" url="http://openacs.org/repository/download/apm/openfts-driver-4.3d1.apm">
     <database-support>
         <database>postgresql</database>
     </database-support>
         <owner url="mailto:k2pts@yahoo.com">Neophytos Demetriou</owner>
-        <summary>Full text search support for Search via OpenFTS.</summary>
-        <description format="text/html">Provides an implementation for the search packages service contract for searching on postgresql.</description>
+        <summary>Full text search support for Search via OpenFTS.  Deprecated in favor of the tsearch2-driver in OpenACS 5.2.</summary>
+        <description format="text/html">Provides an implementation for the search packages service contract for searching on postgresql.  Use tsearch2 instead.</description>
 
         <!-- No dependency information -->
 
Index: openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl	14 May 2004 10:51:21 -0000	1.8
+++ openacs-4/packages/openfts-driver/tcl/openfts-driver-procs.tcl	10 Mar 2005 01:42:15 -0000	1.9
@@ -12,10 +12,15 @@
     limit
     user_id
     df
-    dt
+    packages
 } {
     @author Neophytos Demetriou
 } {
+    # JCD: I have done something horrible.  I took out dt and 
+    # made it packages.  when you search there is no way to specify a date range just
+    # last six months, last year etc.  I hijack what was the old dt param and make it 
+    # the package_id list and just empty string for dt.
+    set dt {}
 
     set result(count) 0
     set result(ids) ""
@@ -55,12 +60,31 @@
 	append date_range_condition "'$dt' >= last_modified and"
     }
 
+    # if we were passed package_ids restrict to those packages.
+    set ids {}
+    foreach id $packages {
+        if {[string is integer -strict $id]} {
+            lappend ids $id
+        }
+    }
+    if {![empty_string_p $ids]} {
+        set package_restrict " and object_id in (select o.object_id from acs_objects o where o.package_id in ([join $ids ,])"
+    } else {
+        set package_restrict {}
+    }
+
     set permission_check_enabled_p [ad_parameter -package_id [apm_package_id_from_key openfts-driver] permission_check_enabled_p]
-    set permission_check_condition ""
     if { $permission_check_enabled_p } {
-	append permission_check_condition "and acs_permission__permission_p( $self(TXTID), $user_id, 'read') = 't'"
+	append permission_check_condition "and exists (select 1
+                    from acs_object_party_privilege_map m
+                    where m.object_id = $self(TXTID)
+                      and m.party_id = :user_id
+                      and m.privilege = 'read')"
+    } else {
+        set permission_check_condition {}
     }
 
+
     set sql_count "
         select count(*)
         from $self(TABLE)
Index: openacs-4/packages/search/search.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/search.info,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/search/search.info	2 Feb 2005 21:18:02 -0000	1.21
+++ openacs-4/packages/search/search.info	10 Mar 2005 01:42:14 -0000	1.22
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.2.0d3" url="http://openacs.org/repository/download/apm/search-5.2.0d3.apm">
+    <version name="5.2.0d4" url="http://openacs.org/repository/download/apm/search-5.2.0d4.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <release-date>2005-01-09</release-date>
         <maturity>3</maturity>
@@ -18,22 +18,20 @@
         <description format="text/html">Site wide search implemented with service contracts, currently 
         only supports postgres via the OpenFTS driver.</description>
 
-        <provides url="search" version="5.2.0d3"/>
+        <provides url="search" version="5.2.0d4"/>
 
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FtsEngineDriver"  default="openfts-driver" description="Which search engine driver to use? You should enter the name of the related binding (e.g. openfts-driver, swish-driver,...)"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="FtsEngineDriver"  default="tsearch2-driver" description="Which search engine driver to use? You should enter the name of the related binding (e.g. openfts-driver, swish-driver,...)"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="LimitDefault"  default="10" description="Default limit value"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SearchIndexerInterval"  default="30" description="SearchIndexerInterval"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SearchIndexerInterval"  default="30" description="Interval in seconds for the search indexer to sweep for new or updated items."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SearchTheWeb"  default="http://av.com/sites/search/web?q=%s AltaVista http://msxml.excite.com/info.xcite/search/web/%s Excite http://www.google.com/search?q=%s Google http://hotbot.com/?MT=%s HotBot http://search.yahoo.com/search?p=%s Yahoo!" description="Search the Web (e.g. Google)"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="Symbol2Interval"  default="m3 {3 month ago} m6 {6 month ago} y1 {1 year ago}" description="Translate symbol to date interval."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SubsiteSearchP"  default="0" description="If mounted in a subsite should the search be restricted to items in the subsite by default.  Requires that package_id in acs_objects be properly populated."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="Syndicate"  default="0" description="Should syndication data be stored when indexing for search."/>
         </parameters>
 
     </version>
 </package>
 
-
-
-
Index: openacs-4/packages/search/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/tcl/search-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/search/tcl/search-procs.tcl	7 Mar 2005 20:47:07 -0000	1.20
+++ openacs-4/packages/search/tcl/search-procs.tcl	10 Mar 2005 01:42:14 -0000	1.21
@@ -9,19 +9,19 @@
 
 ad_proc -public search::queue {
     -object_id
-    -event 
+    -event
 } {
     Add an object to the search_observer_queue table with
     an event.
 
     You should excercise care that the entry is not being
-    created from a trigger (although search is robust for multiple 
+    created from a trigger (although search is robust for multiple
     entries so it will not insert or update the same object
     more than once per sweep).
 
     @param object_id acs_objects object_id
     @param event INSERT or UPDATE or DELETE
-    
+
     @author Jeff Davis (davis@xarg.net)
 } {
     package_exec_plsql \
Index: openacs-4/packages/search/www/advanced-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/search/www/advanced-search.adp	20 Feb 2005 17:18:03 -0000	1.5
+++ openacs-4/packages/search/www/advanced-search.adp	10 Mar 2005 01:42:14 -0000	1.6
@@ -1,6 +1,7 @@
 <master>
   <property name="title">#search.Advanced_Search#</property>
   <property name="context">"advanced search"</property>
+  <property name="robots">noindex,nofollow</property>
 
   <form method="get" action="search">
     <input type="text" name="q" size="41" maxlength="256" value="@q@"/>
Index: openacs-4/packages/search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/search/www/index.adp	2 Feb 2005 21:24:08 -0000	1.6
+++ openacs-4/packages/search/www/index.adp	10 Mar 2005 01:42:14 -0000	1.7
@@ -1,6 +1,7 @@
 <master>
   <property name="title">#search.Search#</property>
   <property name="context">#search.Search#</property>
+  <property name="robots">noindex,nofollow</property>
 
   <if @driver_p@ true> 
     <form method="get" action="search">
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/search/www/search.adp	20 Feb 2005 17:18:03 -0000	1.6
+++ openacs-4/packages/search/www/search.adp	10 Mar 2005 01:42:14 -0000	1.7
@@ -2,6 +2,8 @@
   <property name="title">@page_title@</property>
   <property name="context">@context;noquote@</property>
   <property name="in_search_p">t</property>
+  <property name="robots">noindex,nofollow</property>
+
   <property name="header_stuff">
     <style type="text/css">
     .hint {
Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/search/www/search.tcl	20 Feb 2005 17:18:03 -0000	1.15
+++ openacs-4/packages/search/www/search.tcl	10 Mar 2005 01:42:14 -0000	1.16
@@ -43,28 +43,46 @@
 }
 
 
-
-
 if { $num <= 0} {
     set limit [ad_parameter -package_id $package_id LimitDefault]
 } else {
     set limit $num
 }
 
+
+#
+# Work out the date restriction 
+#
 set df ""
 set dt ""
-if { $dfs == "all" } { set dfs "" }
+
+if { $dfs == "all" } {
+    set dfs ""
+}
+
 array set symbol2interval [ad_parameter -package_id $package_id Symbol2Interval]
-if { $dfs != "" } { set df [db_exec_plsql get_df "select now() + '$symbol2interval($dfs)'::interval"] }
-if { $dts != "" } { set dt [db_exec_plsql get_dt "select now() + '$symbol2interval($dts)'::interval"] }
+if { $dfs != "" } {
+    set df [db_exec_plsql get_df "select now() + '$symbol2interval($dfs)'::interval"]
+}
+if { $dts != "" } {
+    set dt [db_exec_plsql get_dt "select now() + '$symbol2interval($dts)'::interval"]
+}
 
 set q [string tolower $q]
 set urlencoded_query [ad_urlencode $q]
-set qtest [tsearch2::build_query -query $q]
 
 if { $offset < 0 } { set offset 0 }
+set params [list $q $offset $limit $user_id $df]
+if {[ad_parameter -package_id $package_id SubsiteSearchP -default 1]
+    && [subsite::main_site_id] != [ad_conn subsite_id]} {
+    # We are in a subsite and SubsiteSearchP is true
+    lappend params [subsite::util::packages -node_id [ad_conn node_id]]
+} else { 
+    lappend params {}    
+}
+
 set t0 [clock clicks -milliseconds]
-array set result [acs_sc_call FtsEngineDriver search [list $q $offset $limit $user_id $df $dt] $driver]
+array set result [acs_sc_call FtsEngineDriver search $params $driver]
 set tend [clock clicks -milliseconds]
 
 if { $t == "Feeling Lucky" && $result(count) > 0} {
@@ -85,6 +103,7 @@
 } else {
     set and_queries_notice_p 0
 }
+
 set url_advanced_search ""
 append url_advanced_search "advanced-search?q=${urlencoded_query}"
 if { $num > 0 } { append url_advanced_search "&num=${num}" }
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.2 -r1.3
--- openacs-4/packages/tsearch2-driver/tsearch2-driver.info	10 Dec 2004 16:11:05 -0000	1.2
+++ openacs-4/packages/tsearch2-driver/tsearch2-driver.info	10 Mar 2005 01:42:15 -0000	1.3
@@ -7,17 +7,17 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.3d" url="http://openacs.org/repository/download/apm/tsearch2-driver-0.3d.apm">
+    <version name="0.4d" url="http://openacs.org/repository/download/apm/tsearch2-driver-0.4d.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.3d"/>
+        <provides url="tsearch2-driver" version="0.4d"/>
 
         <callbacks>
-      <callback type="before-install" proc="tsearch2_driver::install::preinstall_checks"/>
-      <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-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	8 Mar 2005 03:22:33 -0000	1.13
+++ openacs-4/packages/tsearch2-driver/tcl/tsearch2-driver-procs.tcl	10 Mar 2005 01:42:15 -0000	1.14
@@ -93,11 +93,10 @@
     limit
     user_id
     df
-    dt
+    packages
 } {
-    
     ftsenginedriver search operation implementation for tsearch2
-    
+
     @author Dave Bauer (dave@thedesignexperience.org)
     @creation-date 2004-06-05
 
@@ -111,39 +110,67 @@
 
     @param df
 
-    @param dt
+    @param packages list of packages to search for content in.
 
     @return
 
     @error
 } {
-    # clean up query
-    # turn and into &
-    # turn or into |
-    # turn not into !
+    # JCD: I have done something horrible.  I took out dt and 
+    # made it packages.  when you search there is no way to specify a date range just
+    # last six months, last year etc.  I hijack what was the old dt param and make it 
+    # the package_id list and just empty string for dt.
+    set dt {}
+
+    # clean up query for tsearch2
     set query [tsearch2::build_query -query $query]
 
+    # don't use bind vars since pg7.3 yacks for '1' (which is what comes out of bind vars)
     set limit_clause ""
     set offset_clause ""
+    if {[string is integer -strict $limit]} {
+	set limit_clause " limit $limit "
+    }
+    if {[string is integer -strict $offset]} {
+	set offset_clause " offset $offset "
+    }
 
-    if {[string is integer $limit]} {
-	set limit_clause " limit :limit "
+    set base_query {
+        from txt, acs_objects o
+        where fti @@ to_tsquery('default',:query)
+        and o.object_id = txt.object_id
+        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')}
+    if {![empty_string_p $df]} {
+        append base_query " and o.creation_date > :df"
     }
-    if {[string is integer $offset]} {
-	set offset_clause " offset :offset "
+    if {![empty_string_p $dt]} {
+        append base_query " and o.creation_date < :dt"
     }
-    set query_text "select object_id from txt where fti @@ to_tsquery('default',: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') order by rank(fti,to_tsquery('default',:query)) desc  ${limit_clause} ${offset_clause}"
-    set results_ids [db_list search $query_text]
-    set count [db_string count "select count(*) from txt where fti @@ to_tsquery('default',: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')"]
+
+    # generate the package id restriction.
+    set ids {}
+    foreach id $packages {
+        if {[string is integer -strict $id]} {
+            lappend ids $id
+        }
+    }
+    if {![empty_string_p $ids]} {
+        append base_query " and o.package_id in ([join $ids ,])"
+    }
+
+    set results_ids [db_list search \
+                         "select o.object_id $base_query
+   order by rank(fti,to_tsquery('default',:query)) desc
+   $limit_clause $offset_clause"]
+
+    set count [db_string count "select count(*) $base_query"]
+
     set stop_words [list]
+
     # lovely the search package requires count to be returned but the
     # service contract definition doesn't specify it!
     return [list ids $results_ids stopwords $stop_words count $count]