From 53f520be284eaeae8deedffe7fcd0d2d271d365e Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 17 Oct 2017 12:17:49 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30637 --- .../debug-mediacube-remote.launch | 2 +- .../jobengine/server/steps/TSMBackupStep.java | 12 +-------- .../server/steps/TranscodeSELENIOStep.java | 3 +++ .../common/nexio/test/NexioDataMinerTest.java | 9 ++++++- .../sql/4-CreateTrigger.db2 | 16 +++++++++++ .../sql/5-CreateFTIndex.db2 | 27 +++++++++++++++++++ 6 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 server/user.jobengine.osgi.db/sql/4-CreateTrigger.db2 create mode 100644 server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 diff --git a/server/-configuration/debug-mediacube-remote.launch b/server/-configuration/debug-mediacube-remote.launch index 86198ac0..4a99bae5 100644 --- a/server/-configuration/debug-mediacube-remote.launch +++ b/server/-configuration/debug-mediacube-remote.launch @@ -7,7 +7,7 @@ - + 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 9f77a2fa..70d0f093 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 @@ -55,8 +55,7 @@ public class TSMBackupStep extends JobStep { String sourceFileName = sourceMediaFile.toFile().getName(); RemoteFile remoteFile = sourceUri.transferFrom(targetUri, sourceFileName, sourceFileName); - String name = getHouseId(archiveItem); - saveMetadata(mediaCubeMedia, sourceFileName, name); + saveMetadata(mediaCubeMedia, sourceFileName, archiveItem.getMediaHouseId()); logger.info(getMarker(), "A {} állomány archiválása sikeres.", archiveItem.getMediaFile().toFile().getName()); KillDateFile killDateFile = new KillDateFile(sourceMediaFile.getParent().toString(), sourceMediaFile.getFileName().toString()); @@ -72,15 +71,6 @@ public class TSMBackupStep extends JobStep { return null; } - private String getHouseId(ArchiveItem archiveItem) { - String name = archiveItem.getMediaFile().toFile().getName(); - int pos = name.lastIndexOf("."); - if (pos > 0) { - name = name.substring(0, pos); - } - return name; - } - private void saveMetadata(Media mediaCubeMedia, String sourceFileName, String houseId) { MediaFile mediaFile = manager.createMediaFile(sourceFileName, fileType, tsmStore, mediaCubeMedia); mediaFile.add(); diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java index c3f65319..0659150d 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TranscodeSELENIOStep.java @@ -152,6 +152,9 @@ public class TranscodeSELENIOStep extends JobStep { if (transcodeTask == null) throw new NullPointerException("Unable to query transcode task, server response is empty for transcode input: " + sourceFile); + Integer estimate = transcodeTask.getEstimateSecondsRemaining(); + if (estimate != null) + logger.info("Estimate {}", estimate); Double progress = transcodeTask.getProgress(); if (progress != null) jobRuntime.incrementProgress((int) Math.round(progress * 100)); diff --git a/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java b/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java index 6052a2c7..84bd763c 100644 --- a/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java +++ b/server/user.jobengine.osgi.commons/test/user/common/nexio/test/NexioDataMinerTest.java @@ -83,6 +83,14 @@ public class NexioDataMinerTest { c.getMediabase().getProtocol().setDescription("%0000205", "VALAMI"); } + @Test + public void test() throws Exception { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 60; i++) + sb.append(i + ","); + System.out.println(sb.toString()); + } + @Test public void testKillDateConverter() throws Exception { byte[] data = { 8, -58 }; @@ -94,5 +102,4 @@ public class NexioDataMinerTest { System.out.println(String.format("day %s month %s year %s", day, month, year)); } - } diff --git a/server/user.jobengine.osgi.db/sql/4-CreateTrigger.db2 b/server/user.jobengine.osgi.db/sql/4-CreateTrigger.db2 new file mode 100644 index 00000000..e734f387 --- /dev/null +++ b/server/user.jobengine.osgi.db/sql/4-CreateTrigger.db2 @@ -0,0 +1,16 @@ +-- execute with +-- db2 -td@ -vmf 2-CreateStructure.db2 + +DROP TRIGGER TRG_INSERT_ITEM@ + +CREATE TRIGGER TRG_INSERT_ITEM + AFTER INSERT ON ITEM + REFERENCING NEW AS r + FOR EACH ROW +BEGIN ATOMIC + DECLARE x VARCHAR(255); + CALL SYSPROC.SYSTS_UPDATE(NULL, 'item_title', NULL, 'hu_HU', :x); + CALL SYSPROC.SYSTS_UPDATE(NULL, 'item_desc', NULL, 'hu_HU', :x); + CALL SYSPROC.SYSTS_UPDATE(NULL, 'item_houseid', NULL, 'hu_HU', :x); +END +@ diff --git a/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 b/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 new file mode 100644 index 00000000..5e75fdd4 --- /dev/null +++ b/server/user.jobengine.osgi.db/sql/5-CreateFTIndex.db2 @@ -0,0 +1,27 @@ +db2ts "ENABLE DATABASE FOR TEXT CONNECT TO MC" +db2ts start for text + +db2ts "drop index item_title for text connect to mc" +db2ts "drop index item_desc for text connect to mc" +db2ts "drop index item_houseid for text connect to mc" +db2ts "drop index media_title for text connect to mc" +db2ts "drop index media_desc for text connect to mc" +db2ts "drop index media_houseid for text connect to mc" +db2ts "drop index mediafile_houseid for text connect to mc" + + +db2ts "create index item_title for text on item(title) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) connect to mc" +db2ts "create index item_desc for text on item(description) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" +db2ts "create index item_houseid for text on item(houseId) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" +db2ts "create index media_title for text on media(title) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" +db2ts "create index media_desc for text on media(description) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" +db2ts "create index media_houseid for text on media(houseid) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" +db2ts "create index mediafile_houseid for text on mediafile(houseid) UPDATE FREQUENCY D(*) H(*) M(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59) UPDATE MINIMUM 1 connect to mc" + +db2ts "update index item_title for text connect to mc" +db2ts "update index item_desc for text connect to mc" +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 -- 2.54.0