commit to HEAD of merge of changes on oacs-5-1 branch between tags jc…

…d-merge-5-1-20040724 and jcd-merge-5-1-20050111

rss-support.info

@@ -8,7 +8,7 @@
     <singleton-p>t</singleton-p>
     <auto-mount>rss-support</auto-mount>
 
-    <version name="0.3d1" url="http://openacs.org/repository/download/apm/rss-support-0.3d1.apm">
+    <version name="0.3d3" url="http://openacs.org/repository/download/apm/rss-support-0.3d3.apm">
         <owner url="mailto:dave@thedesignexperience.org">Dave Bauer</owner>
         <owner url="mailto:jerry@theashergroup.com">Jerry Asher</owner>
         <owner url="mailto:aegrumet@alum.mit.edu">Andrew Grumet</owner>
@@ -32,7 +32,7 @@ contracts and the RSS can be recreated from a scheduled procedure.
 &lt;/ul&gt;
 </description>
 
-        <provides url="rss-support" version="0.3d1"/>
+        <provides url="rss-support" version="0.3d3"/>
 
         <callbacks>
         </callbacks>

sql/oracle/rss-generation-create.sql

@@ -152,7 +152,8 @@ as
         p_context_id		in acs_objects.context_id%TYPE default null
     ) return acs_objects.object_id%TYPE
     is
-	v_subscr_id		rss_gen_subscrs.subscr_id%TYPE;
+      v_subscr_id		rss_gen_subscrs.subscr_id%TYPE;
+      v_summary_context_id    rss_gen_subscrs.summary_context_id%TYPE;
     begin
 	v_subscr_id := acs_object.new (
 		p_subscr_id,
@@ -163,10 +164,16 @@ as
 		p_context_id
 	);
 
+        if p_summary_context_id is null then
+          v_summary_context_id := v_subscr_id;
+        else
+          v_summary_context_id := p_summary_context_id;
+        end if;
+
 	insert into rss_gen_subscrs
 	  (subscr_id, impl_id, summary_context_id, timeout, lastbuild)
 	values
-	  (v_subscr_id, p_impl_id, p_summary_context_id, p_timeout, p_lastbuild);
+	  (v_subscr_id, p_impl_id, v_summary_context_id, p_timeout, p_lastbuild);
 
 	return v_subscr_id;
     end new;

sql/oracle/upgrade/upgrade-0.3d2-0.3d3.sql

@@ -0,0 +1,70 @@
+--
+-- Adding defaulting for v_summary_context_id, to support
+-- the file-storage implementation of RssGenerationSubscriber.
+--
+create or replace package body rss_gen_subscr
+as
+    function new (
+        p_subscr_id		in rss_gen_subscrs.subscr_id%TYPE,
+        p_impl_id		in rss_gen_subscrs.impl_id%TYPE,
+        p_summary_context_id	in rss_gen_subscrs.summary_context_id%TYPE,
+        p_timeout		in rss_gen_subscrs.timeout%TYPE,
+	p_lastbuild		in rss_gen_subscrs.lastbuild%TYPE,
+        p_object_type		in acs_objects.object_type%TYPE default 'rss_gen_subscr',
+        p_creation_date		in acs_objects.creation_date%TYPE default sysdate,
+        p_creation_user		in acs_objects.creation_user%TYPE default null,
+        p_creation_ip		in acs_objects.creation_ip%TYPE default null,
+        p_context_id		in acs_objects.context_id%TYPE default null
+    ) return acs_objects.object_id%TYPE
+    is
+      v_subscr_id		rss_gen_subscrs.subscr_id%TYPE;
+      v_summary_context_id    rss_gen_subscrs.summary_context_id%TYPE;
+    begin
+	v_subscr_id := acs_object.new (
+		p_subscr_id,
+		p_object_type,
+		p_creation_date,
+		p_creation_user,
+		p_creation_ip,
+		p_context_id
+	);
+
+        if p_summary_context_id is null then
+          v_summary_context_id := v_subscr_id;
+        else
+          v_summary_context_id := p_summary_context_id;
+        end if;
+
+	insert into rss_gen_subscrs
+	  (subscr_id, impl_id, summary_context_id, timeout, lastbuild)
+	values
+	  (v_subscr_id, p_impl_id, v_summary_context_id, p_timeout, p_lastbuild);
+
+	return v_subscr_id;
+    end new;
+
+    function name (
+	p_subscr_id		in rss_gen_subscrs.subscr_id%TYPE
+    ) return varchar2
+    is
+    begin
+	return 'RSS Generation Subscription #'||p_subscr_id;
+    end name;
+
+    function del (
+	p_subscr_id		in rss_gen_subscrs.subscr_id%TYPE
+    ) return number
+    is
+    begin
+	delete from acs_permissions where object_id = p_subscr_id;
+
+	delete from rss_gen_subscrs where subscr_id = p_subscr_id;
+
+	acs_object.del(p_subscr_id);
+
+	return 0;
+    end del;
+
+end rss_gen_subscr;
+/
+show errors

