Index: openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql	15 May 2002 17:36:09 -0000	1.4
+++ openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-create.sql	15 May 2002 19:30:42 -0000	1.5
@@ -114,13 +114,6 @@
         impl_pl => 'TCL'
     );
 
-    -- Add the binding
-    acs_sc_binding.new (
-        contract_name => 'dotlrn_applet',
-        impl_name => 'dotlrn_research'
-    );
-
-
     -- AddPortlet
     foo := acs_sc_impl.new_alias (
         impl_contract_name => 'dotlrn_applet',
@@ -148,6 +141,12 @@
         impl_pl => 'TCL'
     );
 
+    -- Add the binding
+    acs_sc_binding.new (
+        contract_name => 'dotlrn_applet',
+        impl_name => 'dotlrn_research'
+    );
+
 end;
 /
 show errors
Index: openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-drop.sql	29 Mar 2002 19:22:48 -0000	1.2
+++ openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-applet-drop.sql	15 May 2002 19:30:42 -0000	1.3
@@ -45,18 +45,25 @@
         impl_operation_name => 'AddApplet'
     );
 
+    -- RemoveApplet
+    foo := acs_sc_impl.delete_alias (
+        impl_contract_name => 'dotlrn_applet',
+        impl_name => 'dotlrn_research',
+        impl_operation_name => 'RemoveApplet'
+    );
+
     -- AddAppletToCommunity
     foo := acs_sc_impl.delete_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_research',
         impl_operation_name => 'AddAppletToCommunity'
     );
 
-    -- RemoveApplet
+    -- RemoveAppletFromCommunity
     foo := acs_sc_impl.delete_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_research',
-        impl_operation_name => 'RemoveApplet'
+        impl_operation_name => 'RemoveAppletFromCommunity'
     );
 
     -- AddUser
@@ -66,18 +73,18 @@
         impl_operation_name => 'AddUser'
     );
 
-    -- AddUserToCommunity
+    -- RemoveUser
     foo := acs_sc_impl.delete_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_research',
-        impl_operation_name => 'AddUserToCommunity'
+        impl_operation_name => 'RemoveUser'
     );
 
-    -- RemoveUser
+    -- AddUserToCommunity
     foo := acs_sc_impl.delete_alias (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_research',
-        impl_operation_name => 'RemoveUser'
+        impl_operation_name => 'AddUserToCommunity'
     );
 
     -- RemoveUserFromCommunity
@@ -87,6 +94,27 @@
         impl_operation_name => 'RemoveUserFromCommunity'
     );
 
