Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-fs/dotlrn-fs.info	9 Oct 2001 06:50:06 -0000	1.4
+++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info	10 Nov 2001 21:44:52 -0000	1.5
@@ -15,13 +15,14 @@
         <owner url="mailto:ben@openforce.net">Ben Adida</owner>
         <summary>blah blah</summary>
 
-	<provides url="dotlrn-fs" version="0.1a"/>
+        <provides url="dotlrn-fs" version="0.1a"/>
         <requires url="fs-portlet" version="0.1a"/>
 
         <files>
             <file type="package_spec" path="dotlrn-fs.info"/>
             <file type="data_model_create" db_type="oracle" path="sql/oracle/dotlrn-fs-create.sql"/>
             <file type="tcl_procs" path="tcl/dotlrn-fs-procs.tcl"/>
+            <file type="query_file" path="tcl/dotlrn-fs-procs.xql"/>
         </files>
         <parameters>
         <!-- No version parameters -->
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 -r1.6 -r1.7
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	10 Nov 2001 18:45:52 -0000	1.6
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	10 Nov 2001 21:44:52 -0000	1.7
@@ -45,6 +45,9 @@
     } {
 	Add the fs applet
     } {
+	set user_id [ad_conn user_id]
+	set ip [ns_conn peeraddr]
+
 	# create the calendar package instance (all in one, I've mounted it)
 	set package_key [package_key]
 	set package_id [dotlrn::instantiate_and_mount $community_id $package_key]
@@ -55,8 +58,25 @@
         :1 := file_storage.new_root_folder(:package_id);
 	end;"]
 
-	# FIXME: set up a public folder and a private folder
+	# Set up public folder
+	set public_folder_id [db_exec_plsql fs_public_folder "
+	begin
+	:1 := file_storage.new_folder (
+	name => 'public',
+	folder_name => 'Public',
+	parent_id => :folder_id,
+	creation_user => :user_id,
+	creation_ip => :ip);
+	end;"]
+
+	# FIXME: Set up permissions on this folder
 	
+	# Get non member page_id
+	set non_member_page_id [dotlrn_community::get_community_non_members_page_id $community_id]
+	
+	# Make file storage available public-folder only at community non-member page
+	fs_portlet::add_self_to_page $non_member_page_id $package_id $public_folder_id
+
 	# return the package_id
 	return $package_id
     }
@@ -75,6 +95,15 @@
     
     }
 
+    ad_proc -private get_public_folder_id {
+	package_id
+	parent_folder_id
+    } {
+	get the folder_id for the public folder
+    } {
+	return [db_string select_folder_id {} -default ""]
+    }    
+
     ad_proc -public add_user {
 	community_id
 	user_id
@@ -94,10 +123,7 @@
 	# fs portlet needs folder_id too
 	set folder_id [fs_get_root_folder -package_id $package_id]
 
-
-	# Make fs DS available to this page
-	fs_portlet::make_self_available $page_id
-
+	# Make file storage available at community-user page level
 	fs_portlet::add_self_to_page $page_id $package_id $folder_id
     }
 
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.xql	10 Nov 2001 21:44:52 -0000	1.1
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<queryset>
+
+<fullquery name="dotlrn_fs::get_public_folder_id">
+<querytext>
+select folder_id from cr_folders,cr_items where name='public' and parent_id= :parent_folder_id
+</querytext>
+</fullquery>
+
+</queryset>