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.20 -r1.21 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 9 Jun 2001 01:06:04 -0000 1.20 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 14 Jun 2001 00:23:21 -0000 1.21 @@ -430,8 +430,8 @@ is_published__item_id alias for $1; begin - select - 1 + return + count(*) > 0 from cr_items where @@ -440,12 +440,6 @@ publish_status = ''live'' and item_id = is_published__item_id; - - if NOT FOUND then - return ''f''; - else - return ''t''; - end if; end;' language 'plpgsql'; @@ -493,10 +487,6 @@ end LOOP; - if NOT FOUND then - return ''f''; - end if; - -- validate relations -- make sure the # of ext links of each type fall between min_n and max_n for v_rel_type in select @@ -529,10 +519,6 @@ end if; end loop; - if NOT FOUND then - return ''f''; - end if; - -- validate publishing workflows -- make sure any ''publishing_wf'' associated with this item are finished -- KG: logic is wrong here. Only the latest workflow matters, and even 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.20 -r1.21 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 9 Jun 2001 01:06:04 -0000 1.20 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 14 Jun 2001 00:23:21 -0000 1.21 @@ -389,7 +389,6 @@ returns integer as ' declare get_number__revision_id alias for $1; - v_number integer; v_revision cr_revisions.revision_id%TYPE; v_row_count integer default 0; rev_cur record; @@ -407,13 +406,13 @@ o.creation_date LOOP v_row_count := v_row_count + 1; - if v_revision = get_number__revision_id then - v_number := v_row_count; + if rev_cur.revision_id = get_number__revision_id then + return v_row_count; exit; end if; end LOOP; - return v_number; + return v_row_count; end;' language 'plpgsql'; 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.18 -r1.19 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 9 Jun 2001 19:26:05 -0000 1.18 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 14 Jun 2001 00:23:21 -0000 1.19 @@ -485,7 +485,6 @@ end;' language 'plpgsql'; - -- dummy table provides a target for updates in dynamically generated trigger -- statements. If type is cr_revisions then rule would end up having only a -- select statement which causes an error to be thrown by the dml command. @@ -982,7 +981,7 @@ -- register the new template as the default template of the content type if v_template_id != rotate_template__template_id then - content_type__register_template( + PERFORM content_type__register_template( rotate_template__v_content_type, rotate_template__template_id, rotate_template__use_context, Index: openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql 27 Apr 2001 02:27:09 -0000 1.1 +++ openacs-4/packages/acs-content-repository/tcl/filter-procs-postgresql.xql 14 Jun 2001 00:23:21 -0000 1.2 @@ -41,7 +41,7 @@ from cr_items where - item_id = content_item__get_id(:url, :content_root) + item_id = content_item__get_id(:url, :content_root, 'f')