+    -- AddPortlet
+    foo := acs_sc_impl.delete_alias (
+        impl_contract_name => 'dotlrn_applet',
+        impl_name => 'dotlrn_research',
+        impl_operation_name => 'AddPortlet'
+    );
+
+    -- RemovePortlet
+    foo := acs_sc_impl.delete_alias (
+        impl_contract_name => 'dotlrn_applet',
+        impl_name => 'dotlrn_research',
+        impl_operation_name => 'RemovePortlet'
+    );
+
+    -- Clone
+    foo := acs_sc_impl.delete_alias (
+        impl_contract_name => 'dotlrn_applet',
+        impl_name => 'dotlrn_research',
+        impl_operation_name => 'Clone'
+    );
+
     acs_sc_impl.delete (
         impl_contract_name => 'dotlrn_applet',
         impl_name => 'dotlrn_research'
Index: openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-create.sql	29 Mar 2002 19:22:48 -0000	1.3
+++ openacs-4/packages/dotlrn-research/sql/oracle/dotlrn-research-create.sql	15 May 2002 19:30:42 -0000	1.4
@@ -24,7 +24,7 @@
 
 create table dotlrn_research_papers (
     community_id                constraint dotlrn_rp_community_id_fk
-                                references dotlrn_communities (community_id)
+                                references dotlrn_communities_all (community_id)
                                 constraint dotlrn_rp_community_id_nn
                                 not null,
     file_id                     constraint dotlrn_rp_file_id_fk
Index: openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/Attic/research-admin-portlet-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-create.sql	29 Mar 2002 19:22:48 -0000	1.2
+++ openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-create.sql	15 May 2002 19:30:42 -0000	1.3
@@ -98,8 +98,8 @@
     foo := acs_sc_impl.new_alias(
         'portal_datasource',
         'research_admin_portlet',
-        'MyName',
-        'research_admin_portlet::my_name',
+        'GetMyName',
+        'research_admin_portlet::get_my_name',
         'TCL'
     );
 
@@ -151,22 +151,6 @@
         'TCL'
     );
 
-    foo := acs_sc_impl.new_alias(
-        'portal_datasource',
-        'research_admin_portlet',
-        'MakeSelfAvailable',
-        'research_admin_portlet::make_self_available',
-        'TCL'
-    );
-
-    foo := acs_sc_impl.new_alias(
-        'portal_datasource',
-        'research_admin_portlet',
-        'MakeSelfUnavailable',
-        'research_admin_portlet::make_self_unavailable',
-        'TCL'
-    );
-
     -- Add the binding
     acs_sc_binding.new(
         contract_name => 'portal_datasource',
Index: openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/Attic/research-admin-portlet-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-drop.sql	29 Mar 2002 19:22:48 -0000	1.2
+++ openacs-4/packages/dotlrn-research/sql/oracle/research-admin-portlet-drop.sql	15 May 2002 19:30:42 -0000	1.3
@@ -48,7 +48,7 @@
     foo := acs_sc_impl.delete_alias(
         impl_contract_name => 'portal_datasource',
         impl_name => 'research_admin_portlet',
-        impl_operation_name => 'MyName'
+        impl_operation_name => 'GetMyName'
     );
 
     foo := acs_sc_impl.delete_alias(
@@ -87,18 +87,6 @@
         impl_operation_name => 'RemoveSelfFromPage'
     );
 
-    foo := acs_sc_impl.delete_alias(
-        impl_contract_name => 'portal_datasource',
-        impl_name => 'research_admin_portlet',
-        impl_operation_name => 'MakeSelfAvailable'
-    );
-
-    foo := acs_sc_impl.delete_alias(
-        impl_contract_name => 'portal_datasource',
-        impl_name => 'research_admin_portlet',
-        impl_operation_name => 'MakeSelfUnavailable'
-    );
-
     acs_sc_impl.delete(
         impl_contract_name => 'portal_datasource',
         impl_name => 'research_admin_portlet'
Index: openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/Attic/research-portlet-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-create.sql	29 Mar 2002 19:22:48 -0000	1.2
+++ openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-create.sql	15 May 2002 19:30:42 -0000	1.3
@@ -97,8 +97,8 @@
     foo := acs_sc_impl.new_alias(
         'portal_datasource',
         'research_portlet',
-        'MyName',
-        'research_portlet::my_name',
+        'GetMyName',
+        'research_portlet::get_my_name',
         'TCL'
     );
 
@@ -150,22 +150,6 @@
         'TCL'
     );
 
-    foo := acs_sc_impl.new_alias(
-        'portal_datasource',
-        'research_portlet',
-        'MakeSelfAvailable',
-        'research_portlet::make_self_available',
-        'TCL'
-    );
-
-    foo := acs_sc_impl.new_alias(
-        'portal_datasource',
-        'research_portlet',
-        'MakeSelfUnavailable',
-        'research_portlet::make_self_unavailable',
-        'TCL'
-    );
-
     -- Add the binding
     acs_sc_binding.new(
         contract_name => 'portal_datasource',
Index: openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/sql/oracle/Attic/research-portlet-drop.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-drop.sql	29 Mar 2002 19:22:48 -0000	1.3
+++ openacs-4/packages/dotlrn-research/sql/oracle/research-portlet-drop.sql	15 May 2002 19:30:42 -0000	1.4
@@ -26,8 +26,7 @@
     ds_id                       portal_datasources.datasource_id%TYPE;
     foo                         integer;
 begin
-
-    begin 
+    begin
         select datasource_id
         into ds_id
         from portal_datasources
@@ -87,18 +86,6 @@
         impl_operation_name => 'RemoveSelfFromPage'
     );
 
-    foo := acs_sc_impl.delete_alias(
-        impl_contract_name => 'portal_datasource',
-        impl_name => 'research_portlet',
-        impl_operation_name => 'MakeSelfAvailable'
-    );
-
-    foo := acs_sc_impl.delete_alias(
-        impl_contract_name => 'portal_datasource',
-        impl_name => 'research_portlet',
-        impl_operation_name => 'MakeSelfUnavailable'
-    );
-
     acs_sc_impl.delete(
         impl_contract_name => 'portal_datasource',
         impl_name => 'research_portlet'
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn-research/tcl/dotlrn-research-admin-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl	12 May 2002 18:15:04 -0000	1.9
+++ openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl	15 May 2002 19:30:42 -0000	1.10
@@ -91,8 +91,10 @@
             -mount_point "research-papers" $community_id [package_key]]
 
         research_portlet::add_self_to_page -portal_id $portal_id -package_id "" -party_id $community_id
-
-        dotlrn_research_admin::add_applet_to_community $community_id
+        
+        # set up the admin portlet
+        set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id]
+        research_admin_portlet::add_self_to_page -portal_id $portal_id -package_id "" -party_id $community_id
     }
 
     ad_proc -public remove_applet_from_community {
@@ -131,4 +133,24 @@
     } {
     }
 
