Index: openacs-4/packages/acs-content-repository/acs-content-repository.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v diff -u -r1.33.2.19 -r1.33.2.20 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 27 Nov 2004 01:32:47 -0000 1.33.2.19 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 21 Dec 2004 18:22:30 -0000 1.33.2.20 @@ -7,7 +7,7 @@ t t - + Dan Wickstrom The canonical repository for OpenACS content. 2004-11-26 @@ -17,7 +17,7 @@ other CMS backing functionality. Utilized by Bug Tracker, File Storage, and other packages. - + Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql 4 Mar 2004 14:52:36 -0000 1.15 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql 21 Dec 2004 18:22:30 -0000 1.15.2.1 @@ -70,6 +70,8 @@ end;' language 'plpgsql'; +select define_function_args('content_extlink__delete','extlink_id'); + create or replace function content_extlink__delete (integer) returns integer as ' declare @@ -84,7 +86,7 @@ return 0; end;' language 'plpgsql'; - +select define_function_args('content_extlink__is_extlink','item_id'); create or replace function content_extlink__is_extlink (integer) returns boolean as ' declare @@ -126,6 +128,7 @@ return 0; end;' language 'plpgsql' stable; +select define_function_args('content_extlink__copy','extlink_id,target_folder_id,creation_user,creation_ip,name'); create or replace function content_extlink__copy ( integer, integer, Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v diff -u -r1.33.2.2 -r1.33.2.3 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 26 May 2004 19:10:12 -0000 1.33.2.2 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 21 Dec 2004 18:22:30 -0000 1.33.2.3 @@ -199,6 +199,7 @@ end;' language 'plpgsql'; -- procedure delete +select define_function_args('content_folder__delete','folder_id,cascade_p;f'); create or replace function content_folder__delete (integer, boolean) returns integer as ' @@ -280,6 +281,7 @@ -- procedure rename +select define_function_args('content_folder__edit_name','folder_id,name,label,description'); create or replace function content_folder__edit_name (integer,varchar,varchar,varchar) returns integer as ' declare @@ -322,6 +324,8 @@ -- 3) update the parent_id for the folder -- procedure move +select define_function_args('content_folder__move','folder_id,target_folder_id'); + create or replace function content_folder__move (integer,integer) returns integer as ' declare @@ -525,6 +529,7 @@ -- function is_folder +select define_function_args('content_folder__is_folder','folder_id'); create or replace function content_folder__is_folder (integer) returns boolean as ' declare @@ -538,6 +543,7 @@ -- function is_sub_folder +select define_function_args('content_folder__is_sub_folder','folder_id,target_folder_id'); create or replace function content_folder__is_sub_folder (integer,integer) returns boolean as ' declare @@ -579,10 +585,11 @@ return v_sub_folder_p; -end;' language 'plpgsql'; +end;' language 'plpgsql'; -- function is_empty +select define_function_args('content_folder__is_empty','folder_id'); create or replace function content_folder__is_empty (integer) returns boolean as ' declare @@ -603,6 +610,8 @@ -- procedure register_content_type +select define_function_args('content_folder__register_content_type','folder_id,content_type,include_subtypes;f'); + create or replace function content_folder__register_content_type (integer,varchar,boolean) returns integer as ' declare @@ -668,6 +677,7 @@ -- procedure unregister_content_type +select define_function_args('content_folder__unregister_content_type','folder_id,content_type,include_subtypes;f'); create or replace function content_folder__unregister_content_type (integer,varchar,boolean) returns integer as ' declare @@ -706,6 +716,7 @@ -- function is_registered +select define_function_args('content_folder__is_registered','folder_id,content_type,include_subtypes;f'); create or replace function content_folder__is_registered (integer,varchar,boolean) returns boolean as ' declare @@ -765,6 +776,7 @@ -- function get_label +select define_function_args('content_folder__get_label','folder_id'); create or replace function content_folder__get_label (integer) returns varchar as ' declare @@ -785,6 +797,7 @@ -- function get_index_page +select define_function_args('content_folder__get_index_page','folder_id'); create or replace function content_folder__get_index_page (integer) returns integer as ' declare @@ -827,6 +840,7 @@ -- function is_root +select define_function_args('content_folder__is_root','folder_id'); create or replace function content_folder__is_root (integer) returns boolean as ' declare Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v diff -u -r1.50.2.6 -r1.50.2.7 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 10 Aug 2004 23:56:54 -0000 1.50.2.6 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 21 Dec 2004 18:22:30 -0000 1.50.2.7 @@ -13,6 +13,7 @@ create view content_item_globals as select -100 as c_root_folder_id; +select define_function_args('content_item__get_root_folder','item_id'); create or replace function content_item__get_root_folder (integer) returns integer as ' declare @@ -758,6 +759,7 @@ end;' language 'plpgsql'; +select define_function_args('content_item__is_published','item_id'); create or replace function content_item__is_published (integer) returns boolean as ' declare @@ -777,7 +779,7 @@ end;' language 'plpgsql' stable; - +select define_function_args('content_item__is_publishable','item_id'); create or replace function content_item__is_publishable (integer) returns boolean as ' declare @@ -893,7 +895,7 @@ end;' language 'plpgsql' stable; - +select define_function_args('content_item__is_valid_child','item_id,content_type,relation_tag'); create or replace function content_item__is_valid_child (integer,varchar,varchar) returns boolean as ' declare @@ -1018,6 +1020,7 @@ 6) delete keyword associations 7) delete all associated comments */ +select define_function_args('content_item__delete','item_id'); create or replace function content_item__delete (integer) returns integer as ' declare @@ -1142,7 +1145,7 @@ return 0; end;' language 'plpgsql'; - +select define_function_args('content_item__edit_name','item_id,name'); create or replace function content_item__edit_name (integer,varchar) returns integer as ' declare @@ -1178,6 +1181,8 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__get_id','item_path,root_folder_id,resolve_index;f'); + create or replace function content_item__get_id (varchar,integer,boolean) returns integer as ' declare @@ -1526,6 +1531,8 @@ -- return v_path; -- end;' language 'plpgsql'; + +select define_function_args('content_item__get_path','item_id,root_folder_id'); create or replace function content_item__get_path (integer,integer) returns varchar as ' declare @@ -1616,6 +1623,8 @@ end;' language 'plpgsql'; +-- I hard code the content_item_globals.c_root_folder_id here +select define_function_args('content_item__get_virtual_path','item_id,root_folder_id;-100'); create or replace function content_item__get_virtual_path (integer,integer) returns varchar as ' @@ -1673,6 +1682,7 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__register_template','item_id,template_id,use_context'); create or replace function content_item__register_template (integer,integer,varchar) returns integer as ' @@ -1706,6 +1716,7 @@ end;' language 'plpgsql'; +select define_function_args('content_item__unregister_template','item_id,template_id,use_context'); create or replace function content_item__unregister_template (integer,integer,varchar) returns integer as ' declare @@ -1745,6 +1756,7 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__get_template','item_id,use_context'); create or replace function content_item__get_template (integer,varchar) returns integer as ' @@ -1792,7 +1804,7 @@ end;' language 'plpgsql' stable strict; - +select define_function_args('content_item__get_content_type','item_id'); create or replace function content_item__get_content_type (integer) returns varchar as ' declare @@ -1811,6 +1823,7 @@ end;' language 'plpgsql' stable strict; +select define_function_args('content_item__get_live_revision','item_id'); create or replace function content_item__get_live_revision (integer) returns integer as ' @@ -1830,7 +1843,7 @@ end;' language 'plpgsql' stable strict; - +select define_function_args('content_item__set_live_revision','item_id,publish_status;ready'); create or replace function content_item__set_live_revision (integer) returns integer as ' declare set_live_revision__revision_id alias for $1; @@ -1890,7 +1903,7 @@ return 0; end;' language 'plpgsql'; - +select define_function_args('content_item__unset_live_revision','item_id'); create or replace function content_item__unset_live_revision (integer) returns integer as ' declare @@ -1917,6 +1930,8 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__set_release_period','item_id,start_when,end_when'); + create or replace function content_item__set_release_period (integer, timestamptz, timestamptz) returns integer as ' declare @@ -1948,6 +1963,7 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__get_revision_count','item_id'); create or replace function content_item__get_revision_count (integer) returns integer as ' @@ -1967,7 +1983,7 @@ end;' language 'plpgsql' stable; - +select define_function_args('content_item__get_context','item_id'); create or replace function content_item__get_context (integer) returns integer as ' declare @@ -2012,6 +2028,7 @@ return null; end;' language 'plpgsql'; +select define_function_args('content_item__move','item_id,target_folder_id,name'); create or replace function content_item__move (integer,integer,varchar) returns integer as ' declare @@ -2105,6 +2122,7 @@ end;' language 'plpgsql'; +select define_function_args('content_item__copy','item_id,target_folder_id,creation_user,creation_ip,name'); create or replace function content_item__copy ( integer, integer, @@ -2238,7 +2256,7 @@ end;' language 'plpgsql'; - +select define_function_args('content_item__get_latest_revision','item_id'); create or replace function content_item__get_latest_revision (integer) returns integer as ' declare @@ -2266,7 +2284,7 @@ end;' language 'plpgsql' strict stable; - +select define_function_args('content_item__get_best_revision','item_id'); create or replace function content_item__get_best_revision (integer) returns integer as ' declare @@ -2287,7 +2305,7 @@ end;' language 'plpgsql' stable strict; - +select define_function_args('content_item__get_title','item_id,is_live;f'); create or replace function content_item__get_title (integer,boolean) returns varchar as ' declare @@ -2346,7 +2364,7 @@ end;' language 'plpgsql' stable strict; - +select define_function_args('content_item__get_publish_date','item_id,is_live;f'); create or replace function content_item__get_publish_date (integer,boolean) returns timestamptz as ' declare @@ -2380,7 +2398,7 @@ end;' language 'plpgsql' stable; - +select define_function_args('content_item__is_subclass','object_type,supertype'); create or replace function content_item__is_subclass (varchar,varchar) returns boolean as ' declare @@ -2400,7 +2418,7 @@ end;' language 'plpgsql' stable; - +select define_function_args('content_item__relate','item_id,object_id,relation_tag;generic,order_n,relation_type;cr_item_rel'); create or replace function content_item__relate (integer,integer,varchar,integer,varchar) returns integer as ' declare @@ -2495,6 +2513,7 @@ end;' language 'plpgsql'; +select define_function_args('content_item__unrelate','rel_id'); create or replace function content_item__unrelate (integer) returns integer as ' @@ -2511,6 +2530,7 @@ return 0; end;' language 'plpgsql'; +select define_function_args('content_item__is_index_page','item_id,folder_id'); create or replace function content_item__is_index_page (integer,integer) returns boolean as ' @@ -2526,6 +2546,8 @@ end;' language 'plpgsql' stable; +select define_function_args('content_item__get_parent_folder','item_id'); + create or replace function content_item__get_parent_folder (integer) returns integer as ' declare Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql,v diff -u -r1.35 -r1.35.2.1 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 4 Mar 2004 14:52:36 -0000 1.35 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 21 Dec 2004 18:22:30 -0000 1.35.2.1 @@ -186,6 +186,7 @@ -- procedure copy_attributes +select define_function_args('content_revision__copy_attributes','content_type,revision_id,copy_id'); create or replace function content_revision__copy_attributes (varchar,integer,integer) returns integer as ' declare @@ -225,6 +226,7 @@ -- function copy +select define_function_args('content_revision__copy','revision_id,copy_id,target_item_id,creation_user,creation_ip'); create or replace function content_revision__copy (integer,integer,integer,integer,varchar) returns integer as ' declare @@ -327,6 +329,7 @@ -- procedure delete +select define_function_args('content_revision__delete','revision_id'); create or replace function content_revision__delete (integer) returns integer as ' declare @@ -391,6 +394,7 @@ -- function get_number +select define_function_args('content_revision__get_number','revision_id'); create or replace function content_revision__get_number (integer) returns integer as ' declare @@ -422,6 +426,7 @@ end;' language 'plpgsql' stable strict; +select define_function_args('content_revision__revision_name','revision_id'); create or replace function content_revision__revision_name(integer) returns text as ' declare @@ -507,6 +512,7 @@ -- function is_live +select define_function_args('content_revision__is_live','revision_id'); create or replace function content_revision__is_live (integer) returns boolean as ' declare @@ -520,6 +526,7 @@ -- function is_latest +select define_function_args('content_revision__is_latest','revision_id'); create or replace function content_revision__is_latest (integer) returns boolean as ' declare @@ -562,6 +569,7 @@ -- procedure content_copy +select define_function_args('content_revision__content_copy','revision_id,revision_id_dest'); create or replace function content_revision__content_copy (integer,integer) returns integer as ' declare @@ -653,6 +661,7 @@ -- procedure content__get_content +select define_function_args('content_revision__get_content','revision_id'); create or replace function content_revision__get_content (integer) returns text as ' declare Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql,v diff -u -r1.17 -r1.17.2.1 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 4 Mar 2004 14:52:36 -0000 1.17 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 21 Dec 2004 18:22:30 -0000 1.17.2.1 @@ -110,6 +110,7 @@ -- procedure delete +select define_function_args('content_symlink__delete','symlink_id'); create or replace function content_symlink__delete (integer) returns integer as ' declare @@ -126,6 +127,7 @@ -- function is_symlink +select define_function_args('content_symlink__is_symlink','item_id'); create or replace function content_symlink__is_symlink (integer) returns boolean as ' declare @@ -146,6 +148,7 @@ -- procedure copy +select define_function_args('content_symlink__copy','symlink_id,target_folder_id,creation_user,creation_ip,name'); create or replace function content_symlink__copy ( integer, integer, @@ -245,6 +248,7 @@ end;' language 'plpgsql'; -- function resolve +select define_function_args('content_symlink__resolve','item_id'); create or replace function content_symlink__resolve (integer) returns integer as ' declare @@ -269,6 +273,7 @@ -- function resolve_content_type +select define_function_args('content_symlink__resolve_content_type','item_id'); create or replace function content_symlink__resolve_content_type (integer) returns varchar as ' declare Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v diff -u -r1.32.2.2 -r1.32.2.3 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 18 Jul 2004 17:28:59 -0000 1.32.2.2 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 21 Dec 2004 18:22:30 -0000 1.32.2.3 @@ -323,6 +323,7 @@ -- procedure register_template +select define_function_args('content_type__register_template','content_type,template_id,use_context,is_default;f'); create or replace function content_type__register_template (varchar,integer,varchar,boolean) returns integer as ' declare @@ -375,6 +376,7 @@ -- procedure set_default_template +select define_function_args('content_type__set_default_template','content_type,template_id,use_context'); create or replace function content_type__set_default_template (varchar,integer,varchar) returns integer as ' declare @@ -404,6 +406,7 @@ -- function get_template +select define_function_args('content_type__get_template','content_type,use_context'); create or replace function content_type__get_template (varchar,varchar) returns integer as ' declare @@ -430,6 +433,7 @@ -- procedure unregister_template +select define_function_args('content_type__unregister_template','content_type,template_id,use_context'); create or replace function content_type__unregister_template (varchar,integer,varchar) returns integer as ' declare @@ -470,6 +474,7 @@ -- function trigger_insert_statement +select define_function_args('content_type__trigger_insert_statement','content_type'); create or replace function content_type__trigger_insert_statement (varchar) returns varchar as ' declare @@ -552,6 +557,7 @@ -- revisions for any content type -- procedure refresh_trigger +select define_function_args('content_type__refresh_trigger','content_type'); create or replace function content_type__refresh_trigger (varchar) returns integer as ' declare @@ -633,6 +639,7 @@ -- procedure refresh_view +select define_function_args('content_type__refresh_view','content_type'); create or replace function content_type__refresh_view (varchar) returns integer as ' declare @@ -723,6 +730,7 @@ -- procedure register_child_type +select define_function_args('content_type__register_child_type','content_type,child_type,relation_tag;generic,min_n;0,max_n'); create or replace function content_type__register_child_type (varchar,varchar,varchar,integer,integer) returns integer as ' declare @@ -770,6 +778,7 @@ -- procedure unregister_child_type +select define_function_args('content_type__unregister_child_type','content_type,child_type,relation_tag'); create or replace function content_type__unregister_child_type (varchar,varchar,varchar) returns integer as ' declare @@ -792,6 +801,7 @@ -- procedure register_relation_type +select define_function_args('content_type__register_relation_type','content_type,target_type,relation_tag;generic,min_n;0,max_n'); create or replace function content_type__register_relation_type (varchar,varchar,varchar,integer,integer) returns integer as ' declare @@ -844,6 +854,7 @@ -- procedure unregister_relation_type +select define_function_args('content_type__unregister_relation_type','content_type,target_type,relation_tag;generic'); create or replace function content_type__unregister_relation_type (varchar,varchar,varchar) returns integer as ' declare @@ -867,6 +878,7 @@ -- procedure register_mime_type +select define_function_args('content_type__register_mime_type','content_type,mime_type'); create or replace function content_type__register_mime_type (varchar,varchar) returns integer as ' declare @@ -904,6 +916,7 @@ -- procedure unregister_mime_type +select define_function_args('content_type__unregister_mime_type','content_type,mime_type'); create or replace function content_type__unregister_mime_type (varchar,varchar) returns integer as ' declare @@ -920,6 +933,7 @@ -- function is_content_type +select define_function_args('content_type__is_content_type','content_type'); create or replace function content_type__is_content_type (varchar) returns boolean as ' declare @@ -944,6 +958,7 @@ -- procedure rotate_template +select define_function_args('content_type__rotate_template','template_id,content_type,use_context'); create or replace function content_type__rotate_template (integer,varchar,varchar) returns integer as ' declare Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-5.1.4d1-5.1.4d2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl 7 Dec 2004 08:07:29 -0000 1.4 +++ openacs-4/packages/acs-content-repository/tcl/content-extlink-procs.tcl 21 Dec 2004 18:22:33 -0000 1.4.2.1 @@ -39,7 +39,6 @@ {-name ""} {-label ""} {-description ""} - {-package_id ""} } { @param Create a new external link. @return 0 @@ -50,8 +49,7 @@ [list parent_id $parent_id ] \ [list name $name ] \ [list label $label ] \ - [list description $description ] \ - [list package_id $package_id ] \ + [list description $description ] ] content_extlink new] } Index: openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl 7 Dec 2004 07:13:21 -0000 1.4 +++ openacs-4/packages/acs-content-repository/tcl/content-template-procs.tcl 21 Dec 2004 18:22:33 -0000 1.4.2.1 @@ -21,7 +21,6 @@ {-creation_date ""} {-creation_user ""} {-creation_ip ""} - {-package_id ""} } { @param name @param text @@ -31,7 +30,6 @@ @param creation_date @param creation_user @param creation_ip - @param package_id @return template_id of created template } { @@ -44,7 +42,6 @@ [list creation_date $creation_date ] \ [list creation_user $creation_user ] \ [list creation_ip $creation_ip ] \ - [list package_id $package_id ] \ ] content_template new] }