Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/dotlrn/dotlrn.info	4 Mar 2002 22:10:43 -0000	1.56
+++ openacs-4/packages/dotlrn/dotlrn.info	5 Mar 2002 22:43:32 -0000	1.57
@@ -318,8 +318,6 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_name"  default="Department" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="departments_pretty_plural"  default="Departments" description="used everywhere in the ui"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultCommunityApplets"  default="dotlrn_dotlrn,dotlrn_bboard,dotlrn_calendar,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_name"  default="Subgroup" description="what subcomms are called"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="subcommunities_pretty_plural"  default="Subgroups" description="the plural"/>
         </parameters>
 
     </version>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/research-paper-add.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/research-paper-add.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/research-paper-remove.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/research-paper-remove.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn-research/dotlrn-research.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/dotlrn-research.info,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn-research/dotlrn-research.info	5 Mar 2002 07:19:29 -0000	1.3
+++ openacs-4/packages/dotlrn-research/dotlrn-research.info	5 Mar 2002 22:43:44 -0000	1.4
@@ -20,11 +20,25 @@
 
         <files>
             <file type="package_spec" path="dotlrn-research.info"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-research-applet-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/dotlrn-research-applet-drop.sql"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-research-create.sql"/>
+            <file type="data_model_drop" db_type="oracle" path="sql/oracle/dotlrn-research-drop.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/research-admin-portlet-create.sql"/>
+            <file type="data_model" db_type="oracle" path="sql/oracle/research-admin-portlet-drop.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/research-portlet-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/research-portlet-drop.sql"/>
+            <file type="tcl_procs" path="tcl/dotlrn-research-admin-procs.tcl"/>
             <file type="tcl_procs" path="tcl/dotlrn-research-procs.tcl"/>
+            <file type="tcl_procs" path="tcl/research-admin-portlet-procs.tcl"/>
             <file type="tcl_procs" path="tcl/research-portlet-procs.tcl"/>
+            <file type="content_page" path="www/add.tcl"/>
+            <file type="query_file" path="www/add.xql"/>
+            <file type="content_page" path="www/remove.tcl"/>
+            <file type="query_file" path="www/remove.xql"/>
+            <file type="query_file" db_type="oracle" path="www/research-admin-portlet-oracle.xql"/>
+            <file type="content_page" path="www/research-admin-portlet.adp"/>
+            <file type="content_page" path="www/research-admin-portlet.tcl"/>
             <file type="query_file" db_type="oracle" path="www/research-portlet-oracle.xql"/>
             <file type="content_page" path="www/research-portlet.adp"/>
             <file type="content_page" path="www/research-portlet.tcl"/>
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.3 -r1.4
--- openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl	5 Mar 2002 16:23:15 -0000	1.3
+++ openacs-4/packages/dotlrn-research/tcl/dotlrn-research-procs.tcl	5 Mar 2002 22:38:28 -0000	1.4
@@ -21,7 +21,7 @@
     } {
         get the package_key this applet deals with
     } {
-        return "file-storage"
+        return "dotlrn-research"
     }
 
     ad_proc portal_element_key {
@@ -51,11 +51,20 @@
         dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key]
     }
 
+    ad_proc -public remove_applet {
+    } {
+        Used for one-time destroy - must be repeatable!
+    } {
+    }
+
     ad_proc -public add_applet_to_community {
         community_id
     } {
         Add the research paper applet to a specifc dotlrn community
     } {
+	set instance_id [dotlrn::instantiate_and_mount \
+            -mount_point "research-papers" $community_id [package_key]]
+
         # get the portal_template_id by callback
         set pt_id [dotlrn_community::get_portal_template_id $community_id]
 
@@ -65,9 +74,8 @@
         dotlrn_research_admin::add_applet_to_community $community_id
     }
 
