From 992de42a17e7740d69c56d83c1497751dbcbf2e5 Mon Sep 17 00:00:00 2001 From: Robert Tansley Date: Thu, 15 Aug 2002 18:12:27 +0000 Subject: [PATCH] formatidentifier table renamed to fileextension. git-svn-id: http://scm.dspace.org/svn/repo/trunk@274 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- dspace/etc/database_schema.sql | 6 +++--- dspace/src/org/dspace/content/BitstreamFormat.java | 8 ++++---- dspace/src/org/dspace/content/FormatIdentifier.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dspace/etc/database_schema.sql b/dspace/etc/database_schema.sql index 9c1546489a..ca687b86cb 100644 --- a/dspace/etc/database_schema.sql +++ b/dspace/etc/database_schema.sql @@ -65,11 +65,11 @@ CREATE TABLE BitstreamFormatRegistry ); ------------------------------------------------------- --- FormatIdentifier table +-- FileExtension table ------------------------------------------------------- -DROP TABLE FormatIdentifier; +DROP TABLE FileExtension; -CREATE TABLE FormatIdentifier +CREATE TABLE FileExtension ( id INTEGER PRIMARY KEY, bitstream_format_id INTEGER REFERENCES BitstreamFormatRegistry(bitstream_format_id), diff --git a/dspace/src/org/dspace/content/BitstreamFormat.java b/dspace/src/org/dspace/content/BitstreamFormat.java index 92b5c76859..c92860cf58 100644 --- a/dspace/src/org/dspace/content/BitstreamFormat.java +++ b/dspace/src/org/dspace/content/BitstreamFormat.java @@ -113,7 +113,7 @@ public class BitstreamFormat extensions = new ArrayList(); TableRowIterator tri = DatabaseManager.query(context, - "SELECT * FROM formatidentifier WHERE bitstream_format_id=" + + "SELECT * FROM fileextension WHERE bitstream_format_id=" + getID()); while (tri.hasNext()) @@ -496,14 +496,14 @@ public class BitstreamFormat // Delete extensions DatabaseManager.updateQuery(bfContext, - "DELETE FROM formatidentifier WHERE bitstream_format_id=" + + "DELETE FROM fileextension WHERE bitstream_format_id=" + getID()); // Rewrite extensions for (int i = 0; i < extensions.size(); i++) { String s = (String) extensions.get(i); - TableRow r = DatabaseManager.create(bfContext, "formatidentifier"); + TableRow r = DatabaseManager.create(bfContext, "fileextension"); r.setColumn("bitstream_format_id", getID()); r.setColumn("extension", s); DatabaseManager.update(bfContext, r); @@ -540,7 +540,7 @@ public class BitstreamFormat // Delete extensions DatabaseManager.updateQuery(bfContext, - "DELETE FROM formatidentifier WHERE bitstream_format_id=" + + "DELETE FROM fileextension WHERE bitstream_format_id=" + getID()); // Delete this format from database diff --git a/dspace/src/org/dspace/content/FormatIdentifier.java b/dspace/src/org/dspace/content/FormatIdentifier.java index 0c7f7486d7..adebe55ce4 100644 --- a/dspace/src/org/dspace/content/FormatIdentifier.java +++ b/dspace/src/org/dspace/content/FormatIdentifier.java @@ -103,12 +103,12 @@ public class FormatIdentifier return null; } - // See if the extension is in the FormatIdentifier table + // See if the extension is in the fileextension table TableRowIterator tri = DatabaseManager.query(context, "SELECT bitstreamformatregistry.* FROM bitstreamformatregistry, " + - "formatidentifier WHERE formatidentifier.extension LIKE '" + + "fileextension WHERE fileextension.extension LIKE '" + extension +"' AND bitstreamformatregistry.bitstream_format_id=" + - "formatidentifier.bitstream_format_id"); + "fileextension.bitstream_format_id"); if (tri.hasNext()) {