Index: openacs-4/packages/acs-service-contract/acs-service-contract.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/acs-service-contract.info,v diff -u -r1.22.2.10 -r1.22.2.11 --- openacs-4/packages/acs-service-contract/acs-service-contract.info 10 Jan 2005 01:57:08 -0000 1.22.2.10 +++ openacs-4/packages/acs-service-contract/acs-service-contract.info 4 Feb 2005 20:12:42 -0000 1.22.2.11 @@ -7,7 +7,7 @@ t t - + OpenACS API and UI for service contracts 2005-01-09 @@ -17,7 +17,7 @@ Examples are the contracts used for search which provide a means to get content on a given object and to translate an object_id to a url or the contracts used by dotlrn and new-portals to allow packages to provide portalized panes. - + Index: openacs-4/packages/acs-service-contract/tcl/implementation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/implementation-procs.tcl,v diff -u -r1.9.4.1 -r1.9.4.2 --- openacs-4/packages/acs-service-contract/tcl/implementation-procs.tcl 16 Apr 2004 14:38:59 -0000 1.9.4.1 +++ openacs-4/packages/acs-service-contract/tcl/implementation-procs.tcl 4 Feb 2005 20:12:43 -0000 1.9.4.2 @@ -132,8 +132,13 @@ ad_proc -public acs_sc::impl::get_id { {-owner:required} {-name:required} + -contract } { - return [db_string select_impl_id {}] + if {[exists_and_not_null contract]} { + return [db_string select_impl_id_with_contract {}] + } else { + return [db_string select_impl_id {}] + } } ad_proc -public acs_sc::impl::get { Index: openacs-4/packages/acs-service-contract/tcl/implementation-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/tcl/implementation-procs.xql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/acs-service-contract/tcl/implementation-procs.xql 10 Sep 2003 14:52:01 -0000 1.3 +++ openacs-4/packages/acs-service-contract/tcl/implementation-procs.xql 4 Feb 2005 20:12:43 -0000 1.3.4.1 @@ -11,6 +11,16 @@ + + + select impl_id + from acs_sc_impls + where impl_owner_name = :owner + and impl_name = :name + and impl_contract_name = :contract + + + select impl_name,