Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.22.2.1 -r1.22.2.2
--- openacs-4/packages/search/www/search.tcl	13 Nov 2006 01:06:27 -0000	1.22.2.1
+++ openacs-4/packages/search/www/search.tcl	14 Dec 2006 13:55:11 -0000	1.22.2.2
@@ -97,12 +97,12 @@
 
 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]
+if {$search_package_id eq "" && [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 [concat [ad_conn subsite_id] [subsite::util::packages -node_id [ad_conn node_id]]]
 } else { 
-    lappend params {}    
+  lappend params $search_package_id
 }
 
 set t0 [clock clicks -milliseconds]
@@ -195,8 +195,8 @@
 
 set url_previous ""
 set url_next ""
-append url_previous "search?q=${urlencoded_query}"
-append url_next "search?q=${urlencoded_query}"
+append url_previous "search?q=${urlencoded_query}&search_package_id=$search_package_id"
+append url_next "search?q=${urlencoded_query}&search_package_id=$search_package_id"
 if { [expr $current_result_page - 1] > $from_result_page } { 
     append url_previous "&offset=[expr ($current_result_page - 2) * $limit]"
 }