Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -N -r1.158 -r1.159
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	13 Jul 2002 00:13:09 -0000	1.158
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	13 Jul 2002 00:16:37 -0000	1.159
@@ -1355,10 +1355,10 @@
         return [db_string select_admin_portal_id {}]
     }
 
-    ad_proc -public register_community_applet {
+    ad_proc -public register_applet {
         {-community_id:required}
         {-package_id:required}
-        {-applet_key ""}
+        {-applet_key:required}
     } {
         Helper proc for add_applet_to_community and clone, since
         they both need to set up the community <-> applet map
@@ -1382,7 +1382,7 @@
                 AddAppletToCommunity \
                 [list $community_id]]
             
-            register_community_applet \
+            register_applet \
                 -community_id $community_id \
                 -package_id $package_id \
                 -applet_key $applet_key
@@ -1594,7 +1594,7 @@
                     [list $community_id $clone_id]
                 ]
 
-                register_community_applet \
+                register_applet \
                     -community_id $clone_id \
                     -package_id $package_id \
                     -applet_key $applet_key
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -N -r1.74 -r1.75
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	13 Jul 2002 00:13:09 -0000	1.74
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	13 Jul 2002 00:16:37 -0000	1.75
@@ -306,12 +306,12 @@
 
     <fullquery name="dotlrn_community::get_applet_package_id.select_package_id">
         <querytext>
-            select package_id
-            from dotlrn_community_applets dca,
-                 dotlrn_applets da
-            where community_id = :community_id
-            and applet_key = :applet_key
-            and dca.applet_id = da.applet_id
+            select dotlrn_community_applets.package_id
+            from dotlrn_community_applets,
+                 dotlrn_applets
+            where dotlrn_community_applets.community_id = :community_id
+            and dotlrn_community_applets.applet_id = dotlrn_applets.applet_id
+            and dotlrn_applets.applet_key = :applet_key
         </querytext>
     </fullquery>
 
@@ -444,7 +444,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_community::register_community_applet.insert">
+    <fullquery name="dotlrn_community::register_applet.insert">
         <querytext>
             insert into dotlrn_community_applets
             (community_id, applet_id, package_id, active_p)
Index: openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl,v
diff -u -N -r1.41 -r1.42
--- openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl	29 May 2002 23:00:25 -0000	1.41
+++ openacs-4/packages/dotlrn-bboard/tcl/dotlrn-bboard-procs.tcl	13 Jul 2002 00:16:37 -0000	1.42
@@ -185,8 +185,8 @@
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set package_id [dotlrn_community::get_applet_package_id \
-                            $community_id \
-                            [applet_key]
+            -community_id $community_id \
+            -applet_key [applet_key]
         ]
         set args [ns_set create]
         ns_set put $args package_id $package_id
@@ -208,15 +208,16 @@
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set package_id [dotlrn_community::get_applet_package_id \
-                            $community_id \
-                            [applet_key]
+            -community_id $community_id \
+            -applet_key [applet_key]
         ]
 
         set args [ns_set create]
         ns_set put $args package_id $package_id
 
         remove_portlet $portal_id $args
     }
+
     ad_proc -public add_portlet {
         portal_id
     } {
Index: openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	13 Jul 2002 00:13:10 -0000	1.36
+++ openacs-4/packages/dotlrn-faq/tcl/dotlrn-faq-procs.tcl	13 Jul 2002 00:16:37 -0000	1.37
@@ -144,8 +144,8 @@
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set package_id [dotlrn_community::get_applet_package_id \
-                            $community_id \
-                            [applet_key]
+            -community_id $community_id \
+            -applet_key [applet_key]
         ]
 
         set args [ns_set create]
@@ -168,8 +168,8 @@
     } {
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set package_id [dotlrn_community::get_applet_package_id \
-                            $community_id \
-                            [applet_key]
+            -community_id $community_id \
+            -applet_key [applet_key]
         ]
 
         set args [ns_set create]
@@ -231,8 +231,8 @@
         ns_log notice "Cloning: [applet_key]"
         set new_package_id [add_applet_to_community $new_community_id]
         set old_package_id [dotlrn_community::get_applet_package_id \
-                                $old_community_id \
-                                [applet_key]
+            -community_id $old_community_id \
+            -applet_key [applet_key]
         ]
 
         db_exec_plsql call_faq_clone {}
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -N -r1.74 -r1.75
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	13 Jul 2002 00:13:10 -0000	1.74
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	13 Jul 2002 00:16:37 -0000	1.75
@@ -323,7 +323,7 @@
         Add a user to a to a specifc dotlrn community
     } {
         # Get the package_id by callback
-        set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
+        set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set folder_id [fs::get_root_folder -package_id $package_id]
 
@@ -341,7 +341,7 @@
     } {
         Remove a user from a community
     } {
-        set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
+        set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
         set folder_id [fs::get_root_folder -package_id $package_id]
 
@@ -446,8 +446,8 @@
         
         # get the old comm's root folder id
         set old_package_id [dotlrn_community::get_applet_package_id \
-            $old_community_id \
-            [applet_key]
+            -community_id $old_community_id \
+            -applet_key [applet_key]
         ]
         set old_root_folder [fs::get_root_folder -package_id $old_package_id]
         
Index: openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl,v
diff -u -N -r1.25 -r1.26
--- openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	13 Jul 2002 00:13:10 -0000	1.25
+++ openacs-4/packages/dotlrn-news/tcl/dotlrn-news-procs.tcl	13 Jul 2002 00:16:37 -0000	1.26
@@ -115,7 +115,7 @@
     } {
 	Add a user to a specifc dotlrn community
     } {
-        set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
+        set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
 
         # use "append" here since we want to aggregate
@@ -131,7 +131,7 @@
     } {
         Remove a user from a community
     } {
-        set package_id [dotlrn_community::get_applet_package_id $community_id [applet_key]]
+        set package_id [dotlrn_community::get_applet_package_id -community_id $community_id -applet_key [applet_key]]
         set portal_id [dotlrn::get_portal_id -user_id $user_id]
 
         set args [ns_set create]
@@ -193,8 +193,8 @@
         ns_log notice "Cloning: [applet_key]"
         set new_package_id [add_applet_to_community $new_community_id]
         set old_package_id [dotlrn_community::get_applet_package_id \
-                                $old_community_id \
-                                [applet_key]
+            -community_id $old_community_id \
+            -applet_key [applet_key]
         ]
 
         db_exec_plsql call_news_clone {}