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.17.2.4 -r1.17.2.5 --- openacs-4/packages/acs-content-repository/acs-content-repository.info 6 Feb 2003 12:52:46 -0000 1.17.2.4 +++ openacs-4/packages/acs-content-repository/acs-content-repository.info 5 Mar 2003 14:49:00 -0000 1.17.2.5 @@ -7,7 +7,7 @@ t t - + oracle postgresql @@ -18,7 +18,7 @@ 2002-10-27 OpenACS - + @@ -61,6 +61,7 @@ + @@ -93,6 +94,7 @@ + Index: openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql 6 Feb 2003 12:53:33 -0000 1.1.2.1 +++ openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql 5 Mar 2003 14:49:12 -0000 1.1.2.2 @@ -157,7 +157,10 @@ insert into cr_mime_types (label,mime_type,file_extension) values ( 'Conference Cooltalk' , 'x-conference/x-cooltalk' , 'ice'); insert into cr_mime_types (label,mime_type,file_extension) values ( 'VRML' , 'x-world/x-vrml' , 'vrml'); insert into cr_mime_types (label,mime_type,file_extension) values ( 'Xuda' , 'xuda/gen-cert' , 'xuda'); +insert into cr_mime_types (label,mime_type,file_extension) values ('Enhanced text' , 'text/enhanced' , 'etxt'); +insert into cr_mime_types (label,mime_type,file_extension) values ('Fixed-width text' , 'text/fixed-width' , 'ftxt'); + -- Extension to mime type maps. -- text/plain for prog langs (maybe we should do application/x-LANG but then you can't look 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/content-type.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v diff -u -r1.24.2.1 -r1.24.2.2 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 27 Feb 2003 13:44:55 -0000 1.24.2.1 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 5 Mar 2003 14:49:38 -0000 1.24.2.2 @@ -601,7 +601,7 @@ -- procedure refresh_view -create function content_type__refresh_view (varchar) +create or replace function content_type__refresh_view (varchar) returns integer as ' declare refresh_view__content_type alias for $1; @@ -641,6 +641,10 @@ select table_name into v_table_name from acs_object_types where object_type = refresh_view__content_type; + if length(v_table_name) > 25 then + raise exception ''Table name cannot be longer than 25 characters, because that causes conflicting rules when we create the views.''; + end if; + -- create the input view (includes content columns) if table_exists(v_table_name || ''i'') then 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.1.2.1 -r1.1.2.2 --- openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql 29 Oct 2002 01:51:39 -0000 1.1.2.1 +++ openacs-4/packages/acs-content-repository/sql/postgresql/upgrade/upgrade-4.5-4.6.sql 5 Mar 2003 14:50:05 -0000 1.1.2.2 @@ -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.1.1 -r1.1.1.1.4.1 --- openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html 13 Mar 2001 22:59:26 -0000 1.1.1.1 +++ openacs-4/packages/acs-content-repository/www/doc/guide/keywords.html 5 Mar 2003 14:50:35 -0000 1.1.1.1.4.1 @@ -30,22 +30,14 @@

The content_keyword object type is used to represent Subject Keywords (see content_keyword.sql) The -content_keyword type inherits from content_item; -thus, Subject Keywords are themselves content items and may use any of -the attributes of the content_item type, such as -name or locale: +content_keyword type inherits from acs_object:

- 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'
- );
-
+ 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' + ); In addition, the cr_keywords table (see content-create.sql) contains extended attributes of Subject Keywords: @@ -188,4 +180,4 @@ - \ No newline at end of file +