Index: openacs-4/packages/search/lib/navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/lib/navbar.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/search/lib/navbar.tcl 5 Jan 2008 18:35:45 -0000 1.3 +++ openacs-4/packages/search/lib/navbar.tcl 13 Feb 2009 21:26:43 -0000 1.4 @@ -1,7 +1,7 @@ set package_id [ad_conn package_id] -set limit [ad_parameter -package_id $package_id LimitDefault] -set pages_per_group [ad_parameter -package_id $package_id PagesPerGroup] +set limit [parameter::get -package_id $package_id -parameter LimitDefault] +set pages_per_group [parameter::get -package_id $package_id -parameter PagesPerGroup] set current_result_page [expr {$low / $limit}] set from_result_page [expr {($current_result_page / $pages_per_group) * $pages_per_group}] 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.44 -r1.45 --- openacs-4/packages/search/tcl/search-procs.tcl 24 Jun 2008 19:09:25 -0000 1.44 +++ openacs-4/packages/search/tcl/search-procs.tcl 13 Feb 2009 21:26:43 -0000 1.45 @@ -98,7 +98,7 @@ @author Jeff Davis (davis@xarg.net) } { - set driver [ad_parameter -package_id [apm_package_id_from_key search] FtsEngineDriver] + set driver [parameter::get -package_id [apm_package_id_from_key search] -parameter FtsEngineDriver] if { $driver eq "" || (![callback::impl_exists -callback search::index -impl $driver] && ! [acs_sc_binding_exists_p FtsEngineDriver $driver])} { Index: openacs-4/packages/search/www/advanced-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/advanced-search.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/search/www/advanced-search.tcl 13 Jan 2005 13:58:41 -0000 1.2 +++ openacs-4/packages/search/www/advanced-search.tcl 13 Feb 2009 21:26:43 -0000 1.3 @@ -8,7 +8,7 @@ set package_id [ad_conn package_id] if { $num == 0 } { - set num [ad_parameter -package_id $package_id LimitDefault] + set num [parameter::get -package_id $package_id -parameter LimitDefault] } set title "Advanced Search" Index: openacs-4/packages/search/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/search/www/search.tcl 5 Oct 2008 01:01:35 -0000 1.33 +++ openacs-4/packages/search/www/search.tcl 13 Feb 2009 21:26:43 -0000 1.34 @@ -34,7 +34,7 @@ set debug_p 0 set user_id [ad_conn user_id] -set driver [ad_parameter -package_id $package_id FtsEngineDriver] +set driver [parameter::get -package_id $package_id -parameter FtsEngineDriver] if {[callback::impl_exists -impl $driver -callback search::driver_info]} { array set info [lindex [callback -impl $driver search::driver_info] 0] # array set info [list package_key intermedia-driver version 1 automatic_and_queries_p 1 stopwords_p 1] @@ -62,7 +62,7 @@ if { $num <= 0} { - set limit [ad_parameter -package_id $package_id LimitDefault] + set limit [parameter::get -package_id $package_id -parameter LimitDefault] } else { set limit $num } @@ -78,7 +78,7 @@ set dfs "" } -array set symbol2interval [ad_parameter -package_id $package_id Symbol2Interval] +array set symbol2interval [parameter::get -package_id $package_id -parameter Symbol2Interval] if { $dfs ne "" } { set df [db_exec_plsql get_df "select now() + '$symbol2interval($dfs)'::interval"] } @@ -91,7 +91,7 @@ if { $offset < 0 } { set offset 0 } set params [list $q $offset $limit $user_id $df] -if {$search_package_id eq "" && [ad_parameter -package_id $package_id SubsiteSearchP -default 1] +if {$search_package_id eq "" && [parameter::get -package_id $package_id -parameter 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]]] @@ -182,7 +182,7 @@ template::multirow append searchresult $title_summary $txt_summary $url_one } -set search_the_web [ad_parameter -package_id $package_id SearchTheWeb] +set search_the_web [parameter::get -package_id $package_id -parameter SearchTheWeb] if {[llength $search_the_web]} { set stw "" foreach {url site} $search_the_web {