Index: openacs-4/packages/wp-slim/wp-slim.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/wp-slim.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/wp-slim/wp-slim.info 11 Dec 2003 21:40:16 -0000 1.15 +++ openacs-4/packages/wp-slim/wp-slim.info 7 Sep 2004 23:34:51 -0000 1.16 @@ -7,15 +7,16 @@ <initial-install-p>f</initial-install-p> <singleton-p>f</singleton-p> - <version name="5.0d1" url="http://openacs.org/repository/download/apm/wp-slim-5.0d1.apm"> + <version name="5.2.0d1" url="http://openacs.org/repository/download/apm/wp-slim-5.2.0d1.apm"> <owner url="mailto:roc@viaro.net">Rocael Hernandez Rizzardini</owner> <summary>A collaborative online presentation package.</summary> <release-date>2003-03-27</release-date> <vendor url="http://openacs.org">OpenACS</vendor> <description format="text/plain">Wimpy Point allows users to create online slide presentations and supports collaborative editing, customizable style sheets, printable output, and commentability.</description> - <requires url="acs-content-repository" version="5.0d1"/> - <requires url="acs-kernel" version="5.0d13"/> + <provides url="wp-slim" version="5.2.0d1"/> + <requires url="acs-content-repository" version="5.2.0d1"/> + <requires url="acs-kernel" version="5.2d1"/> <requires url="general-comments" version="4.0"/> <callbacks> Index: openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql 30 Sep 2003 12:10:12 -0000 1.6 +++ openacs-4/packages/wp-slim/sql/oracle/wp-slim-create.sql 7 Sep 2004 23:34:51 -0000 1.7 @@ -608,7 +608,8 @@ show_modified_p in cr_wp_presentations.show_modified_p%TYPE default 'f', audience in varchar2, background in varchar2, - parent_id in integer + parent_id in integer, + package_id in integer ) return cr_items.item_id%TYPE; procedure delete_audience ( @@ -679,7 +680,8 @@ postamble in varchar2, include_in_outline_p in cr_wp_slides.include_in_outline_p%TYPE default 't', context_break_after_p in cr_wp_slides.context_break_after_p%TYPE default 'f', - context_id in acs_objects.context_id%TYPE default null + context_id in acs_objects.context_id%TYPE default null, + package_id in acs_objects.package_id%TYPE default null ) return cr_items.item_id%TYPE; @@ -776,7 +778,8 @@ show_modified_p in cr_wp_presentations.show_modified_p%TYPE default 'f', audience in varchar2, background in varchar2, - parent_id in integer + parent_id in integer, + package_id in integer ) return cr_items.item_id%TYPE is v_item_id cr_items.item_id%TYPE; @@ -804,7 +807,8 @@ creation_date => creation_date, creation_user => creation_user, creation_ip => creation_ip, - parent_id => parent_id + parent_id => parent_id, + package_id => package_id ); v_revision_id := content_revision.new( @@ -845,7 +849,9 @@ content_type => 'cr_wp_presentation_aud', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_audience_revision_id := content_revision.new( @@ -876,7 +882,9 @@ content_type => 'cr_wp_presentation_back', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_background_revision_id := content_revision.new( @@ -1159,7 +1167,8 @@ postamble in varchar2, include_in_outline_p in cr_wp_slides.include_in_outline_p%TYPE default 't', context_break_after_p in cr_wp_slides.context_break_after_p%TYPE default 'f', - context_id in acs_objects.context_id%TYPE default null + context_id in acs_objects.context_id%TYPE default null, + package_id in acs_objects.package_id%TYPE default null ) return cr_items.item_id%TYPE is v_item_id cr_items.item_id%TYPE; @@ -1189,7 +1198,9 @@ content_type => 'cr_wp_slide', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_revision_id := content_revision.new( @@ -1237,7 +1248,9 @@ content_type => 'cr_wp_slide_preamble', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_preamble_revision_id := content_revision.new( @@ -1268,7 +1281,9 @@ content_type => 'cr_wp_slide_postamble', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_postamble_revision_id := content_revision.new( @@ -1299,7 +1314,9 @@ content_type => 'cr_wp_slide_bullet_items', creation_date => creation_date, creation_user => creation_user, - creation_ip => creation_ip + creation_ip => creation_ip, + parent_id => parent_id, + package_id => package_id ); v_bullet_items_revision_id := content_revision.new( Index: openacs-4/packages/wp-slim/sql/postgresql/wp-packages-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/sql/postgresql/wp-packages-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/sql/postgresql/wp-packages-create.sql 28 Aug 2003 09:41:59 -0000 1.2 +++ openacs-4/packages/wp-slim/sql/postgresql/wp-packages-create.sql 7 Sep 2004 23:34:52 -0000 1.3 @@ -8,6 +8,9 @@ --jackp: From here on the functions are defined --jackp: To p_create each presentation + +select define_function_args('wp_presentation__new','creation_date,creation_user,creation_id,pres_title,page_signature,copyright_notice,style,public_p,show_modified_p,aud,back,parent_id,package_id'); + create or replace function wp_presentation__new ( timestamptz, integer, @@ -20,6 +23,7 @@ boolean, varchar, varchar, + integer, integer ) returns integer as' @@ -36,6 +40,7 @@ p_aud alias for $10; p_back alias for $11; p_parent_id alias for $12; + p_package_id alias for $13; v_item_id cr_items.item_id%TYPE; v_audience_item_id cr_items.item_id%TYPE; v_background_item_id cr_items.item_id%TYPE; @@ -68,7 +73,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_revision_id := content_revision__new( @@ -124,7 +130,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_audience_revision_id := content_revision__new( @@ -164,7 +171,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_background_revision_id := content_revision__new( @@ -320,6 +328,8 @@ and cr_revisions.revision_id = cr_items__live_revision; end;' language 'plpgsql'; +select define_function_args('wp_presentation__new_revision','creation_date,creation_user,creation_ip,pres_item_id,pres_title,page_signature,copyright_notce,style,public_p,show_modified_p,audience,background'); + create or replace function wp_presentation__new_revision ( timestamptz, integer, @@ -442,6 +452,8 @@ return 0; end;' language 'plpgsql'; +select define_function_args('wp_slide__new','pres_item_id,creation_date,creation_user,creation_ip,slide_title,style,original_slide_id,sort_key,preamble,include_in_outline_p,context_break_after_p,context_id,package_id'); + create or replace function wp_slide__new ( integer, timestamptz, @@ -456,6 +468,7 @@ varchar, boolean, boolean, + integer, integer ) returns integer as ' declare @@ -473,6 +486,7 @@ p_include_in_outline_p alias for $12; p_context_break_after_p alias for $13; p_context_id alias for $14; + p_package_id alias for $15; v_item_id cr_items.item_id%TYPE; v_preamble_item_id cr_items.item_id%TYPE; v_postamble_item_id cr_items.item_id%TYPE; @@ -507,7 +521,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_revision_id := content_revision__new( @@ -568,7 +583,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_preamble_revision_id := content_revision__new( @@ -608,7 +624,8 @@ ''text/plain'', null, null, - ''text'' + ''text'', + p_package_id ); v_postamble_revision_id := content_revision__new( @@ -648,7 +665,8 @@ null, ''text/plain'', null, - ''text'' + ''text'', + p_package_id ); v_bullet_items_revision_id := content_revision__new( Index: openacs-4/packages/wp-slim/www/create-presentation-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation-2-oracle.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/wp-slim/www/create-presentation-2-oracle.xql 23 Feb 2002 21:21:07 -0000 1.2 +++ openacs-4/packages/wp-slim/www/create-presentation-2-oracle.xql 7 Sep 2004 23:34:52 -0000 1.3 @@ -19,7 +19,8 @@ show_modified_p => :show_modified_p, audience => :audience, background => :background, - parent_id => :package_id + parent_id => :package_id, + package_id => :package_id ); end; Index: openacs-4/packages/wp-slim/www/create-presentation-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation-2-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/create-presentation-2-postgresql.xql 23 Feb 2002 21:21:07 -0000 1.3 +++ openacs-4/packages/wp-slim/www/create-presentation-2-postgresql.xql 7 Sep 2004 23:34:52 -0000 1.4 @@ -18,6 +18,7 @@ :show_modified_p, :audience, :background, + :package_id, :package_id ); Index: openacs-4/packages/wp-slim/www/create-slide-2-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide-2-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/create-slide-2-oracle.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/create-slide-2-oracle.xql 7 Sep 2004 23:34:52 -0000 1.2 @@ -17,7 +17,8 @@ sort_key => :sort_key, preamble => :preamble, postamble => :postamble, - bullet_items => :bullet_list + bullet_items => :bullet_list, + package_id => :package_id ); end; Index: openacs-4/packages/wp-slim/www/create-slide-2-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide-2-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/wp-slim/www/create-slide-2-postgresql.xql 4 Oct 2001 04:23:13 -0000 1.1 +++ openacs-4/packages/wp-slim/www/create-slide-2-postgresql.xql 7 Sep 2004 23:34:52 -0000 1.2 @@ -20,7 +20,8 @@ :postamble, 't', 'f', - NULL + NULL, + :package_id ); </querytext> Index: openacs-4/packages/wp-slim/www/create-slide-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/wp-slim/www/create-slide-2.tcl 13 Mar 2002 22:50:53 -0000 1.3 +++ openacs-4/packages/wp-slim/www/create-slide-2.tcl 7 Sep 2004 23:34:52 -0000 1.4 @@ -27,24 +27,7 @@ } } - - #insert the slide -db_exec_plsql wp_slide_insert { - begin - :1 := wp_slide.new( - pres_item_id => :pres_item_id, - creation_user => :user_id, - creation_ip => :creation_ip, - creation_date => sysdate, - slide_title => :slide_title, - original_slide_id => -100, - sort_key => :sort_key, - preamble => :preamble, - postamble => :postamble, - bullet_items => :bullet_list - ); - end; -} +db_exec_plsql wp_slide_insert {} ad_returnredirect "presentation-top?[export_url_vars pres_item_id]"