Index: openacs-4/packages/acs-api-browser/www/proc-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-api-browser/www/proc-search.tcl 10 Jan 2007 21:22:01 -0000 1.12 +++ openacs-4/packages/acs-api-browser/www/proc-search.tcl 27 Oct 2014 16:39:00 -0000 1.13 @@ -79,18 +79,18 @@ # value of an exact match. ##Exact match: - if {[string tolower $query_string] == [string tolower $proc]} { + if {[string tolower $query_string] eq [string tolower $proc]} { incr score [expr {$name_weight * 2}] } elseif { ! $exact_match_p } { - incr score [expr {$name_weight * [ad_keywords_score $query_string $proc]}] + incr score [expr {$name_weight * [::apidoc::ad_keywords_score $query_string $proc]}] } } ################ ## Param Search: ################ if {$param_weight} { - incr score [expr {$param_weight * [ad_keywords_score $query_string "$doc_elements(positionals) $doc_elements(switches)"]}] + incr score [expr {$param_weight * [::apidoc::ad_keywords_score $query_string "$doc_elements(positionals) $doc_elements(switches)"]}] } @@ -99,7 +99,7 @@ ############## if {$doc_weight} { - set doc_string "[lindex $doc_elements(main) 0]" + set doc_string [lindex $doc_elements(main) 0] if {[info exists doc_elements(param)]} { foreach parameter $doc_elements(param) { append doc_string " $parameter" @@ -108,7 +108,7 @@ if {[info exists doc_elements(return)]} { append doc_string " $doc_elements(return)" } - incr score [expr {$doc_weight * [ad_keywords_score $query_string $doc_string]}] + incr score [expr {$doc_weight * [::apidoc::ad_keywords_score $query_string $doc_string]}] } @@ -117,7 +117,7 @@ ################# if {$source_weight} { if {![catch {set source [info body $proc]}]} { - incr score [expr {$source_weight * [ad_keywords_score $query_string $source]}] + incr score [expr {$source_weight * [::apidoc::ad_keywords_score $query_string $source]}] } } @@ -141,10 +141,10 @@ } } -set matches [lsort -command ad_sort_by_score_proc $matches] +set matches [lsort -command ::apidoc::ad_sort_by_score_proc $matches] if {$quick_view && $matches ne "" || [llength $matches] == 1 } { - ad_returnredirect [api_proc_url [lindex [lindex $matches 0] 0]] + ad_returnredirect [api_proc_url [lindex $matches 0 0]] ad_script_abort } @@ -155,21 +155,17 @@ foreach output $matches { incr counter - set proc [lindex $output 0] - set score [lindex $output 1] - set args [lindex $output 2] - set url [api_proc_url $proc] + lassign $output proc score args + set url [api_proc_url $proc] multirow append results $score $proc $args $url } multirow create deprecated_results score proc args url foreach output $deprecated_matches { incr counter - set proc [lindex $output 0] - set score [lindex $output 1] - set args [lindex $output 2] - set url [api_proc_url $proc] + lassign $output proc score args + set url [api_proc_url $proc] multirow append deprecated_results $score $proc $args $url } @@ -182,10 +178,8 @@ foreach output $private_matches { incr counter - set proc [lindex $output 0] - set score [lindex $output 1] - set args [lindex $output 2] - set url [api_proc_url $proc] + lassign $output proc score args + set url [api_proc_url $proc] multirow append private_results $score $proc $args $url }