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.20 -r1.21 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 25 Feb 2003 16:00:39 -0000 1.20 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 5 Mar 2003 17:01:34 -0000 1.21 @@ -58,6 +58,10 @@ <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.0-4.0.1.sql"/> <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.1-4.1.2.sql"/> <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.5-4.6.sql"/> + <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.6-4.6.1.sql"/> + <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.6.1-4.6.2.sql"/> + <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.6.2-4.6.3.sql"/> + <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.6.3-4.6.4.sql"/> <file type="data_model_create" db_type="postgresql" path="sql/postgresql/acs-content-repository-create.sql"/> <file type="data_model" db_type="postgresql" path="sql/postgresql/content-create.sql"/> <file type="data_model" db_type="postgresql" path="sql/postgresql/content-drop.sql"/> @@ -88,6 +92,9 @@ <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.1.2-4.5.sql"/> <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.5-4.6.sql"/> <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql"/> + <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.6.1-4.6.2.sql"/> + <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.6.2-4.6.3.sql"/> + <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.6.3-4.6.4.sql"/> <file type="query_file" db_type="oracle" path="tcl/acs-content-repository-init-oracle.xql"/> <file type="query_file" db_type="postgresql" path="tcl/acs-content-repository-init-postgresql.xql"/> <file type="tcl_init" path="tcl/acs-content-repository-init.tcl"/> Index: openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql 11 May 2001 04:43:39 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/oracle/content-type.sql 5 Mar 2003 17:01:46 -0000 1.3 @@ -56,9 +56,22 @@ table_exists integer; v_supertype_table acs_object_types.table_name%TYPE; - + v_count integer; begin + if (supertype != 'content_revision') and (content_type != 'content_revision') then + select count(*) + into v_count + from acs_object_type_supertype_map + where object_type = create_type.supertype + and ancestor_type = 'content_revision'; + + if v_count = 0 then + raise_application_error(-20000, 'Content types can only be created as subclasses of content_revision or a derivation thereof. ' || supertype || ' is not a subclass oc content_revision.'); + end if; + end if; + + -- create the attribute table if not already created select decode(count(*),0,0,1) into table_exists from user_tables Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.6.1-4.7d1.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/oracle/upgrade/upgrade-4.6.3-4.6.4.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql 30 Nov 2002 17:15:41 -0000 1.2 +++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql 5 Mar 2003 17:02:23 -0000 1.3 @@ -191,24 +191,10 @@ -- we need new triggers on cr_items to index when a live revision -- changes -create or replace function content_item_search__utrg () -returns opaque as ' -begin - if new.live_revision is not null and coalesce(old.live_revision,0) <> new.live_revision then - perform search_observer__enqueue(new.live_revision,''INSERT''); - end if; - if old.live_revision is not null and old.live_revision <> coalesce(new.live_revision,0) then - perform search_observer__enqueue(old.live_revision,''DELETE''); - end if; +-- LARS: REMOVED - return new; -end;' language 'plpgsql'; -create trigger content_item_search__utrg before update on cr_items -for each row execute procedure content_item_search__utrg (); - - -- content-type.sql create or replace function content_type__trigger_insert_statement (varchar) Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.6.3-4.6.4.sql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/tcl/keyword-procs-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/tcl/keyword-procs-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/tcl/keyword-procs.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/tcl/keyword-procs.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html 5 Mar 2003 17:03:04 -0000 1.2 @@ -30,22 +30,14 @@ <p>The <tt>content_keyword</tt> object type is used to represent Subject Keywords (see <tt>content_keyword.sql</tt>) The -<tt>content_keyword</tt> type inherits from <tt>content_item</tt>; -thus, Subject Keywords are themselves content items and may use any of -the attributes of the <tt>content_item</tt> type, such as -<tt>name</tt> or <tt>locale</tt>: +<tt>content_keyword</tt> type inherits from <tt>acs_object</tt>: <pre> - acs_object_type.create_type ( - supertype => 'acs_object', - object_type => 'content_keyword', - pretty_name => 'Content Keyword', - pretty_plural => 'Content Keywords', - table_name => 'cr_keywords', - id_column => 'keyword_id', - name_method => 'acs_object.default_name' - ); -</pre> + acs_object_type.create_type ( supertype => 'acs_object', object_type + => 'content_keyword', pretty_name => 'Content Keyword', + pretty_plural => 'Content Keywords', table_name => 'cr_keywords', + id_column => 'keyword_id', name_method => 'acs_object.default_name' + ); </pre> In addition, the <tt>cr_keywords</tt> table (see <tt>content-create.sql</tt>) contains extended attributes of Subject Keywords: @@ -188,4 +180,4 @@ </table> </body> -</html> \ No newline at end of file +</html>