Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -N -r1.117.2.1 -r1.117.2.2
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	16 Apr 2019 09:22:53 -0000	1.117.2.1
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	13 Dec 2019 15:02:11 -0000	1.117.2.2
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="5.10.0d7" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.0d7.apm">
+    <version name="5.10.0d8" url="http://openacs.org/repository/download/apm/acs-content-repository-5.10.0d8.apm">
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
         <owner url="http://openacs.org">OpenACS</owner>
@@ -21,7 +21,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-content-repository" version="5.10.0d7"/>
+        <provides url="acs-content-repository" version="5.10.0d8"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="acs-service-contract" version="5.9.1"/>
         <requires url="acs-tcl" version="5.10.0d9"/>
Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-search.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-search.sql,v
diff -u -N -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-content-repository/sql/postgresql/content-search.sql	7 Aug 2017 23:47:47 -0000	1.11
+++ openacs-4/packages/acs-content-repository/sql/postgresql/content-search.sql	13 Dec 2019 15:02:11 -0000	1.11.2.1
@@ -14,15 +14,15 @@
            'FtsContentProvider',		-- impl_contract_name
            'content_revision',                  -- impl_name
 	   'datasource',			-- impl_operation_name
-	   'content_search__datasource',        -- impl_alias
+	   'content_search::datasource',        -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
 select acs_sc_impl_alias__new(
            'FtsContentProvider',		-- impl_contract_name
            'content_revision',                  -- impl_name
 	   'url',				-- impl_operation_name
-	   'content_search__url',               -- impl_alias
+	   'content_search::url',               -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
@@ -38,15 +38,15 @@
            'FtsContentProvider',		-- impl_contract_name
            'image',                             -- impl_name
 	   'datasource',			-- impl_operation_name
-	   'image_search__datasource',          -- impl_alias
+	   'image_search::datasource',          -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
 select acs_sc_impl_alias__new(
            'FtsContentProvider',		-- impl_contract_name
            'image',                             -- impl_name
 	   'url',				-- impl_operation_name
-	   'image_search__url',                 -- impl_alias
+	   'image_search::url',                 -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
@@ -62,15 +62,15 @@
            'FtsContentProvider',		-- impl_contract_name
            'content_template',                  -- impl_name
 	   'datasource',			-- impl_operation_name
-	   'template_search__datasource',       -- impl_alias
+	   'template_search::datasource',       -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
 select acs_sc_impl_alias__new(
            'FtsContentProvider',		-- impl_contract_name
            'content_template',                  -- impl_name
 	   'url',				-- impl_operation_name
-	   'template_search__url',              -- impl_alias
+	   'template_search::url',              -- impl_alias
 	   'TCL'				-- impl_pl
 );
 
Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.10.0d7-5.10.0d8.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/Attic/upgrade-5.10.0d7-5.10.0d8.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.10.0d7-5.10.0d8.sql	13 Dec 2019 15:02:11 -0000	1.1.2.1
@@ -0,0 +1,31 @@
+begin;
+
+-- S.C. implementations have been renamed to comply with OpenACS
+-- naming convention
+
+update acs_sc_impl_aliases set
+  impl_alias = 'content_search::datasource'
+where impl_alias = 'content_search__datasource';
+
+update acs_sc_impl_aliases set
+  impl_alias = 'content_search::url'
+where impl_alias = 'content_search__url';
+
+update acs_sc_impl_aliases set
+  impl_alias = 'image_search::datasource'
+where impl_alias = 'image_search__datasource';
+
+update acs_sc_impl_aliases set
+  impl_alias = 'image_search::url'
+where impl_alias = 'image_search__url';
+
+update acs_sc_impl_aliases set
+  impl_alias = 'template_search::datasource'
+where impl_alias = 'template_search__datasource';
+
+update acs_sc_impl_aliases set
+  impl_alias = 'template_search::url'
+where impl_alias = 'template_search__url';
+
+
+end;
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 -N -r1.14.2.3 -r1.14.2.4
--- openacs-4/packages/acs-content-repository/tcl/search-procs.tcl	13 Dec 2019 14:31:20 -0000	1.14.2.3
+++ openacs-4/packages/acs-content-repository/tcl/search-procs.tcl	13 Dec 2019 15:02:11 -0000	1.14.2.4
@@ -5,12 +5,93 @@
     contracts.
 }
 
-ad_proc content_search__datasource {
+ad_proc -deprecated content_search__datasource {
     object_id
 } {
     Provides data source for search interface.  Used to access content items
     after search.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see content_search::datasource
 } {
+    return [content_search::datasource $object_id]
+}
+
+ad_proc -deprecated content_search__url {
+    object_id
+} {
+    Provides a URL for linking to content items which show up in a search
+    result set.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see content_search::url
+} {
+    return [content_search::url $object_id]
+}
+
+ad_proc -deprecated image_search__datasource {
+    object_id
+} {
+    Provides data source for search interface.  Used to access content items
+    after search.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see image_search::datasource
+} {
+    return [image_search::datasource $object_id]
+}
+
+ad_proc -deprecated image_search__url {
+    object_id
+} {
+    Provides a URL for linking to content items which show up in a search
+    result set.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see image_search::url
+} {
+    return [image_search::url $object_id]
+}
+
+ad_proc -deprecated template_search__datasource {
+    object_id
+} {
+    Provides data source for search interface.  Used to access content items
+    after search.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see template_search::datasource
+} {
+    return [template_search::datasource $object_id]
+}
+
+ad_proc -deprecated template_search__url {
+    object_id
+} {
+    Provides a URL for linking to content items which show up in a search
+    result set.
+
+    DEPRECATED: does not comply with OpenACS naming convention
+
+    @see template_search::url
+} {
+    return [template_search::url $object_id]
+}
+
+
+namespace eval content_search {}
+
+ad_proc content_search::datasource {
+    object_id
+} {
+    Provides data source for search interface.  Used to access content items
+    after search.
+} {
     set cr_fs_path [cr_fs_path]
     db_0or1row revisions_datasource {
 	select r.revision_id as object_id,
@@ -32,7 +113,7 @@
 }
 
 
-ad_proc content_search__url {
+ad_proc content_search::url {
     object_id
 } {
     Provides a URL for linking to content items which show up in a search
@@ -52,7 +133,25 @@
     return "[ad_url][string trimright $root_url /]$url?revision_id=$object_id"
 }
 
-ad_proc image_search__datasource {
+ad_proc content_search::search_ids {
+    q
+    { offset 0 }
+    { limit 100 }
+} {
+    Returns the object ids for a specified search.
+} {
+    set package_id [apm_package_id_from_key search]
+    set driver [parameter::get -package_id $package_id -parameter FtsEngineDriver]
+    array set result [acs_sc::invoke -contract FtsEngineDriver \
+                          -operation search -call_args [list $q $offset $limit] -impl $driver]
+
+    return $result(ids)
+}
+
+
+namespace eval image_search {}
+
+ad_proc image_search::datasource {
     object_id
 } {
     Provides data source for search interface.  Used to access content items
@@ -73,18 +172,19 @@
     return [array get datasource]
 }
 
-
-ad_proc image_search__url {
+ad_proc image_search::url {
     object_id
 } {
     Provides a URL for linking to content items which show up in a search
     result set.
 } {
-    return [content_search__url $object_id]
+    return [content_search::url $object_id]
 }
 
 
-ad_proc template_search__datasource {
+namespace eval template_search {}
+
+ad_proc template_search::datasource {
     object_id
 } {
     Provides data source for search interface.  Used to access content items
@@ -111,32 +211,15 @@
     return [array get datasource]
 }
 
-
-ad_proc template_search__url {
+ad_proc template_search::url {
     object_id
 } {
     Provides a URL for linking to content items which show up in a search
     result set.
 } {
-    return [content_search__url $object_id]
+    return [content_search::url $object_id]
 }
 
-
-ad_proc content_search__search_ids {
-    q
-    { offset 0 }
-    { limit 100 }
-} {
-    Returns the object ids for a specified search.
-} {
-    set package_id [apm_package_id_from_key search]
-    set driver [parameter::get -package_id $package_id -parameter FtsEngineDriver]
-    array set result [acs_sc::invoke -contract FtsEngineDriver \
-                          -operation search -call_args [list $q $offset $limit] -impl $driver]
-
-    return $result(ids)
-}
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4