Index: openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 8 Dec 2012 18:20:36 -0000 1.25 +++ openacs-4/packages/acs-service-contract/tcl/acs-service-contract-procs.tcl 25 Aug 2013 20:03:54 -0000 1.25.2.1 @@ -52,7 +52,19 @@ if { $impl eq "" || $contract eq "" } { error "You must supply either impl_id, or contract and impl to acs_sc::invoke" } - return [acs_sc_call -error=$error_p $contract $operation $call_args $impl] + + set proc_name [acs_sc_generate_name $contract $impl $operation] + + if { [info commands $proc_name] ne "" } { + return [ad_apply $proc_name $call_args] + } + + if { $error_p } { + error "Operation $operation is not implemented in '$impl' implementation of contract '$contract'" + } else { + ns_log warning "ACS-SC: Function Not Found: $proc_name [info commands $proc_name]" + } + return } @@ -118,9 +130,6 @@ } - - - ad_proc -private acs_sc_proc { contract operation @@ -230,9 +239,6 @@ return $full_statement } - - - ad_proc -private -deprecated acs_sc_call { {-error:boolean} contract @@ -252,19 +258,9 @@ @see acs_sc::invoke } { - set proc_name [acs_sc_generate_name $contract $impl $operation] + acs_sc::invoke -contract $contract -operation $operation -impl $impl -call_args $arguments -error=$error_p +} - if { [info commands $proc_name] ne "" } { - return [ad_apply $proc_name $arguments] - } else { - if { $error_p } { - error "Operation $operation is not implemented in '$impl' implementation of contract '$contract'" - } else { - ns_log warning "ACS-SC: Function Not Found: $proc_name [info commands $proc_name]" - } - return - } -} ##