Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -r1.67.2.2 -r1.67.2.3 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 1 Jul 2016 08:57:55 -0000 1.67.2.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 31 Aug 2016 18:19:22 -0000 1.67.2.3 @@ -294,16 +294,16 @@ The root table for the acs object heirarchy. It all starts here folks. '; -comment on column acs_objects.context_id is ' +comment on column acs_objects.context_id is $$ The context_id column points to an object that provides a context for this object. Often this will reflect an observed hierarchy in a site, for example a bboard message would probably list a bboard topic as - it''s context, and a bboard topic might list a sub-site as it''s + it's context, and a bboard topic might list a sub-site as it's context. Whenever we ask a question of the form "can user X perform action Y on object Z", the acs security model will defer to an - object''s context if there is no information about user X''s + object's context if there is no information about user X's permission to perform action Y on object Z. -'; +$$; comment on column acs_objects.creation_user is ' Who created the object; may be null since objects can be created by @@ -1378,15 +1378,15 @@ -- N_GENERATIONS is how far ancestor_id is from object_id -- Note that this function is only supposed to verify that the - -- index contains each ancestor for OBJECT_ID. It doesn''t + -- index contains each ancestor for OBJECT_ID. It doesn't -- guarantee that there aren''t extraneous rows or that - -- OBJECT_ID''s children are contained in the index. That is + -- OBJECT_ID's children are contained in the index. That is -- verified by seperate functions. result := 't'; -- Grab the context and security_inherit_p flag of the current - -- ancestor''s parent. + -- ancestor's parent. select context_id, security_inherit_p into check_object_ancestors__context_id, check_object_ancestors__security_inherit_p @@ -1397,7 +1397,7 @@ if check_object_ancestors__context_id is null then result := 't'; else - -- This can be a constraint, can''t it? + -- This can be a constraint, can't it? PERFORM acs_log__error('acs_object.check_representation', 'Object 0 doesn''t have a null context_id'); result := 'f'; Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v diff -u -r1.75 -r1.75.4.1 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 7 Jul 2011 10:46:02 -0000 1.75 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 31 Aug 2016 18:19:22 -0000 1.75.4.1 @@ -46,54 +46,54 @@ not null ); -comment on table apm_package_types is ' +comment on table apm_package_types is $$ This table holds additional knowledge level attributes for the apm_package type and its subtypes. -'; +$$; -comment on column apm_package_types.package_key is ' +comment on column apm_package_types.package_key is $$ The package_key is what we call the package on this system. -'; +$$; -comment on column apm_package_types.package_uri is ' +comment on column apm_package_types.package_uri is $$ The package URI indicates where the package can be downloaded and is a unique identifier for the package. -'; +$$; -comment on column apm_package_types.spec_file_path is ' +comment on column apm_package_types.spec_file_path is $$ The path to the package specification file. -'; +$$; -comment on column apm_package_types.spec_file_mtime is ' +comment on column apm_package_types.spec_file_mtime is $$ The last time a spec file was modified. This information is maintained in the database so that if a user changes the specification file by editing the file (as opposed to using the UI, the system can read the .info file and update the information in the database appropriately. -'; +$$; -comment on column apm_package_types.initial_install_p is ' +comment on column apm_package_types.initial_install_p is $$ Indicates if the package should be installed during initial installation, in other words whether or not this package is part of the OpenACS core. -'; +$$; -comment on column apm_package_types.singleton_p is ' +comment on column apm_package_types.singleton_p is $$ Indicates if the package can be used for subsites. If this is set to - ''t'', the package can be enabled for any subsite. Otherwise, it is + 't', the package can be enabled for any subsite. Otherwise, it is restricted to the acs-admin/ subsite. -'; +$$; -comment on column apm_package_types.implements_subsite_p is ' +comment on column apm_package_types.implements_subsite_p is $$ If true, this package implements subsite semantics, typically by extending the acs-subsite package. Used by the admin "mount subsite" UI, the request processor (for - setting ad_conn''s subsite_* attributes), etc. -'; + setting ad_conn's subsite_* attributes), etc. +$$; -- ' -comment on column apm_package_types.inherit_templates_p is ' +comment on column apm_package_types.inherit_templates_p is $$ If true, inherit templates from packages this package extends. If false, only - templates in this package''s www subdirectory tree will be mapped to URLs by the + templates in this package's www subdirectory tree will be mapped to URLs by the request processor. -'; +$$; -- ' CREATE OR REPLACE FUNCTION inline_0 () RETURNS integer AS $$ BEGIN @@ -249,7 +249,7 @@ bboard-1.0.1, etc. '; -comment on column apm_package_versions.version_name is ' +comment on column apm_package_versions.version_name is $$ A version number consists of: 1.A major version number. 2.Optionally, up to three minor version numbers. @@ -260,10 +260,10 @@ No letter at all, indicating a final release. In addition, the letters d, a, and b may be followed by another integer, indicating a version within the release. For those who like regular expressions: - version_number := integer (''.'' integer){0,3} ((''d''|''a''|''b'') integer?)? + version_number := integer ('.' integer){0,3} (('d'|'a'|'b') integer?)? So the following is a valid progression for version numbers: 0.9d, 0.9d1, 0.9a1, 0.9b1, 0.9b2, 0.9, 1.0, 1.0.1, 1.1b1, 1.1 -'; +$$; comment on column apm_package_versions.version_uri is ' This column should uniquely identify a package version. This URI should in practice be a URL at which this specific @@ -281,18 +281,18 @@ Must indicate whether the description is plain text or HTML. '; -comment on column apm_package_versions.description is ' +comment on column apm_package_versions.description is $$ Type a one-paragraph description of your package. This is probably analogous -to the first paragraph in your package''s documentation. This is used to describe +to the first paragraph in your package's documentation. This is used to describe the system to users considering installing it. -'; +$$; -comment on column apm_package_versions.release_date is ' +comment on column apm_package_versions.release_date is $$ This tracks when the package was released. Releasing a package means freezing the code and files, creating an archive, and making the -package available for donwload. XXX (bquinn): I''m skeptical about the +package available for donwload. XXX (bquinn): I'm skeptical about the usefulness of storing this information here. -'; +$$; comment on column apm_package_versions.vendor is ' If the package is being released by a company or some kind of organization,