Index: openacs-4/packages/acs-content-repository/tcl/search-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/search-procs.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-content-repository/tcl/search-procs.tcl 28 Jun 2011 16:30:25 -0000 1.10
+++ openacs-4/packages/acs-content-repository/tcl/search-procs.tcl 26 Aug 2013 07:57:13 -0000 1.10.2.1
@@ -145,7 +145,7 @@
set package_id [apm_package_id_from_key search]
set driver [parameter::get -package_id $package_id -parameter FtsEngineDriver]
- array set result [acs_sc_call FtsEngineDriver search [list $q $offset $limit] $driver]
+ array set result [acs_sc::invoke -contract FtsEngineDriver -operation search -call_args [list $q $offset $limit] -impl $driver]
return $result(ids)
}
Index: openacs-4/packages/acs-tcl/tcl/user-extensions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/user-extensions-procs.tcl,v
diff -u -r1.5 -r1.5.10.1
--- openacs-4/packages/acs-tcl/tcl/user-extensions-procs.tcl 10 Jan 2007 21:22:12 -0000 1.5
+++ openacs-4/packages/acs-tcl/tcl/user-extensions-procs.tcl 26 Aug 2013 07:57:13 -0000 1.5.10.1
@@ -32,7 +32,7 @@
# Loop through the extensions
foreach extension $extensions {
- acs_sc_call UserData $op $list_of_args $extension
+ set r [acs_sc::invoke -contract UserData -operation $op -call_args $list_of_args -impl $extension]
}
}
Index: openacs-4/packages/categories/lib/contributions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/contributions.tcl,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/categories/lib/contributions.tcl 6 Oct 2007 13:48:29 -0000 1.3
+++ openacs-4/packages/categories/lib/contributions.tcl 26 Aug 2013 07:57:13 -0000 1.3.6.1
@@ -145,7 +145,7 @@
set last_modified [regsub -all { } [util::age_pretty -hours_limit 0 -mode_2_fmt "%X %a" -mode_3_fmt "%x" -timestamp_ansi $last_modified -sysdate_ansi $now] {\ }]
set user_url [acs_community_member_url -user_id $user_id]
- if {[catch {set url_one [acs_sc_call -error FtsContentProvider url [list $object_id] $object_type]} errMsg]} {
+ if {[catch {set url_one [acs_sc::invoke -error -contract FtsContentProvider -operation url -call_args [list $object_id] -impl $object_type]} errMsg]} {
global errorCode
set url_one $errorCode
}
Index: openacs-4/packages/notifications/tcl/delivery-method-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/delivery-method-procs.tcl,v
diff -u -r1.12 -r1.12.10.1
--- openacs-4/packages/notifications/tcl/delivery-method-procs.tcl 27 Jun 2007 18:54:48 -0000 1.12
+++ openacs-4/packages/notifications/tcl/delivery-method-procs.tcl 26 Aug 2013 07:57:13 -0000 1.12.10.1
@@ -53,7 +53,7 @@
set args [list $from_user_id $to_user_id $reply_object_id $notification_type_id $subject $content_text $content_html $file_ids]
# Make the generic call
- return [acs_sc_call NotificationDeliveryMethod Send $args $impl_key]
+ return [acs_sc::invoke -contract NotificationDeliveryMethod -operation Send -call_args $args -impl $impl_key]
}
ad_proc -public notification::delivery::scan_replies {
@@ -74,7 +74,7 @@
# ns_log Notice "NOTIF-DELIV-METHOD: about to call acs_sc on $impl_key"
# Make the generic call
- return [acs_sc_call NotificationDeliveryMethod ScanReplies $args $impl_key]
+ return [acs_sc::invoke -contract NotificationDeliveryMethod -operation ScanReplies -call_args $args -impl $impl_key]
}
ad_proc -public notification::delivery::new {
Index: openacs-4/packages/notifications/tcl/notification-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-type-procs.tcl,v
diff -u -r1.7 -r1.7.20.1
--- openacs-4/packages/notifications/tcl/notification-type-procs.tcl 14 Nov 2003 14:18:10 -0000 1.7
+++ openacs-4/packages/notifications/tcl/notification-type-procs.tcl 26 Aug 2013 07:57:13 -0000 1.7.20.1
@@ -147,7 +147,7 @@
set impl_key [get_impl_key -type_id $type_id]
# Dispatch to the notification type specific reply processing
- acs_sc_call NotificationType ProcessReply [list $reply_id] $impl_key
+ set r [acs_sc::invoke -contract NotificationType -operation ProcessReply -call_args [list $reply_id] -impl $impl_key]
}
}
Index: openacs-4/packages/notifications/www/object-goto.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/object-goto.tcl,v
diff -u -r1.2 -r1.2.22.1
--- openacs-4/packages/notifications/www/object-goto.tcl 17 May 2003 10:54:55 -0000 1.2
+++ openacs-4/packages/notifications/www/object-goto.tcl 26 Aug 2013 07:57:13 -0000 1.2.22.1
@@ -19,6 +19,6 @@
set sc_impl_name [db_string get_notif_type {}]
-set url [acs_sc_call NotificationType GetURL [list $object_id] $sc_impl_name]
+set url [acs_sc::invoke -contract NotificationType -operation GetURL -call_args [list $object_id] -impl $sc_impl_name]
ad_returnredirect $url
Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 21 Feb 2011 14:27:27 -0000 1.16
+++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl 26 Aug 2013 07:57:13 -0000 1.16.2.1
@@ -414,14 +414,14 @@
if {![acs_sc_binding_exists_p dav_mkcol_type $package_key]} {
set content_type "content_folder"
} else {
- set content_type [acs_sc_call dav_mkcol_type get_type "" $package_key]
+ set content_type [acs_sc::invoke -contract dav_mkcol_type -operation get_type -call_args "" -impl $package_key]
}
}
put {
if {![acs_sc_binding_exists_p dav_put_type $package_key]} {
set content_type "content_revision"
} else {
- set content_type [acs_sc_call dav_put_type get_type "" $package_key]
+ set content_type [acs_sc::invoke -contract dav_put_type -operation get_type -call_args "" -impl $package_key]
}
}
@@ -467,7 +467,7 @@
ns_log debug "\noacs_dav::handle_request method $method uri $uri item_id $item_id folder_id $folder_id package_id $package_id node_id $node_id content_type $content_type args $args"
- set response [acs_sc_call dav $method "" $content_type]
+ set response [acs_sc::invoke -contract dav -operation $method -call_args "" -impl $content_type]
# here the sc impl might return us some data,
# then we would probably have to send that to tDAV for processing
Index: openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 31 May 2013 20:27:17 -0000 1.20
+++ openacs-4/packages/rss-support/tcl/rss-generation-service-procs.tcl 26 Aug 2013 07:57:14 -0000 1.20.2.1
@@ -18,8 +18,7 @@
set n 0
db_foreach timed_out_subscriptions {} {
- set lastupdate [acs_sc_call RssGenerationSubscriber lastUpdated \
- $summary_context_id $impl_name]
+ set lastupdate [acs_sc::invoke -contract RssGenerationSubscriber -operation lastUpdated -call_args $summary_context_id -impl $impl_name]
if { $lastupdate > $lastbuild } {
# Old report is stale. Build a new one.
rss_gen_report $subscr_id
@@ -38,8 +37,7 @@
db_1row subscr_info {}
- set datasource [acs_sc_call RssGenerationSubscriber datasource \
- $summary_context_id $impl_name]
+ set datasource [acs_sc::invoke -contract RssGenerationSubscriber -operation datasource -call_args $summary_context_id -impl $impl_name]
if { [empty_string_p $datasource] } {
ns_log Error "Empty datasource returned from $impl_name for context $summary_context_id in rss_gen_report. Probably because the implementation hasn't been bound."
Index: openacs-4/packages/rss-support/www/subscr-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.tcl,v
diff -u -r1.7 -r1.7.20.1
--- openacs-4/packages/rss-support/www/subscr-ae.tcl 17 May 2003 11:23:29 -0000 1.7
+++ openacs-4/packages/rss-support/www/subscr-ae.tcl 26 Aug 2013 07:57:14 -0000 1.7.20.1
@@ -64,8 +64,7 @@
# This is a convenient way to use a contracted operation
# but is not terribly efficient since we only need the channel title
# and link, and not the whole summary.
- foreach {name val} [acs_sc_call RssGenerationSubscriber datasource \
- $summary_context_id $impl_name] {
+ foreach {name val} [acs_sc::invoke -contract RssGenerationSubscriber -operation datasource -call_args $summary_context_id -impl $impl_name] {
if { [lsearch {channel_title channel_link} $name] >= 0 } {
set $name $val
}
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.47 -r1.47.6.1
--- openacs-4/packages/search/tcl/search-procs.tcl 30 Mar 2010 21:42:03 -0000 1.47
+++ openacs-4/packages/search/tcl/search-procs.tcl 26 Aug 2013 07:57:14 -0000 1.47.6.1
@@ -140,7 +140,7 @@
#ns_log notice "\n-----DB-----\n SEARCH INDEX callback datasource exists for object_type '${object_type}'\n------------\n "
array set datasource [lindex [callback -impl $object_type search::datasource -object_id $object_id] 0]
} else {
- array set datasource [acs_sc_call FtsContentProvider datasource [list $object_id] $object_type]
+ array set datasource [acs_sc::invoke -contract FtsContentProvider -operation datasource -call_args [list $object_id] -impl $object_type]
}
search::content_get txt $datasource(content) $datasource(mime) $datasource(storage_type) $object_id
@@ -155,9 +155,7 @@
}
callback -impl $driver search::index -object_id $object_id -content $txt -title $datasource(title) -keywords $datasource(keywords) -package_id $datasource(package_id) -community_id $datasource(community_id) -relevant_date $datasource(relevant_date) -datasource datasource
} else {
- acs_sc_call FtsEngineDriver \
- [ad_decode $event UPDATE update_index index] \
- [list $datasource(object_id) $txt $datasource(title) $datasource(keywords)] $driver
+ set r [acs_sc::invoke -contract FtsEngineDriver -operation [ad_decode $event UPDATE update_index index] -call_args [list $datasource(object_id) $txt $datasource(title) $datasource(keywords)] -impl $driver]
}
} errMsg]} {
ns_log Error "search::indexer: error getting datasource for $object_id $object_type: $errMsg\n[ad_print_stack_trace]\n"
@@ -179,7 +177,7 @@
}
DELETE {
if {[catch {
- acs_sc_call FtsEngineDriver unindex [list $object_id] $driver
+ set r [acs_sc::invoke -contract FtsEngineDriver -operation unindex -call_args [list $object_id] -impl $driver]
} errMsg]} {
ns_log Error "search::indexer: error unindexing $object_id [acs_object_type $object_id]: $errMsg\n[ad_print_stack_trace]\n"
} else {
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"