From 41c173670d060fbbd472887e48df002b9709f69f Mon Sep 17 00:00:00 2001 From: quasi Date: Sun, 9 Jan 2011 10:35:35 +0000 Subject: [PATCH] Klasse TextPage eleminieren SQL-Datei entfernt PDL-Datei korrigiert git-svn-id: https://svn.libreccm.org/ccm/trunk@676 8810af33-2d31-482b-a856-94f89814c4df --- .../content-types/GenericArticle.pdl | 23 +------------------ ..._text_pages_text_id_idx.sql.noLongerInUse} | 0 ccm-cms/sql/ccm-cms/postgres-create.sql | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) rename ccm-cms/sql/ccm-cms/default/content-section/{index-cms_text_pages_text_id_idx.sql => index-cms_text_pages_text_id_idx.sql.noLongerInUse} (100%) diff --git a/ccm-cms/pdl/com/arsdigita/content-types/GenericArticle.pdl b/ccm-cms/pdl/com/arsdigita/content-types/GenericArticle.pdl index 5a270e4d5..bdd789656 100644 --- a/ccm-cms/pdl/com/arsdigita/content-types/GenericArticle.pdl +++ b/ccm-cms/pdl/com/arsdigita/content-types/GenericArticle.pdl @@ -24,28 +24,7 @@ import com.arsdigita.kernel.*; object type GenericArticle extends ContentPage { - component TextAsset[0..1] textAsset = join cms_text_pages.text_id to cms_text.text_id; + component TextAsset[0..1] textAsset = join cms_articles.text_id to cms_text.text_id; reference key (cms_articles.article_id); } - -//association { -// -// component GenericArticleImageAssociation[0..n] imageCaptions = join cms_articles.article_id -// to cms_article_image_map.article_id; -// -// GenericArticle[1..1] captionArticle = join cms_article_image_map.article_id to cms_articles.article_id; -// -//} -// -//object type GenericArticleImageAssociation extends ContentItem { -// String[0..1] caption = cms_article_image_map.caption VARCHAR(4000); -// -// // Only including these ID attributes for legacy purposes -// BigDecimal[0..1] articleId = cms_article_image_map.article_id INTEGER; -// BigDecimal[0..1] imageId = cms_article_image_map.image_id INTEGER; -// composite ReusableImageAsset[0..1] imageAsset = join cms_article_image_map.image_id -// to cms_images.image_id; -// -// reference key (cms_article_image_map.map_id); -//} diff --git a/ccm-cms/sql/ccm-cms/default/content-section/index-cms_text_pages_text_id_idx.sql b/ccm-cms/sql/ccm-cms/default/content-section/index-cms_text_pages_text_id_idx.sql.noLongerInUse similarity index 100% rename from ccm-cms/sql/ccm-cms/default/content-section/index-cms_text_pages_text_id_idx.sql rename to ccm-cms/sql/ccm-cms/default/content-section/index-cms_text_pages_text_id_idx.sql.noLongerInUse diff --git a/ccm-cms/sql/ccm-cms/postgres-create.sql b/ccm-cms/sql/ccm-cms/postgres-create.sql index f29bdd6bd..ed90229fb 100755 --- a/ccm-cms/sql/ccm-cms/postgres-create.sql +++ b/ccm-cms/sql/ccm-cms/postgres-create.sql @@ -65,7 +65,7 @@ \i default/content-section/table-authoring_kits.sql \i default/content-section/comment-authoring_kits.sql \i default/content-section/index-cms_assets_mime_type_idx.sql -\i default/content-section/index-cms_text_pages_text_id_idx.sql +--\i default/content-section/index-cms_text_pages_text_id_idx.sql \i default/content-section/table-cms_article_image_map.sql \i default/content-section/insert-cms_resource_types.sql \i default/content-section/index-cms_resources_type_idx.sql