Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.29.2.16 -r1.29.2.17
--- openacs-4/packages/file-storage/file-storage.info	30 Nov 2004 20:34:11 -0000	1.29.2.16
+++ openacs-4/packages/file-storage/file-storage.info	13 Dec 2004 16:33:52 -0000	1.29.2.17
@@ -7,19 +7,20 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.1.0a11" url="http://openacs.org/repository/download/apm/file-storage-5.1.0a11.apm">
+    <version name="5.1.0a12" url="http://openacs.org/repository/download/apm/file-storage-5.1.0a12.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
         <release-date>2004-07-21</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">Provides a versioned document store with storage in the filesystem or database (depending on configuration).  Documents and folders can be permissioned and folders downloaded.</description>
 
-        <provides url="file-storage" version="5.1.0a11"/>
+        <provides url="file-storage" version="5.1.0a12"/>
         <requires url="acs-content-repository" version="5.1.0d1"/>
         <requires url="acs-kernel" version="5.1.0d1"/>
         <requires url="oacs-dav" version="1.0b2"/>
 	<requires url="notifications" version="5.0.0b4"/>
         <requires url="categories" version="1.0d3"/>
+        <requires url="rss-support" version="0.3d3"/>
 
         <callbacks>
             <callback type="after-mount"  proc="fs::after_mount"/>
@@ -35,7 +36,7 @@
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowAdministerPermissionsLinkP"  default="1" description="Whether or not to show a link to administer permissions on the file storage object."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="StoreFilesInDatabaseP"  default="0" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UnzipBinary"  default="unzip" description="The path and name of the unzip binary to unpack zip files containing multiple files."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ExposeRssP"  default="0" description="Should we offer navigation to set up RSS feeds for folders?"/>
         </parameters>
-
     </version>
 </package>
Index: openacs-4/packages/file-storage/sql/oracle/file-storage-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/oracle/file-storage-create.sql,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/file-storage/sql/oracle/file-storage-create.sql	21 Jul 2004 22:37:17 -0000	1.16.2.1
+++ openacs-4/packages/file-storage/sql/oracle/file-storage-create.sql	13 Dec 2004 16:33:52 -0000	1.16.2.2
@@ -93,3 +93,6 @@
 @ file-storage-views-create.sql
 
 @ file-storage-notifications-create.sql
+
+@ file-storage-rss-create.sql
+
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/file-storage-rss-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/oracle/upgrade/upgrade-5.1.0a11-5.1.0a12.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql,v
diff -u -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql	21 Jul 2004 22:37:18 -0000	1.18.2.1
+++ openacs-4/packages/file-storage/sql/postgresql/file-storage-create.sql	13 Dec 2004 16:33:53 -0000	1.18.2.2
@@ -96,3 +96,5 @@
 \i file-storage-views-create.sql
 
 \i file-storage-notifications-create.sql
+
+\i file-storage-rss-create.sql
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/file-storage-rss-create.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/sql/postgresql/upgrade/upgrade-5.1.0a11-5.1.0a12.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/tcl/file-storage-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-install-procs.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/file-storage/tcl/file-storage-install-procs.tcl	3 Dec 2004 00:43:50 -0000	1.1.2.4
+++ openacs-4/packages/file-storage/tcl/file-storage-install-procs.tcl	13 Dec 2004 16:33:53 -0000	1.1.2.5
@@ -16,6 +16,7 @@
 } {
     db_transaction {
 	register_implementation
+	fs::rss::create_rss_gen_subscr_impl
     }
 }
 
@@ -117,6 +118,9 @@
 		}
 		acs_sc::impl::new_from_spec -spec $spec
 	    }
+            5.1.0a11 5.1.0a12 {
+		fs::rss::create_rss_gen_subscr_impl
+	    }
 	}
 
 }
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -r1.25.2.11 -r1.25.2.12
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	7 Sep 2004 20:44:27 -0000	1.25.2.11
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	13 Dec 2004 16:33:53 -0000	1.25.2.12
@@ -243,4 +243,17 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="fs::get_folder_package_and_root.select_package_and_root">
+    <querytext>
+	select r.package_id,
+               r.folder_id as root_folder_id
+	from fs_root_folders r,
+	     (select item_id as folder_id
+              from cr_items
+              connect by prior parent_id = item_id 
+              start with item_id = :folder_id) t
+        where r.folder_id = t.folder_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.38.2.7 -r1.38.2.8
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	23 Nov 2004 23:09:05 -0000	1.38.2.7
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	13 Dec 2004 16:33:53 -0000	1.38.2.8
@@ -223,4 +223,20 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="fs::get_folder_package_and_root.select_package_and_root">
+    <querytext>
+      select r.package_id,
+             r.folder_id as root_folder_id
+      from fs_root_folders r,
+           (select parent.item_id as folder_id
+            from cr_items parent,
+                 cr_items children
+            where children.item_id = :folder_id
+              and children.tree_sortkey
+                between parent.tree_sortkey
+                and tree_right(parent.tree_sortkey)) t
+      where r.folder_id = t.folder_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.42.2.20 -r1.42.2.21
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	4 Nov 2004 12:27:28 -0000	1.42.2.20
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	13 Dec 2004 16:33:53 -0000	1.42.2.21
@@ -760,6 +760,13 @@
 	fs::do_notifications -folder_id $parent_id -filename $title -item_id $revision_id -action "new_version" -package_id $package_id
     }
 
