From cba328e5342d56fd728cc99b85c534808b6e90aa Mon Sep 17 00:00:00 2001 From: Greg McClellan? Date: Mon, 28 Apr 2003 20:16:02 +0000 Subject: [PATCH] Updated schema. Changed names of two views to shorten them to get around some data migration problems. CollectionItemsByDateAccessioned -> CollectionItemsByDateAccession CommunityItemsByDateAccessioned -> CommunityItemsByDateAccession git-svn-id: http://scm.dspace.org/svn/repo/trunk@666 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- dspace/etc/clean-database.sql | 4 ++-- dspace/etc/database_schema.sql | 8 ++++---- dspace/src/org/dspace/browse/Browse.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dspace/etc/clean-database.sql b/dspace/etc/clean-database.sql index 4ddbe3708d..d7863cc968 100644 --- a/dspace/etc/clean-database.sql +++ b/dspace/etc/clean-database.sql @@ -55,8 +55,8 @@ DROP INDEX dcvalue_dc_type_id_idx; -- Drop the views -DROP VIEW CommunityItemsByDateAccessioned; -DROP VIEW CollectionItemsByDateAccessioned; +DROP VIEW CommunityItemsByDateAccession; +DROP VIEW CollectionItemsByDateAccession; DROP VIEW CommunityItemsByDate; DROP VIEW CollectionItemsByDate; DROP VIEW CommunityItemsByTitle; diff --git a/dspace/etc/database_schema.sql b/dspace/etc/database_schema.sql index cfe496dcbc..7f9c29b5d7 100644 --- a/dspace/etc/database_schema.sql +++ b/dspace/etc/database_schema.sql @@ -575,18 +575,18 @@ CREATE TABLE ItemsByDateAccessioned ); ------------------------------------------------------- --- CollectionItemsByDateAccessioned view +-- CollectionItemsByDateAccession view ------------------------------------------------------- -CREATE VIEW CollectionItemsByDateAccessioned as +CREATE VIEW CollectionItemsByDateAccession as SELECT Collection2Item.collection_id, ItemsByDateAccessioned.* FROM ItemsByDateAccessioned, Collection2Item WHERE ItemsByDateAccessioned.item_id = Collection2Item.item_id ; ------------------------------------------------------- --- CommunityItemsByDateAccessioned view +-- CommunityItemsByDateAccession view ------------------------------------------------------- -CREATE VIEW CommunityItemsByDateAccessioned as +CREATE VIEW CommunityItemsByDateAccession as SELECT Community2Item.community_id, ItemsByDateAccessioned.* FROM ItemsByDateAccessioned, Community2Item WHERE ItemsByDateAccessioned.item_id = Community2Item.item_id diff --git a/dspace/src/org/dspace/browse/Browse.java b/dspace/src/org/dspace/browse/Browse.java index ba982d0b1f..7d8b41ac97 100644 --- a/dspace/src/org/dspace/browse/Browse.java +++ b/dspace/src/org/dspace/browse/Browse.java @@ -261,9 +261,9 @@ public class Browse private static String getLastSubmittedTable(BrowseScope scope) { if (scope.isCommunityScope()) - return "CommunityItemsByDateAccessioned"; + return "CommunityItemsByDateAccession"; else if (scope.isCollectionScope()) - return "CollectionItemsByDateAccessioned"; + return "CollectionItemsByDateAccession"; return "ItemsByDateAccessioned"; }