+    ad_proc -public add_portlet {
+        portal_id
+        args
+    } {
+    } {
+    }
+
+    ad_proc -public remove_portlet {
+        portal_id
+        args
+    } {
+    } {
+    }
+
+    ad_proc -public clone {
+        old_community_id
+        new_community_id
+    } {
+    } {
+    }
 }
Index: openacs-4/packages/dotlrn-research/tcl/research-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/tcl/Attic/research-admin-portlet-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-research/tcl/research-admin-portlet-procs.tcl	12 May 2002 18:15:04 -0000	1.3
+++ openacs-4/packages/dotlrn-research/tcl/research-admin-portlet-procs.tcl	15 May 2002 19:30:42 -0000	1.4
@@ -33,7 +33,7 @@
         return "dotlrn-research"
     }
 
-    ad_proc -private my_name {
+    ad_proc -private get_my_name {
     } {
         return "research_admin_portlet"
     }
@@ -66,7 +66,7 @@
         return [portal::add_element_or_append_id \
             -portal_id $portal_id \
             -page_name $page_name \
-            -portlet_name [my_name] \
+            -portlet_name [get_my_name] \
             -key "party_id" \
             -value_id $party_id
         ]
@@ -85,7 +85,7 @@
     } {
         portal::remove_element_or_remove_id \
             -portal_id $portal_id \
-            -portlet_name [my_name] \
+            -portlet_name [get_my_name] \
             -key "party_id" \
             -value_id $party_id
     }
@@ -98,7 +98,7 @@
  	@param portal_id
     } {
  	portal::make_datasource_available \
-            $portal_id [portal::get_datasource_id [my_name]]
+            $portal_id [portal::get_datasource_id [get_my_name]]
     }
 
     ad_proc -public make_self_unavailable {
@@ -109,7 +109,7 @@
 	@param portal_id
     } {
 	portal::make_datasource_unavailable \
-            $portal_id [portal::get_datasource_id [my_name]]
+            $portal_id [portal::get_datasource_id [get_my_name]]
     }
 
     ad_proc -public show {
Index: openacs-4/packages/dotlrn-research/tcl/research-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/tcl/Attic/research-portlet-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-research/tcl/research-portlet-procs.tcl	12 May 2002 18:15:04 -0000	1.4
+++ openacs-4/packages/dotlrn-research/tcl/research-portlet-procs.tcl	15 May 2002 19:30:42 -0000	1.5
@@ -33,7 +33,7 @@
         return "dotlrn-research"
     }
 
-    ad_proc -private my_name {
+    ad_proc -private get_my_name {
     } {
         return "research_portlet"
     }
@@ -66,7 +66,7 @@
         return [portal::add_element_or_append_id \
             -portal_id $portal_id \
             -page_name $page_name \
-            -portlet_name [my_name] \
+            -portlet_name [get_my_name] \
             -pretty_name [get_pretty_name] \
             -key "party_id" \
             -value_id $party_id
@@ -86,7 +86,7 @@
     } {
         portal::remove_element_or_remove_id \
             -portal_id $portal_id \
-            -portlet_name [my_name] \
+            -portlet_name [get_my_name] \
             -key "party_id" \
             -value_id $party_id
     }
@@ -99,7 +99,7 @@
  	@param portal_id
     } {
  	portal::make_datasource_available \
-            $portal_id [portal::get_datasource_id [my_name]]
+            $portal_id [portal::get_datasource_id [get_my_name]]
     }
 
     ad_proc -public make_self_unavailable {
@@ -110,7 +110,7 @@
 	@param portal_id
     } {
 	portal::make_datasource_unavailable \
-            $portal_id [portal::get_datasource_id [my_name]]
+            $portal_id [portal::get_datasource_id [get_my_name]]
     }
 
     ad_proc -public show {