-    ad_proc -public remove_applet {
+    ad_proc -public remove_applet_from_community {
         community_id
-        package_id
     } {
         remove the applet from the community
     } {
@@ -80,6 +88,12 @@
     } {
     }
 
+    ad_proc -public remove_user {
+        user_id
+    } {
+    } {
+    }
+
     ad_proc -public add_user_to_community {
         community_id
         user_id
@@ -94,12 +108,6 @@
         research_portlet::add_self_to_page $portal_id "" $community_id
     }
 
-    ad_proc -public remove_user {
-        user_id
-    } {
-    } {
-    }
-
     ad_proc -public remove_user_from_community {
         community_id
         user_id
Index: openacs-4/packages/dotlrn-research/www/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/add.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-research/www/add.tcl	5 Mar 2002 22:38:28 -0000	1.1
@@ -0,0 +1,35 @@
+#
+#  Copyright (C) 2001, 2002 OpenForce, Inc.
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# dotlrn/www/research-paper-add.tcl
+
+ad_page_contract {
+    @author yon (yon@milliped.com)
+    @creation-date Mar 04, 2002
+    @version $Id: add.tcl,v 1.1 2002/03/05 22:38:28 yon Exp $
+} -query {
+    file_id:integer,notnull
+    {referer "../one-community-admin"}
+} -properties {
+}
+
+set community_id [dotlrn_community::get_community_id]
+
+dotlrn::require_user_admin_community $community_id
+
+db_dml add_file_to_community {}
+
+ad_returnredirect $referer
Index: openacs-4/packages/dotlrn-research/www/add.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/add.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-research/www/add.xql	5 Mar 2002 22:38:28 -0000	1.1
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="add_file_to_community">
+        <querytext>
+            insert
+            into dotlrn_research_papers
+            (community_id, file_id)
+            values
+            (:community_id, :file_id)
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn-research/www/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/remove.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-research/www/remove.tcl	5 Mar 2002 22:38:28 -0000	1.1
@@ -0,0 +1,34 @@
+#
+#  Copyright (C) 2001, 2002 OpenForce, Inc.
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# dotlrn/www/research-paper-remove.tcl
+
+ad_page_contract {
+    @author yon (yon@milliped.com)
+    @creation-date Mar 04, 2002
+    @version $Id: remove.tcl,v 1.1 2002/03/05 22:38:28 yon Exp $
+} -query {
+    file_id:integer,notnull
+    {referer "../one-community-admin"}
+} -properties {
+}
+
+set community_id [dotlrn_community::get_community_id]
+dotlrn::require_user_admin_community $community_id
+
+db_dml remove_file_from_community {}
+
+ad_returnredirect $referer
Index: openacs-4/packages/dotlrn-research/www/remove.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/remove.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-research/www/remove.xql	5 Mar 2002 22:38:28 -0000	1.1
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+    <fullquery name="remove_file_from_community">
+        <querytext>
+            delete
+            from dotlrn_research_papers
+            where community_id = :community_id
+            and file_id = :file_id
+        </querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-research/www/Attic/research-admin-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp	5 Mar 2002 08:02:48 -0000	1.2
+++ openacs-4/packages/dotlrn-research/www/research-admin-portlet.adp	5 Mar 2002 22:38:28 -0000	1.3
@@ -16,7 +16,7 @@
           download
         </a>
         &nbsp;|&nbsp;
-        <a href="research-paper-add?file_id=@files_to_add.live_revision@">add to community</a>
+        <a href="research-papers/add?file_id=@files_to_add.live_revision@">add to community</a>
       &nbsp;]</small>
   </li>  
 </multiple>
@@ -39,7 +39,7 @@
           download
         </a>
         &nbsp;|&nbsp;
-        <a href="research-paper-remove?file_id=@files_to_remove.live_revision@">remove from community</a>
+        <a href="research-papers/remove?file_id=@files_to_remove.live_revision@">remove from community</a>
       &nbsp;]</small>
   </li>  
 </multiple>