[Aplaws-commit] r1217 - in trunk/ccm-ldn-dublin: pdl/com/arsdigita/london/cms/dublin sql/ccm-ldn-dublin sql/ccm-ldn-dublin/default sql/ccm-ldn-dublin/upgrade

[<ap...@vh...>]

Author: apevec
Date: 2006-06-15 00:02:54 +0200 (Thu, 15 Jun 2006)
New Revision: 1217

Removed:
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql
Modified:
   trunk/ccm-ldn-dublin/pdl/com/arsdigita/london/cms/dublin/query-getRelatedItems.pdl
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-6.3.0-6.3.1.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
   trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql
Log:
ldn_dublin_core_item_map die die die


Modified: trunk/ccm-ldn-dublin/pdl/com/arsdigita/london/cms/dublin/query-getRelatedItems.pdl
===================================================================
--- trunk/ccm-ldn-dublin/pdl/com/arsdigita/london/cms/dublin/query-getRelatedItems.pdl	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/pdl/com/arsdigita/london/cms/dublin/query-getRelatedItems.pdl	2006-06-14 22:02:54 UTC (rev 1217)
@@ -59,15 +59,13 @@
            cms_pages cp,
            acs_objects ao,
            content_types ct,
-           ldn_dublin_core_items dci,
-           ldn_dublin_core_item_map dcim
+           ldn_dublin_core_items dci
        where ci.parent_id = unique_bundles.unique_bundle_id
          and ci.item_id = cp.item_id
          and ci.item_id = ao.object_id
          and ci.item_id != :itemID
          and ci.type_id = ct.type_id
-         and ci.item_id = dcim.item_id
-         and dcim.dublin_id = dci.dublin_id
+         and ci.item_id = dci.item_id
          and dci.keywords like :keyword || '%'
          and ci.version = 'live'
     } map {

Deleted: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/default/index-ldn_dc_map_item_id_idx.sql

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/oracle-se-create.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -1,3 +1,2 @@
 @@ ddl/oracle-se/create.sql
 @@ ddl/oracle-se/deferred.sql
-@@ default/index-ldn_dc_map_item_id_idx.sql

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/postgres-create.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -1,5 +1,4 @@
 begin;
 \i ddl/postgres/create.sql
 \i ddl/postgres/deferred.sql
-\i default/index-ldn_dc_map_item_id_idx.sql
 end;

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-1.4.2-1.4.3.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -1,16 +1 @@
--- following query must return 0 rows, otherwise unique index creation will fail
--- select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
---
--- Deletion of duplicate dublin item mappings involves following tables.
--- dublin_id entry in following delete statements should be figured out
--- manually.
---delete from ldn_dublin_core_item_map where dublin_id = 168927;
---delete from LDN_DUBLIN_CORE_ITEMS where dublin_id = 168927;
---delete from cms_items where item_id = 168927;
---delete from object_context where object_id = 168927;
---delete from OBJECT_CONTAINER_MAP where object_id = 168927;
---delete from acs_objects where object_id = 168927;
---
-@@ ../default/index-ldn_dc_map_item_id_idx.sql
-
 alter table ldn_dublin_core_items add ccn_portal_instance varchar2(200);

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-6.3.0-6.3.1.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-6.3.0-6.3.1.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/oracle-se-6.3.0-6.3.1.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -4,4 +4,4 @@
   set item_id
    = (select dcm.item_id from LDN_DUBLIN_CORE_ITEM_MAP dcm where dcm.dublin_id=dc.dublin_id);
 
--- drop table ldn_dublin_core_item_map;
+drop table ldn_dublin_core_item_map;

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-1.4.2-1.4.3.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -1,9 +1,5 @@
 begin;
 
--- following query must return 0 rows, otherwise unique index creation will fail
--- select item_id from ldn_dublin_core_item_map group by item_id having count(*) >1;
-\i ../default/index-ldn_dc_map_item_id_idx.sql
-
 alter table ldn_dublin_core_items add ccn_portal_instance varchar(200);
 
 commit;

Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql
===================================================================
--- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql	2006-06-14 21:48:08 UTC (rev 1216)
+++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql	2006-06-14 22:02:54 UTC (rev 1217)
@@ -7,6 +7,6 @@
     from LDN_DUBLIN_CORE_ITEM_MAP dcm
     where dcm.dublin_id=ldn_dublin_core_items.dublin_id;
 
-  -- drop table ldn_dublin_core_item_map;
+  drop table ldn_dublin_core_item_map;
 
 commit;