git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/Configuration/configuration-playout.json b/client/Maestro/Configuration/configuration-playout.json
index 37a61c15fde3b5ef30a2af36dba80165ba8ce75e..f78970d783642fdcdfafe2554d219b01446b376b 100644 (file)
--- a/client/Maestro/Configuration/configuration-playout.json
+++ b/client/Maestro/Configuration/configuration-playout.json
@@ -83,7 +83,7 @@
       "processor": "FXPTargetProcessor",\r
       "outputFormat": "%ID%",\r
       "tag": "Archiválás",\r
-      "createMetadata": true,\r
+      "saveMetadata": true,\r
       "remote": {\r
         "address": "ftp://10.10.1.100/ARCHIVE",\r
         "userName": "mediacube",\r

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 92109b8ac5faf563f204b19a1027dec4d8b36127..8135c58a55226058220c41cd58daf5bd019b7859 100644 (file)
--- 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 {
 \r
        private void saveMetadata(Media mediaCubeMedia, String sourceFileName) {\r
                MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, tsmStore, mediaCubeMedia);\r
+               mediaFile.setHouseId(sourceFileName);\r
                mediaFile.add();\r
                mediaCubeMedia.setPersister(manager);\r
                mediaCubeMedia.setArchived(new Timestamp(new Date().getTime()));\r

diff --git a/server/user.jobengine.osgi.db/database/structure.sql b/server/user.jobengine.osgi.db/database/structure.sql
index 3a1e2f4799cf4a53d6324485addd5f5deb1af9e5..5a42ca02db8ea485719842a759dfa017a5986d25 100644 (file)
--- a/server/user.jobengine.osgi.db/database/structure.sql
+++ b/server/user.jobengine.osgi.db/database/structure.sql
@@ -1,6 +1,12 @@
-\r
-ALTER TABLE ITEM ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(5000)\r
-ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(5000)\r
+DROP INDEX IDX_ITEM_DESCRIPTION \r
+ALTER TABLE ITEM ALTER COLUMN TITLE SET DATA TYPE VARCHAR(1000)\r
+ALTER TABLE ITEM ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(32000)\r
+ALTER TABLE ITEM ALTER COLUMN HOUSEID SET DATA TYPE VARCHAR(1000)\r
+DROP INDEX IDX_MEDIA_DESCRIPTION\r
+ALTER TABLE MEDIA ALTER COLUMN TITLE SET DATA TYPE VARCHAR(1000)\r
+ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION SET DATA TYPE VARCHAR(32000)\r
+ALTER TABLE MEDIA ALTER COLUMN HOUSEID SET DATA TYPE VARCHAR(1000)\r
+ALTER TABLE MEDIAFILE ADD COLUMN HOUSEID VARCHAR(1000)\r
 \r
 ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION DROP NOT NULL\r
 ALTER TABLE ITEM ALTER COLUMN DESCRIPTION DROP NOT NULL\r

diff --git a/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 b/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2
index 80efa5862f4e8add69c392afa6d21d5d34f0bb17..de77e03b5d3c1085b24fb75dfd19e83319623e63 100644 (file)
--- 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
 ( \r
        ID BIGINT NOT NULL PRIMARY KEY,\r
        ITEMTYPEID BIGINT NOT NULL,     \r
-       HOUSEID VARCHAR(40), \r
-       TITLE VARCHAR(80) NOT NULL,\r
-       DESCRIPTION VARCHAR(255), \r
+       HOUSEID VARCHAR(1000), \r
+       TITLE VARCHAR(1000) NOT NULL,\r
+       DESCRIPTION VARCHAR(32000), \r
        ISFOLDER CHARACTER(1) NOT NULL DEFAULT 'N',\r
        CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,\r
        MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP,\r
@@ -164,7 +164,7 @@ CREATE TABLE ITEM
 \r
 \r
 CREATE INDEX IDX_ITEM_TITLE ON ITEM ("TITLE")@\r
-CREATE INDEX IDX_ITEM_DESCRIPTION ON ITEM ("DESCRIPTION")@\r
+--CREATE INDEX IDX_ITEM_DESCRIPTION ON ITEM ("DESCRIPTION")@\r
 CREATE INDEX IDX_ITEM_HOUSEID ON ITEM ("HOUSEID")@\r
 CREATE INDEX IDX_ITEM_CREATED ON ITEM ("CREATED")@\r
 CREATE INDEX IDX_ITEM_ISFOLDER ON ITEM ("ISFOLDER")@\r
@@ -196,9 +196,9 @@ CREATE TABLE MEDIA
        ID BIGINT NOT NULL PRIMARY KEY,\r
        ITEMID BIGINT NOT NULL, \r
        ITEMTYPEID BIGINT NOT NULL, \r
-       HOUSEID VARCHAR(40), \r
-       TITLE VARCHAR(40) NOT NULL, \r
-       DESCRIPTION VARCHAR(255), \r
+       HOUSEID VARCHAR(1000), \r
+       TITLE VARCHAR(1000) NOT NULL, \r
+       DESCRIPTION VARCHAR(32000), \r
        LENGTH BIGINT NOT NULL, \r
        CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,\r
        MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP,\r
@@ -211,7 +211,7 @@ CREATE TABLE MEDIA
 \r
 CREATE INDEX IDX_MEDIA_TITLE ON MEDIA ("TITLE")@\r
 CREATE INDEX IDX_MEDIA_ITEMID ON MEDIA ("ITEMID")@\r
-CREATE INDEX IDX_MEDIA_DESCRIPTION ON MEDIA ("DESCRIPTION")@\r
+--CREATE INDEX IDX_MEDIA_DESCRIPTION ON MEDIA ("DESCRIPTION")@\r
 CREATE INDEX IDX_MEDIA_HOUSEID ON MEDIA ("HOUSEID")@\r
 CREATE INDEX IDX_MEDIA_CREATED ON MEDIA ("CREATED")@\r
 CREATE INDEX IDX_MEDIA_ARCHIVED ON MEDIA ("ARCHIVED")@\r
@@ -246,6 +246,7 @@ CREATE UNIQUE INDEX UDX_STORE_NAME ON STORE ("NAME")@
 CREATE TABLE MEDIAFILE \r
 (\r
        ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1) PRIMARY KEY,\r
+       HOUSEID VARCHAR(1000), \r
        MEDIAID BIGINT NOT NULL,\r
        STOREID BIGINT NOT NULL,\r
        FILETYPEID BIGINT NOT NULL,\r

diff --git a/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 b/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2
index 5e75fdd4b1d3e3bcbe80b84c1273a7ffa53221f8..24ba00c4d81cecca820cd8f94dc10d150018d2ab 100644 (file)
--- 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"\r
 db2ts "update index media_desc for text connect to mc"\r
 db2ts "update index media_houseid for text connect to mc"\r
-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"\r
+\r

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 d2015e5d1579c3fa5eb91164128933155809b7b6..d12647dee08f4c6141b516b943030cd31fdb4a36 100644 (file)
--- 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();\r
                        sql.append("select * from ((");\r
                        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");\r
-                       sql.append(" where ((CONTAINS(i.title, ?) >= 1)  OR (CONTAINS(i.description, ?) >= 1)) and m.itemid = i.id and mf.MEDIAID = m.id");\r
+                       sql.append(\r
+                                       " 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");\r
                        sql.append(")UNION(");\r
                        sql.append(\r
                                        "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");\r
-                       sql.append(" where ((CONTAINS(m2.title, ?) >= 1)  OR (CONTAINS(m2.description, ?) >= 1)) and m2.itemid = i2.id and mf2.MEDIAID = m2.id");\r
+                       sql.append(\r
+                                       " 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");\r
                        sql.append(")UNION(");\r
                        sql.append(\r
                                        "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");\r
@@ -210,7 +212,7 @@ public class ItemDAOEx {
                        // query = "SELECT * FROM ITEM ORDER BY title";\r
 \r
                        st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);\r
-                       for (int s = 1; s <= 5; s++) {\r
+                       for (int s = 1; s <= 7; s++) {\r
                                st.setString(s, criteria);\r
                        }\r
                        rs = st.executeQuery();\r