Index: openacs-4/packages/search/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.tcl,v
diff -u -r1.37 -r1.37.2.1
--- openacs-4/packages/search/www/search.tcl	26 Jul 2011 18:39:32 -0000	1.37
+++ openacs-4/packages/search/www/search.tcl	26 Aug 2013 07:57:14 -0000	1.37.2.1
@@ -39,7 +39,7 @@
     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]
 } else {
-    array set info [acs_sc_call FtsEngineDriver info [list] $driver]
+    array set info [acs_sc::invoke -contract FtsEngineDriver -operation info -call_args [list] -impl $driver]
 }
 
 if { [array get info] eq "" } {
@@ -121,7 +121,7 @@
 
     array set result [lindex [callback -impl $driver search::search -query $q -offset $offset -limit $limit -user_id $user_id -df $df -extra_args [list package_ids $search_package_id object_type $object_type]] 0]
 } else {
-    array set result [acs_sc_call FtsEngineDriver search $params $driver]
+    array set result [acs_sc::invoke -contract FtsEngineDriver -operation search -call_args $params -impl $driver]
 }
 set tend [clock clicks -milliseconds]
 
@@ -131,7 +131,7 @@
     if {[callback::impl_exists -impl $object_type -callback search::url]} {
 	set url [callback -impl $object_type search::url -object_id $object_id]
     } else {
-	set url [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+	set url [acs_sc::invoke -contract FtsContentProvider -operation url -call_args [list $object_id] -impl $object_type]
     }
     ad_returnredirect $url
     ad_script_abort
@@ -174,16 +174,16 @@
             set url_one [lindex [callback -impl $object_type search::url -object_id $object_id] 0]
         } else {
             ns_log warning "SEARCH search/www/search.tcl callback::datasource::$object_type not found"
-            array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
-            set url_one [acs_sc_call FtsContentProvider url [list $object_id] $object_type]
+            array set datasource [acs_sc::invoke -contract FtsContentProvider -operation datasource -call_args [list $object_id] -impl $object_type]
+            set url_one [acs_sc::invoke -contract FtsContentProvider -operation url -call_args [list $object_id] -impl $object_type]
         }
         search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type) $object_id
         if {[callback::impl_exists -impl $driver -callback search::summary]} {
             set title_summary [lindex [callback -impl $driver search::summary -query $q -text $datasource(title)] 0]
             set txt_summary [lindex [callback -impl $driver search::summary -query $q -text $txt] 0]
         } else {
-            set title_summary [acs_sc_call FtsEngineDriver summary [list $q $datasource(title)] $driver]
-            set txt_summary [acs_sc_call FtsEngineDriver summary [list $q $txt] $driver]
+            set title_summary [acs_sc::invoke -contract FtsEngineDriver -operation summary -call_args [list $q $datasource(title)] -impl $driver]
+            set txt_summary [acs_sc::invoke -contract FtsEngineDriver -operation summary -call_args [list $q $txt] -impl $driver]
         }
     } errmsg]} {
         ns_log error "search.tcl object_id $object_id object_type $object_type error $errmsg"