sql/postgresql/rss-generation-create.sql

@@ -188,6 +188,7 @@ declare
   p_creation_ip			alias for $9;		-- default null
   p_context_id			alias for $10;		-- default null
   v_subscr_id			rss_gen_subscrs.subscr_id%TYPE;
+  v_summary_context_id  rss_gen_subscrs.summary_context_id%TYPE;
 begin
 	v_subscr_id := acs_object__new (
 		p_subscr_id,
@@ -198,10 +199,16 @@ begin
 		p_context_id
 	);
 
+        if p_summary_context_id is null then
+          v_summary_context_id := v_subscr_id;
+        else
+          v_summary_context_id := p_summary_context_id;
+        end if;
+
 	insert into rss_gen_subscrs
 	  (subscr_id, impl_id, summary_context_id, timeout, lastbuild)
 	values
-	  (v_subscr_id, p_impl_id, p_summary_context_id, p_timeout, p_lastbuild);
+	  (v_subscr_id, p_impl_id, v_summary_context_id, p_timeout, p_lastbuild);
 
 	return v_subscr_id;
 

sql/postgresql/upgrade/upgrade-0.3d2-0.3d3.sql

@@ -0,0 +1,67 @@
+--
+-- Adding defaulting for v_summary_context_id, to support
+-- the file-storage implementation of RssGenerationSubscriber.
+--
+
+drop function rss_gen_subscr__new (
+    integer,                   -- subscr_id
+    integer,                   -- impl_id
+    varchar,                   -- summary_context_id
+    integer,                   -- timeout
+    timestamptz,               -- lastbuild
+    varchar,                   -- object_type
+    timestamptz,               -- creation_date
+    integer,                   -- creation_user
+    varchar,                   -- creation_ip
+    integer                    -- context_id
+);
+
+create function rss_gen_subscr__new (
+    integer,                   -- subscr_id
+    integer,                   -- impl_id
+    varchar,                   -- summary_context_id
+    integer,                   -- timeout
+    timestamptz,               -- lastbuild
+    varchar,                   -- object_type
+    timestamptz,               -- creation_date
+    integer,                   -- creation_user
+    varchar,                   -- creation_ip
+    integer                    -- context_id
+) returns integer as '
+declare
+  p_subscr_id			alias for $1;
+  p_impl_id			alias for $2;
+  p_summary_context_id		alias for $3;
+  p_timeout			alias for $4;
+  p_lastbuild			alias for $5;
+  p_object_type			alias for $6;           -- default ''rss_gen_subscr''
+  p_creation_date		alias for $7;		-- default now()
+  p_creation_user		alias for $8;		-- default null
+  p_creation_ip			alias for $9;		-- default null
+  p_context_id			alias for $10;		-- default null
+  v_subscr_id			rss_gen_subscrs.subscr_id%TYPE;
+  v_summary_context_id  rss_gen_subscrs.summary_context_id%TYPE;
+begin
+	v_subscr_id := acs_object__new (
+		p_subscr_id,
+		p_object_type,
+		p_creation_date,
+		p_creation_user,
+		p_creation_ip,
+		p_context_id
+	);
+
+        if p_summary_context_id is null then
+          v_summary_context_id := v_subscr_id;
+        else
+          v_summary_context_id := p_summary_context_id;
+        end if;
+
+	insert into rss_gen_subscrs
+	  (subscr_id, impl_id, summary_context_id, timeout, lastbuild)
+	values
+	  (v_subscr_id, p_impl_id, v_summary_context_id, p_timeout, p_lastbuild);
+
+	return v_subscr_id;
+
+end;' language 'plpgsql';

tcl/rss-generation-procs.tcl

@@ -121,7 +121,10 @@ ad_proc rss_gen_200 {
         if { [exists_and_not_null iarray(category)] } {
             append rss "<category>[ad_quotehtml $iarray(category)]</category>" \n
         }
-
+
+        if { [exists_and_not_null iarray(enclosure_url)] && [exists_and_not_null iarray(enclosure_length)] && [exists_and_not_null iarray(enclosure_type)]  } {
+	    append rss "<enclosure url=\"[ad_quotehtml $iarray(enclosure_url)]\" length=\"$iarray(enclosure_length)\" type=\"$iarray(enclosure_type)\"/>"
+	}
         append rss {</item>} \n
     }