+    #It's safe to rebuild RSS repeatedly, assuming it's not too expensive.
+    set folder_info [fs::get_folder_package_and_root $parent_id]
+    set db_package_id [lindex $folder_info 0]
+    if { [parameter::get -package_id $db_package_id -parameter ExposeRssP -default 0] } {
+        fs::rss::build_feeds $parent_id
+    }
+
     return $revision_id
 }
 
@@ -1049,3 +1056,18 @@
     set file_object_info(content) $content
     return [array get file_object_info]
 }
+
+ad_proc -public fs::get_folder_package_and_root folder_id {
+
+    Returns a two-element tcl list containing the package_id
+    and root_folder_id for the passed-in folder_id.
+
+    @author Andrew Grumet (aegrumet@alum.mit.edu)
+    @creation-date 15 March 2004
+
+} {
+
+    db_1row select_package_and_root {}
+
+    return [list $package_id $root_folder_id]
+}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/tcl/file-storage-rss-procs-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/tcl/file-storage-rss-procs-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/tcl/file-storage-rss-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/tcl/file-storage-rss-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/file-storage/www/folder-chunk.adp	15 Dec 2003 00:43:44 -0000	1.23
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	13 Dec 2004 16:33:53 -0000	1.23.2.1
@@ -11,3 +11,8 @@
   </if>
 </if>
 
+<if @feeds:rowcount@ not nil and @feeds:rowcount@ gt 0>
+<multiple name="feeds">
+<a href="rss/@feeds.subscr_id@/rss.xml"><img src="/resources/acs-subsite/xml.gif" width="36" height="14" border="0"></a> <a href="rss/@feeds.subscr_id@/rss.xml">@feeds.short_name@</a><br>
+</multiple>
+</if>
\ No newline at end of file
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.21.2.18 -r1.21.2.19
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	30 Sep 2004 19:06:47 -0000	1.21.2.18
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	13 Dec 2004 16:33:53 -0000	1.21.2.19
@@ -67,6 +67,7 @@
 
 lappend actions "\#file-storage.Add_File\#" ${fs_url}file-add?[export_vars folder_id] "Upload a file in this folder" "\#file-storage.Create_a_URL\#" ${fs_url}simple-add?[export_vars folder_id] "Add a link to a web page" "\#file-storage.New_Folder\#" ${fs_url}folder-create?[export_vars {{parent_id $folder_id}}] "\#file-storage.Create_a_new_folder\#"
 
+set expose_rss_p [parameter::get -parameter ExposeRssP -default 0]
 
 if {$delete_p} {
     lappend actions "\#file-storage.Delete_this_folder\#" ${fs_url}folder-delete?[export_vars folder_id] "\#file-storage.Delete_this_folder\#"
@@ -75,6 +76,9 @@
     set return_url [ad_conn url]
     lappend actions "\#file-storage.Edit_Folder\#" "${fs_url}folder-edit?folder_id=$folder_id" "\#file-storage.Rename_this_folder\#"
     lappend actions "\#file-storage.lt_Modify_permissions_on_1\#" "/permissions/one?[export_vars -override {{object_id $folder_id}} {return_url}]" "\#file-storage.lt_Modify_permissions_on_1\#"
+    if { $expose_rss_p } {
+	lappend actions "Configure RSS" "${fs_url}admin/rss-subscrs?folder_id=$folder_id"
+    }
 }
 
 #set n_past_filter_values [list [list "Yesterday" 1] [list [_ file-storage.last_week] 7] [list [_ file-storage.last_month] 30]]
@@ -183,4 +187,8 @@
     regsub -all {#} $file_url {%23} file_url
 }
 
+if { $expose_rss_p } {
+    db_multirow feeds select_subscrs {}
+}
+
 ad_return_template
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/folder-chunk.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-ae-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-ae-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-ae.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-ae.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-ae.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-del-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-del-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-del.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-del.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscr-del.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscrs.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscrs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/admin/rss-subscrs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/rss/index.vuh'.
Fisheye: No comparison available.  Pass `N' to diff?