From: Vásáry Dániel Date: Fri, 20 Oct 2017 14:54:00 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=154be8fe98d1f181b76eb55c6ae6712619af617d;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30661 --- diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json index 37a61c15..f78970d7 100644 --- a/client/Maestro/Configuration/configuration-playout.json +++ b/client/Maestro/Configuration/configuration-playout.json @@ -83,7 +83,7 @@ "processor": "FXPTargetProcessor", "outputFormat": "%ID%", "tag": "Archiválás", - "createMetadata": true, + "saveMetadata": true, "remote": { "address": "ftp://10.10.1.100/ARCHIVE", "userName": "mediacube", diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java index 92109b8a..8135c58a 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java @@ -73,6 +73,7 @@ public class TSMBackupStep extends JobStep { private void saveMetadata(Media mediaCubeMedia, String sourceFileName) { MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, tsmStore, mediaCubeMedia); + mediaFile.setHouseId(sourceFileName); mediaFile.add(); mediaCubeMedia.setPersister(manager); mediaCubeMedia.setArchived(new Timestamp(new Date().getTime())); diff --git a/server/user.jobengine.osgi.db/database/structure.sql b/server/user.jobengine.osgi.db/database/structure.sql index 3a1e2f47..5a42ca02 100644 --- a/server/user.jobengine.osgi.db/database/structure.sql +++ b/server/user.jobengine.osgi.db/database/structure.sql @@ -1,6 +1,12 @@ - -ALTER TABLE ITEM ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(5000) -ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(5000) +DROP INDEX IDX_ITEM_DESCRIPTION +ALTER TABLE ITEM ALTER COLUMN TITLE SET DATA TYPE VARCHAR(1000) +ALTER TABLE ITEM ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(32000) +ALTER TABLE ITEM ALTER COLUMN HOUSEID SET DATA TYPE VARCHAR(1000) +DROP INDEX IDX_MEDIA_DESCRIPTION +ALTER TABLE MEDIA ALTER COLUMN TITLE SET DATA TYPE VARCHAR(1000) +ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(32000) +ALTER TABLE MEDIA ALTER COLUMN HOUSEID SET DATA TYPE VARCHAR(1000) +ALTER TABLE MEDIAFILE ADD COLUMN HOUSEID VARCHAR(1000) ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION DROP NOT NULL ALTER TABLE ITEM ALTER COLUMN DESCRIPTION DROP NOT NULL diff --git a/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 b/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 index 80efa586..de77e03b 100644 --- a/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 +++ b/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 @@ -151,9 +151,9 @@ CREATE TABLE ITEM ( ID BIGINT NOT NULL PRIMARY KEY, ITEMTYPEID BIGINT NOT NULL, - HOUSEID VARCHAR(40), - TITLE VARCHAR(80) NOT NULL, - DESCRIPTION VARCHAR(255), + HOUSEID VARCHAR(1000), + TITLE VARCHAR(1000) NOT NULL, + DESCRIPTION VARCHAR(32000), ISFOLDER CHARACTER(1) NOT NULL DEFAULT 'N', CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP, @@ -164,7 +164,7 @@ CREATE TABLE ITEM CREATE INDEX IDX_ITEM_TITLE ON ITEM ("TITLE")@ -CREATE INDEX IDX_ITEM_DESCRIPTION ON ITEM ("DESCRIPTION")@ +--CREATE INDEX IDX_ITEM_DESCRIPTION ON ITEM ("DESCRIPTION")@ CREATE INDEX IDX_ITEM_HOUSEID ON ITEM ("HOUSEID")@ CREATE INDEX IDX_ITEM_CREATED ON ITEM ("CREATED")@ CREATE INDEX IDX_ITEM_ISFOLDER ON ITEM ("ISFOLDER")@ @@ -196,9 +196,9 @@ CREATE TABLE MEDIA ID BIGINT NOT NULL PRIMARY KEY, ITEMID BIGINT NOT NULL, ITEMTYPEID BIGINT NOT NULL, - HOUSEID VARCHAR(40), - TITLE VARCHAR(40) NOT NULL, - DESCRIPTION VARCHAR(255), + HOUSEID VARCHAR(1000), + TITLE VARCHAR(1000) NOT NULL, + DESCRIPTION VARCHAR(32000), LENGTH BIGINT NOT NULL, CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP, @@ -211,7 +211,7 @@ CREATE TABLE MEDIA CREATE INDEX IDX_MEDIA_TITLE ON MEDIA ("TITLE")@ CREATE INDEX IDX_MEDIA_ITEMID ON MEDIA ("ITEMID")@ -CREATE INDEX IDX_MEDIA_DESCRIPTION ON MEDIA ("DESCRIPTION")@ +--CREATE INDEX IDX_MEDIA_DESCRIPTION ON MEDIA ("DESCRIPTION")@ CREATE INDEX IDX_MEDIA_HOUSEID ON MEDIA ("HOUSEID")@ CREATE INDEX IDX_MEDIA_CREATED ON MEDIA ("CREATED")@ CREATE INDEX IDX_MEDIA_ARCHIVED ON MEDIA ("ARCHIVED")@ @@ -246,6 +246,7 @@ CREATE UNIQUE INDEX UDX_STORE_NAME ON STORE ("NAME")@ CREATE TABLE MEDIAFILE ( ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1) PRIMARY KEY, + HOUSEID VARCHAR(1000), MEDIAID BIGINT NOT NULL, STOREID BIGINT NOT NULL, FILETYPEID BIGINT NOT NULL, diff --git a/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 b/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 index 5e75fdd4..24ba00c4 100644 --- a/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 +++ b/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 @@ -24,4 +24,5 @@ db2ts "update index item_houseid for text connect to mc" db2ts "update index media_title for text connect to mc" db2ts "update index media_desc for text connect to mc" db2ts "update index media_houseid for text connect to mc" -db2ts "update index mediafile_houseid for text connect to mc" \ No newline at end of file +db2ts "update index mediafile_houseid for text connect to mc" + diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java index d2015e5d..d12647de 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java @@ -189,11 +189,13 @@ public class ItemDAOEx { StringBuffer sql = new StringBuffer(); sql.append("select * from (("); sql.append("select distinct i.id,i.itemtypeid,i.houseid,i.title,i.description,i.isfolder,i.created,i.modified from item i, media m, mediafile mf"); - sql.append(" where ((CONTAINS(i.title, ?) >= 1) OR (CONTAINS(i.description, ?) >= 1)) and m.itemid = i.id and mf.MEDIAID = m.id"); + sql.append( + " where ((CONTAINS(i.title, ?) >= 1) OR (CONTAINS(i.description, ?) >= 1) OR (CONTAINS(i.houseId, ?) >= 1)) and m.itemid = i.id and mf.MEDIAID = m.id"); sql.append(")UNION("); sql.append( "select distinct i2.id,i2.itemtypeid,i2.houseid,i2.title,i2.description,i2.isfolder,i2.created,i2.modified from item i2, media m2, mediafile mf2"); - sql.append(" where ((CONTAINS(m2.title, ?) >= 1) OR (CONTAINS(m2.description, ?) >= 1)) and m2.itemid = i2.id and mf2.MEDIAID = m2.id"); + sql.append( + " where ((CONTAINS(m2.title, ?) >= 1) OR (CONTAINS(m2.description, ?) >= 1) OR (CONTAINS(m2.houseId, ?) >= 1)) and m2.itemid = i2.id and mf2.MEDIAID = m2.id"); sql.append(")UNION("); sql.append( "select distinct i3.id,i3.itemtypeid,i3.houseid,i3.title,i3.description,i3.isfolder,i3.created,i3.modified from item i3, media m3, mediafile mf3"); @@ -210,7 +212,7 @@ public class ItemDAOEx { // query = "SELECT * FROM ITEM ORDER BY title"; st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); - for (int s = 1; s <= 5; s++) { + for (int s = 1; s <= 7; s++) { st.setString(s, criteria); } rs = st.executeQuery();