From: Vásáry Dániel Date: Mon, 2 Jul 2018 07:30:14 +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=a94fdae8a9690a192c4616d5d55640f3e2cc6359;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31138 --- diff --git a/server/-configuration/dashboard-remote-debug.launch b/server/-configuration/dashboard-remote-debug.launch deleted file mode 100644 index 4baf1a2f..00000000 --- a/server/-configuration/dashboard-remote-debug.launch +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser index 99f14873..c5c009bb 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser index 9491abe3..7be7747e 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser index c3519e45..2d2deeab 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser index 64acc7fa..5b5d4de8 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser index 68910d52..97e9257c 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser index 3ddac06a..e096a8d7 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser index 720022ad..b0eca680 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser index eedd5121..258f6ef9 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser index e38149e9..066db69f 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser index 34801f22..288ed7ae 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO.java index 4fc164cd..6847ddd7 100644 --- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO.java +++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO.java @@ -342,7 +342,7 @@ class JobDAO extends EntityBaseDAO { // ************************************************************ // #sql [context] iter = { SELECT ID, NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME // FROM JOB WHERE TEMPLATE = :template -// AND STATUS IN ('EXECUTING', 'WAIT_EXECUTOR', 'WAIT_SUSPEND', 'SUSPENDED', 'RUNABLE') }; +// AND STATUS IN ('EXECUTING', 'WAIT_EXECUTOR', 'WAIT_SUSPEND', 'RUNABLE') }; // ************************************************************ { @@ -367,7 +367,7 @@ class JobDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:128^93*/ +/*@lineinfo:user-code*//*@lineinfo:128^80*/ result = getList(context, iter, false); } catch (Exception e) { throw new ItemManagerException(e); diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser index 08c8fa81..b71a6ec6 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser index 121a755e..2a5aeb02 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser index e84d790b..38eb45bd 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser index ea938a1c..d893d8f4 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java index 515f10d4..353230a0 100644 --- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java +++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO.java @@ -16,6 +16,7 @@ class MediaFileIter extends sqlj.runtime.ref.ResultSetIterImpl implements sqlj.runtime.NamedIterator { + private int houseIdNdx; private int fileStructInfoNdx; private int relativePathNdx; private int fileTypeIdNdx; @@ -32,6 +33,7 @@ implements sqlj.runtime.NamedIterator fileTypeIdNdx = findColumn("fileTypeId"); relativePathNdx = findColumn("relativePath"); fileStructInfoNdx = findColumn("fileStructInfo"); + houseIdNdx = findColumn("houseId"); } public MediaFileIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) throws java.sql.SQLException @@ -43,6 +45,7 @@ implements sqlj.runtime.NamedIterator fileTypeIdNdx = findColumn("fileTypeId"); relativePathNdx = findColumn("relativePath"); fileStructInfoNdx = findColumn("fileStructInfo"); + houseIdNdx = findColumn("houseId"); } public long id() throws java.sql.SQLException @@ -74,12 +77,17 @@ implements sqlj.runtime.NamedIterator { return resultSet.getString(fileStructInfoNdx); } + public String houseId() + throws java.sql.SQLException + { + return resultSet.getString(houseIdNdx); + } } // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:9^124*/ +/*@lineinfo:user-code*//*@lineinfo:9^140*/ @SuppressWarnings("unused") public class MediaFileDAO extends EntityBaseDAO { @@ -100,6 +108,7 @@ public class MediaFileDAO extends EntityBaseDAO { entity.setFileTypeId(iterator.fileTypeId()); entity.setRelativePath(iterator.relativePath()); entity.setFileStructInfo(iterator.fileStructInfo()); + entity.setHouseId(iterator.houseId()); if (result == null) result = new ArrayList(); @@ -112,10 +121,10 @@ public class MediaFileDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:42^2*/ + /*@lineinfo:generated-code*//*@lineinfo:43^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE WHERE ID = :id }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE ID = :id }; // ************************************************************ { @@ -140,17 +149,17 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:42^126*/ +/*@lineinfo:user-code*//*@lineinfo:43^135*/ return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:49^2*/ + /*@lineinfo:generated-code*//*@lineinfo:50^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE WHERE MEDIAID = :id }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE MEDIAID = :id }; // ************************************************************ { @@ -175,17 +184,17 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:49^131*/ +/*@lineinfo:user-code*//*@lineinfo:50^140*/ return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaFileIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:56^2*/ + /*@lineinfo:generated-code*//*@lineinfo:57^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO FROM MEDIAFILE }; +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE }; // ************************************************************ { @@ -209,13 +218,13 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:56^111*/ +/*@lineinfo:user-code*//*@lineinfo:57^120*/ return iter; } @Override protected void delete(DefaultContext context, long id) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:62^2*/ + /*@lineinfo:generated-code*//*@lineinfo:63^2*/ // ************************************************************ // #sql [context] { DELETE FROM MEDIAFILE WHERE ID = :id }; @@ -243,12 +252,12 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:62^56*/ +/*@lineinfo:user-code*//*@lineinfo:63^56*/ } @Override protected void truncateTable(DefaultContext context) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:67^2*/ + /*@lineinfo:generated-code*//*@lineinfo:68^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE MEDIAFILE DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; @@ -275,7 +284,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:67^90*/ +/*@lineinfo:user-code*//*@lineinfo:68^90*/ } @Override @@ -287,11 +296,12 @@ public class MediaFileDAO extends EntityBaseDAO { long fileTypeId = obj.getFileTypeId(); String relativePath = obj.getRelativePath(); String fileStructInfo = obj.getFileStructInfo(); + String houseId = obj.getHouseId(); - /*@lineinfo:generated-code*//*@lineinfo:80^2*/ + /*@lineinfo:generated-code*//*@lineinfo:82^2*/ // ************************************************************ -// #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo WHERE ID = :id }; +// #sql [context] { UPDATE MEDIAFILE SET MEDIAID = :mediaId, STOREID = :storeId, FILETYPEID = :fileTypeId, RELATIVEPATH = :relativePath, FILESTRUCTINFO = :fileStructInfo, HOUSEID = :houseId WHERE ID = :id }; // ************************************************************ { @@ -308,7 +318,8 @@ public class MediaFileDAO extends EntityBaseDAO { __sJT_stmt.setLong(3, fileTypeId); __sJT_stmt.setString(4, relativePath); __sJT_stmt.setString(5, fileStructInfo); - __sJT_stmt.setLong(6, id); + __sJT_stmt.setString(6, houseId); + __sJT_stmt.setLong(7, id); __sJT_execCtx.executeUpdate(); } finally @@ -321,7 +332,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:80^184*/ +/*@lineinfo:user-code*//*@lineinfo:82^204*/ } @Override @@ -332,11 +343,12 @@ public class MediaFileDAO extends EntityBaseDAO { long fileTypeId = obj.getFileTypeId(); String relativePath = obj.getRelativePath(); String fileStructInfo = obj.getFileStructInfo(); + String houseId = obj.getHouseId(); - /*@lineinfo:generated-code*//*@lineinfo:92^2*/ + /*@lineinfo:generated-code*//*@lineinfo:95^2*/ // ************************************************************ -// #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo) }; +// #sql [context] { INSERT INTO MEDIAFILE (MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID) VALUES (:mediaId, :storeId, :fileTypeId, :relativePath, :fileStructInfo, :houseId) }; // ************************************************************ { @@ -353,6 +365,7 @@ public class MediaFileDAO extends EntityBaseDAO { __sJT_stmt.setLong(3, fileTypeId); __sJT_stmt.setString(4, relativePath); __sJT_stmt.setString(5, fileStructInfo); + __sJT_stmt.setString(6, houseId); __sJT_execCtx.executeUpdate(); } finally @@ -365,7 +378,7 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:92^175*/ +/*@lineinfo:user-code*//*@lineinfo:95^194*/ } void addAll(DefaultContext context, IEntityBase entity) throws SQLException { @@ -386,7 +399,7 @@ public class MediaFileDAO extends EntityBaseDAO { void removeAll(DefaultContext context, long filterId) throws SQLException { manager.traceIn(); - /*@lineinfo:generated-code*//*@lineinfo:113^2*/ + /*@lineinfo:generated-code*//*@lineinfo:116^2*/ // ************************************************************ // #sql [context] { DELETE FROM MEDIAFILE WHERE MEDIAID = :filterId }; @@ -414,9 +427,60 @@ public class MediaFileDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:113^67*/ +/*@lineinfo:user-code*//*@lineinfo:116^67*/ manager.traceOut(); } + + private MediaFileIter selectByHouseId(DefaultContext context, String houseId) throws SQLException{ + MediaFileIter iter = null; + /*@lineinfo:generated-code*//*@lineinfo:122^2*/ + +// ************************************************************ +// #sql [context] iter = { SELECT ID, MEDIAID, STOREID, FILETYPEID, RELATIVEPATH, FILESTRUCTINFO, HOUSEID FROM MEDIAFILE WHERE HOUSEID = :houseId }; +// ************************************************************ + +{ + sqlj.runtime.ConnectionContext __sJT_connCtx = context; + if (__sJT_connCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX(); + sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext(); + if (__sJT_execCtx == null) sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX(); + synchronized (__sJT_execCtx) { + sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, MediaFileDAO_SJProfileKeys.getKey(0), 8); + try + { + __sJT_stmt.setString(1, houseId); + iter = new MediaFileIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:122^145*/ + return iter; + } + + public List getByHouseId(String houseId) { + manager.traceIn(); + List result = null; + DefaultContext context = manager.getDbContext(); + try { + ResultSetIterImpl iter = selectByHouseId(context, houseId); + result = getList(context, iter, false); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + manager.traceOut(); + return result; + } + }/*@lineinfo:generated-code*/class MediaFileDAO_SJProfileKeys { private java.lang.Object[] keys; diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser index 4b652a8a..6220aa0d 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser index aeda1309..9af1cb36 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser index 30a8d013..d8709a2d 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser index fea5ad07..088abbba 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser index 0d11323f..387089de 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser index 58ee6700..f3acac86 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser index b719c375..c4b374e0 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser index c6d41b40..a4008ab9 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser index 8d66ca82..2d80dce4 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser index 18b9e5d5..fcda0476 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser index 48509c90..55c219d6 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser index c3788921..91a0983a 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO.java b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO.java index 60aa24dc..2c0f779d 100644 --- a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO.java +++ b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO.java @@ -19,6 +19,7 @@ extends sqlj.runtime.ref.ResultSetIterImpl implements sqlj.runtime.NamedIterator { private int sizeNdx; + private int userNameNdx; private int tagNdx; private int destinationNdx; private int sourceNdx; @@ -43,6 +44,7 @@ implements sqlj.runtime.NamedIterator sourceNdx = findColumn("source"); destinationNdx = findColumn("destination"); tagNdx = findColumn("tag"); + userNameNdx = findColumn("userName"); sizeNdx = findColumn("size"); } public WorkflowActionIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) @@ -59,6 +61,7 @@ implements sqlj.runtime.NamedIterator sourceNdx = findColumn("source"); destinationNdx = findColumn("destination"); tagNdx = findColumn("tag"); + userNameNdx = findColumn("userName"); sizeNdx = findColumn("size"); } public long id() @@ -111,6 +114,11 @@ implements sqlj.runtime.NamedIterator { return resultSet.getString(tagNdx); } + public String userName() + throws java.sql.SQLException + { + return resultSet.getString(userNameNdx); + } public long size() throws java.sql.SQLException { @@ -121,7 +129,7 @@ implements sqlj.runtime.NamedIterator // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:11^211*/ +/*@lineinfo:user-code*//*@lineinfo:11^228*/ @SuppressWarnings("unused") class WorkflowActionDAO extends EntityBaseDAO { @@ -146,6 +154,7 @@ class WorkflowActionDAO extends EntityBaseDAO { entity.setSource(iterator.source()); entity.setDestination(iterator.destination()); entity.setTag(iterator.tag()); + entity.setUserName(iterator.userName()); entity.setSize(iterator.size()); if (result == null) @@ -159,10 +168,10 @@ class WorkflowActionDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ WorkflowActionIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:49^2*/ + /*@lineinfo:generated-code*//*@lineinfo:50^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, SIZE FROM WORKFLOWACTION WHERE ID = :id }; +// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, USERNAME, SIZE FROM WORKFLOWACTION WHERE ID = :id }; // ************************************************************ { @@ -187,17 +196,17 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:49^165*/ +/*@lineinfo:user-code*//*@lineinfo:50^175*/ return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ WorkflowActionIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:56^2*/ + /*@lineinfo:generated-code*//*@lineinfo:57^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, SIZE FROM WORKFLOWACTION }; +// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, USERNAME, SIZE FROM WORKFLOWACTION }; // ************************************************************ { @@ -221,16 +230,16 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:56^150*/ +/*@lineinfo:user-code*//*@lineinfo:57^160*/ return iter; } private ResultSetIterImpl selectByFinished(DefaultContext context, Timestamp begin, Timestamp end) throws SQLException{ WorkflowActionIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:62^2*/ + /*@lineinfo:generated-code*//*@lineinfo:63^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, SIZE FROM WORKFLOWACTION WHERE FINISHED BETWEEN :begin AND :end ORDER BY HOUSEID }; +// #sql [context] iter = { SELECT ID, TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, USERNAME, SIZE FROM WORKFLOWACTION WHERE FINISHED BETWEEN :begin AND :end ORDER BY HOUSEID }; // ************************************************************ { @@ -256,13 +265,13 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:62^207*/ +/*@lineinfo:user-code*//*@lineinfo:63^217*/ return iter; } @Override protected void delete(DefaultContext context, long id) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:68^2*/ + /*@lineinfo:generated-code*//*@lineinfo:69^2*/ // ************************************************************ // #sql [context] { DELETE FROM WORKFLOWACTION WHERE ID = :id }; @@ -290,12 +299,12 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:68^61*/ +/*@lineinfo:user-code*//*@lineinfo:69^61*/ } @Override protected void truncateTable(DefaultContext context) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:73^2*/ + /*@lineinfo:generated-code*//*@lineinfo:74^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE WORKFLOWACTION DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; @@ -322,7 +331,7 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:73^95*/ +/*@lineinfo:user-code*//*@lineinfo:74^95*/ } @Override @@ -339,12 +348,13 @@ class WorkflowActionDAO extends EntityBaseDAO { String source = obj.getSource(); String destination = obj.getDestination(); String tag = obj.getTag(); + String userName = obj.getUserName(); long size = obj.getSize(); - /*@lineinfo:generated-code*//*@lineinfo:92^2*/ + /*@lineinfo:generated-code*//*@lineinfo:94^2*/ // ************************************************************ -// #sql [context] { UPDATE WORKFLOWACTION SET TOUCHED = :touched, STARTED = :started, FINISHED = :finished, SUCCESSFUL = :successful, HOUSEID = :houseId, DESCRIPTION = :description, SOURCE = :source, DESTINATION = :destination, TAG = :tag, SIZE = :size WHERE ID = :id }; +// #sql [context] { UPDATE WORKFLOWACTION SET TOUCHED = :touched, STARTED = :started, FINISHED = :finished, SUCCESSFUL = :successful, HOUSEID = :houseId, DESCRIPTION = :description, SOURCE = :source, DESTINATION = :destination, TAG = :tag, USERNAME = :userName, SIZE = :size WHERE ID = :id }; // ************************************************************ { @@ -365,8 +375,9 @@ class WorkflowActionDAO extends EntityBaseDAO { __sJT_stmt.setString(7, source); __sJT_stmt.setString(8, destination); __sJT_stmt.setString(9, tag); - __sJT_stmt.setLong(10, size); - __sJT_stmt.setLong(11, id); + __sJT_stmt.setString(10, userName); + __sJT_stmt.setLong(11, size); + __sJT_stmt.setLong(12, id); __sJT_execCtx.executeUpdate(); } finally @@ -379,7 +390,7 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:92^267*/ +/*@lineinfo:user-code*//*@lineinfo:94^289*/ } @Override @@ -396,12 +407,13 @@ class WorkflowActionDAO extends EntityBaseDAO { String source = obj.getSource(); String destination = obj.getDestination(); String tag = obj.getTag(); + String userName = obj.getUserName(); long size = obj.getSize(); - /*@lineinfo:generated-code*//*@lineinfo:111^2*/ + /*@lineinfo:generated-code*//*@lineinfo:114^2*/ // ************************************************************ -// #sql [context] { INSERT INTO WORKFLOWACTION (TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, SIZE) VALUES (:touched, :started, :finished, :successful, :houseId, :description, :source, :destination, :tag, :size) }; +// #sql [context] { INSERT INTO WORKFLOWACTION (TOUCHED, STARTED, FINISHED, SUCCESSFUL, HOUSEID, DESCRIPTION, SOURCE, DESTINATION, TAG, USERNAME, SIZE) VALUES (:touched, :started, :finished, :successful, :houseId, :description, :source, :destination, :tag, :userName, :size) }; // ************************************************************ { @@ -422,7 +434,8 @@ class WorkflowActionDAO extends EntityBaseDAO { __sJT_stmt.setString(7, source); __sJT_stmt.setString(8, destination); __sJT_stmt.setString(9, tag); - __sJT_stmt.setLong(10, size); + __sJT_stmt.setString(10, userName); + __sJT_stmt.setLong(11, size); __sJT_execCtx.executeUpdate(); } finally @@ -435,7 +448,7 @@ class WorkflowActionDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:111^253*/ +/*@lineinfo:user-code*//*@lineinfo:114^274*/ } public List getWorkflowActions(Timestamp begin, Timestamp end) { diff --git a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser index d18a0605..50b10984 100644 Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser differ diff --git a/server/user.jobengine.osgi.db/sql/alter.sql b/server/user.jobengine.osgi.db/sql/alter.sql new file mode 100644 index 00000000..a02abbab --- /dev/null +++ b/server/user.jobengine.osgi.db/sql/alter.sql @@ -0,0 +1,53 @@ +ALTER TABLE mediafile + ALTER COLUMN relativepath + SET DATA TYPE VARCHAR(1000) + +select i.houseid,i.title,h.duplicates from item i +inner join ( + select title,count(*) as duplicates from item + where title like '2%' and title like '%Echo%' + group by title +) h on i.title=h.title +order by i.created desc + +select * from item where title='2018.01.17 22:00 H�rad� Echo TV' +select * from media where itemid=30677 +select * from media where itemid=30567 + + +alter table media add column description1 CLOB(300K) +update media set description1=description +--alter table clobmedia drop column description +alter table media rename column description to descorig +alter table media rename column description1 to description +--alter table clobmedia ADD CONSTRAINT pk_clobmedia_id PRIMARY KEY (id) + + +alter table workflowaction add duration bigint default 0 +alter table workflowaction add filecreated timestamp default null + + + +CREATE VIEW DB2ADMIN.VW_ARCHIVEDMEDIA as +select +i.id as itemid, +i.houseid as itemhouseid, +i.title as itemtitle, +i.description as itemdescription, +i.created as itemcreated, +m.id as mediaid, +m.houseid as mediahouseid, +m.title as mediatitle, +m.description as mediadescription, +m.created as mediacreated, +m.archived as mediaarchived, +m.length as medialength, +itm.id as mediatypeid, +itm.name as mediatypename, +mf.houseid as mediafilehouseid +from mediafile mf +left outer join media m on (m.id = mf.mediaid) +left outer join item i on (i.id = m.itemid) +left outer join itemtype itm on (itm.id = m.itemtypeid) +where mf.storeid = 1 +go diff --git a/server/user.jobengine.osgi.db/sql/cleanup-dev.sql b/server/user.jobengine.osgi.db/sql/cleanup-dev.sql new file mode 100644 index 00000000..005576fa --- /dev/null +++ b/server/user.jobengine.osgi.db/sql/cleanup-dev.sql @@ -0,0 +1,205 @@ +--Delete wrong metadatas + +--Összes felülírt PGM (törölhetõek) +delete from mediafile where mediaid in ( + select i.mediaid from vw_items i inner join vw_itemduplicates id on i.mediafilehouseid=id.mediafilehouseid and i.archived!=id.maxarchived + where i.mediafilehouseid like '%PGM%' + order by i.mediafilehouseid, i.archived +) + +delete from media where id not in ( + select mediaid from mediafile +) + +--ELLENÕRZÉS Összes felülírt PGM (törölhetõek) +select count(*) from mediafile where mediaid in ( + select i.mediaid from vw_items i inner join vw_itemduplicates id on i.mediafilehouseid=id.mediafilehouseid and i.archived!=id.maxarchived + where i.mediafilehouseid like '%PGM%' + order by i.mediafilehouseid, i.archived +) + +select count(*) from media where id not in ( + select mediaid from mediafile +) + +select * from mediafile where mediaid in ( + select i.mediaid from vw_items i inner join vw_itemduplicates id on i.mediafilehouseid=id.mediafilehouseid and i.archived!=id.maxarchived + where i.mediafilehouseid like '%PGM%' + order by i.mediafilehouseid, i.archived +) + + +select i.itemtitle, i.mediafilehouseid, i.mediaid from vw_items i inner join vw_itemduplicates id on i.mediafilehouseid=id.mediafilehouseid and i.archived!=id.maxarchived +where i.mediafilehouseid like '%PGM%' +order by mediafilehouseid, archived + +--Összes duplikátum számossága, legújabb verzió +drop view vw_itemduplicates + +create view vw_itemduplicates as +select h.mediafilehouseid, h.maxarchived,h.duplicates from vw_items x +inner join ( + select mediafilehouseid, max(archived) as maxarchived, count(*) as duplicates from vw_items group by mediafilehouseid having count(*) > 1 order by mediafilehouseid +) h on x.mediafilehouseid=h.mediafilehouseid and x.archived = h.maxarchived + + +select i.itemtitle, i.mediafilehouseid, i.archived, id.duplicates from vw_items i inner join vw_itemduplicates id on i.mediafilehouseid=id.mediafilehouseid +where i.mediafilehouseid='1700_hirado_PGM_-_CS.MXF' +order by mediafilehouseid, archived + +-- +DROP VIEW VW_ITEMS + +CREATE VIEW VW_ITEMS as +select +i.id as itemid, +i.created as itemcreated, +it.name as itemtype, +i.houseid as itemhouseid, +i.title as itemtitle, +m.id as mediaid, +m.created as mediacreated, +m.archived, +m.length, +it.name as mediatype, +m.houseid as mediahouseid, +m.title as mediatitle, +mf.houseid as mediafilehouseid +from mediafile mf +left outer join media m on (m.id = mf.mediaid) +left outer join item i on (i.id = m.itemid) +left outer join itemtype it on (it.id = i.itemtypeid) +left outer join itemtype itn on (itn.id = m.itemtypeid) +where mf.storeid = 1 + + +SELECT count(*) FROM DB2ADMIN.WORKFLOWACTION where username is not null + +SELECT count(*) FROM media left outer join itemtype on (itemtype.id=media.itemtypeid) where itemtype.name='Visszarögzített' + + +--MEDIAFILE +select mediaid from vw_mediafiles where mediafilecount = 1 + +select mediaid from vw_mediafiles + +select * from mediafile f where f.mediaid in (select mediaid from vw_mediafiles where mediafilecount = 1) +select * from mediafile f where f.mediaid in (select mediaid from vw_mediafiles where mediafilecount = 2) +--delete from mediafile f where f.mediaid in (select mediaid from vw_mediafiles where mediafilecount = 1) +select * from mediafile f where f.mediaid in (select id from media where created > '2017-12-08') +--delete from mediafile f where f.mediaid in (select id from media where created > '2017-12-08') + + +--MEDIA +CREATE VIEW vw_mediafiles as select mediaid, count(*) as mediafilecount from mediafile group by (mediaid) +select m.id, m.title, m.created,f.mediafilecount from media m right outer join vw_mediafiles f on (f.mediaid = m.id) where m.created > '2017-12-14' and f.mediafilecount = 1 +select m.itemid, m.id, m.itemtypeid, m.title, m.created,f.mediafilecount from media m left outer join vw_mediafiles f on (f.mediaid = m.id) where f.mediafilecount is null +select m.itemid, m.id, m.itemtypeid, m.title, m.created,f.mediafilecount from media m left outer join vw_mediafiles f on (f.mediaid = m.id) where f.mediafilecount = 1 +--delete from media where id in (select m.id from media m left outer join vw_mediafiles f on (f.mediaid = m.id) where f.mediafilecount is null) + + + +--ITEM +CREATE VIEW vw_medias as select itemid, count(*) as mediacount from media group by (itemid) +select i.id, i.title, i.created, m.mediacount from item i left outer join vw_medias m on (m.itemid = i.id) where m.mediacount is null +--delete from item where id in (select i.id from item i left outer join vw_medias m on (m.itemid = i.id) where m.mediacount is null) + + + +--Összes klip +select count (*) from media where created like '2017-12%' +select count (distinct(houseid)) from media where created like '2017-12%' +select distinct(houseid) from media where created like '2017-12%' + +select count(distinct(mediahouseid)) from vw_items where mediacreated like '2018-01%' + +--Octopus ID-hez rendelt manuálisan archivált klip +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle from item i left outer join media m on (m.itemid = i.id) +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle from item i left outer join media m on (m.itemid = i.id) where i.title like 'Echo TV%' + +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle from item i left outer join media m on (m.itemid = i.id) where i.title like 'Echo TV%' + +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle from item i left outer join media m on (m.itemid = i.id) where i.title like 'Echo TV%' and m.created like '2017-12%' +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle, mf.houseid from item i +left outer join media m on (m.itemid = i.id) +left outer join mediafile mf on (mf.mediaid = m.id) +where i.title like 'Echo TV%' and m.created like '2017-12%' + +select count(distinct(m.houseid)) from item i left outer join media m on (m.itemid = i.id) where i.title like 'Echo TV%' and m.created like '2017-12%' + +select m.houseid, count(*) as darab from item i left outer join media m on (m.itemid = i.id) where i.title like 'Echo TV%' group by m.houseid order by houseid + +select * from vw_items where itemtitle like 'Echo TV%' and mediacreated like '2018-01%' +select count(distinct(mediahouseid)) from vw_items where itemtitle like 'Echo TV%' and mediacreated like '2018-01%' + +--Automatikusan archivált bejátszók +select * from vw_items where itemtitle like '%Echo TV%' and itemtitle like '2%' and mediatitle not like '%CLN%' and mediatitle not like '%PGM%' and mediacreated like '2018-01%' +select count(distinct(mediahouseid)) from vw_items where itemtitle like '%Echo TV%' and itemtitle like '2%' and mediatitle not like '%CLN%' and mediatitle not like '%PGM%' and mediacreated like '2018-01%' + +--ID-hez nem rendelt manuálisan archivált egyéb klip (magazin vagy forgatott) +select i.created, i.houseid as ihouse, i.title as ititle, i.description as idesc, m.houseid as mhouse, m.title as mtitle, m.description as mdesc from item i left outer join media m on (m.itemid = i.id) where i.houseid like 'MC-%' and m.houseid like 'MC-%' +select i.created, i.houseid as ihouse, i.title as ititle, i.description as idesc, m.houseid as mhouse, m.title as mtitle, m.description as mdesc from item i left outer join media m on (m.itemid = i.id) where i.houseid like 'MC-%' and m.houseid like 'MC-%' and m.created like '2018-01%' + +select count(distinct(m.houseid)) from item i left outer join media m on (m.itemid = i.id) where i.houseid like 'MC-%' and m.houseid like 'MC-%' and m.created like '2018-01%' +select * from vw_items where itemhouseid like 'MC-%' and mediahouseid like 'MC-%' and mediacreated like '2018-01%' + +select * from vw_items where itemtitle like 'MC-%' and mediahouseid like 'MC-%'and mediacreated like '2018-01%' +select count(distinct(mediahouseid)) from vw_items where itemtitle like 'MC-%' and mediahouseid like 'MC-%'and mediacreated like '2018-01%' + +--Migrált archívum +select i.created, i.houseid as ihouse, i.title as ititle, m.houseid as mhouse, m.title as mtitle from item i left outer join media m on (m.itemid = i.id) where i.houseid not like 'MC-%' and m.houseid like 'MC-%' + +--Reklám ID-hez rendelt klip +select * from vw_items where mediahouseid like 'R%'and mediacreated like '2018-01%' +select count(distinct(mediahouseid)) from vw_items where mediahouseid like 'R%'and mediacreated like '2018-01%' + +--Promo ID-hez rendelt klip +select * from vw_items where mediahouseid like 'P%'and mediacreated like '2018-01%' +select count(distinct(mediahouseid)) from vw_items where mediahouseid like 'P%'and mediacreated like '2018-01%' + +--Mûsor ID-hez rendelt klip +select * from vw_items where mediafilehouseid like 'M%' and mediafilehouseid not like 'MC%' and mediacreated like '2018-01%' +select count(distinct(mediafilehouseid)) from vw_items where mediafilehouseid like 'M%' and mediafilehouseid not like 'MC%' and mediacreated like '2018-01%' + + + +select * from vw_items where mediafilehouseid not like 'M%' and mediahouseid not like 'P%' and mediahouseid not like 'R%' and mediafilehouseid not like 'MC%' and mediacreated like '2018-01%' +and itemtitle not like '%Echo TV%' and itemtitle not like '2%' and mediatitle not like '%CLN%' and mediatitle not like '%PGM%' + +select count(distinct(mediafilehouseid)) from vw_items where mediafilehouseid not like 'M%' and mediahouseid not like 'P%' and mediahouseid not like 'R%' and mediafilehouseid not like 'MC%' and mediacreated like '2018-01%' +and itemtitle not like '%Echo TV%' and itemtitle not like '2%' and mediatitle not like '%CLN%' and mediatitle not like '%PGM%' + + + + + +insert into media (id, itemid, title, ITEMTYPEID, houseid, length) values (13985, 13045, 'xxx', 2, 'xxx', 0) + +select * from media fetch first 10 rows only + +select id from item where created > '2017-12-08' + +SELECT C.TABSCHEMA, C.TABNAME, +C.COLNAME +FROM SYSCAT.TABLES AS T, +SYSCAT.COLUMNS AS C +WHERE T.TBSPACEID = 2 +AND T.TABLEID = 14 +AND C.COLNO = 0 +AND C.TABSCHEMA = T.TABSCHEMA +AND C.TABNAME = T.TABNAME + +--REPLACE--(--source-string--,--search-string--+-------------------+--) + +select * from item where id=15200 +select * from media where houseid='31678529' + +update media set description=replace(description, '
', '\r\n') where id=28573 +update media set description=replace(description, '
', '\r\n') where id=28711 + +update media set description=replace(description, '
', '\r\n') where created > '2018-01-12' and title like '%hirado%' or title like '%hirek%' +update media set itemtypeid=21 where created > '2018-01-12' and title like '%hirado%' or title like '%hirek%' +select * from media where created > '2018-01-12' and title like '%hirado%' or title like '%hirek%' +select * from itemtype + +select i.title, m.* from media m left outer join item i on (i.id=m.itemid) where m.title like '%PGM%' order by i.title diff --git a/server/user.jobengine.osgi.db/sql/cleanup.sql b/server/user.jobengine.osgi.db/sql/cleanup.sql index 5a6e698d..557fe71b 100644 --- a/server/user.jobengine.osgi.db/sql/cleanup.sql +++ b/server/user.jobengine.osgi.db/sql/cleanup.sql @@ -1,4 +1,42 @@ ---Hamis LOWRES +select * from media where id = 76952087 + +select id,archived from media where length=0 order by archived desc +--Letezo mediahousid lekerdezese +drop view vw_rundown_items +create view vw_rundown_items as +select mediaid, MEDIAFILEHOUSEID,archived, +LEFT(mediafilehouseid, LOCATE_IN_STRING(mediafilehouseid,'-',-1) - 1) filename +from VW_ITEMS +where REGEXP_LIKE(left(mediafilehouseid, length(mediafilehouseid)-4), '^[0-9]+_[0-9]+-[0-9]+$') or +REGEXP_LIKE(left(mediafilehouseid, length(mediafilehouseid)-4), '^^[0-9]+_[0-9]+-[0-9]{3}+-[0-9]+$') + +select * from vw_rundown_items where mediafilehouseid like '89214003_1%' order by filename, mediaid +fetch first 1000 rows only + +select itemid, itemhouseid, mediaid, itemtitle, mediafilehouseid, +RIGHT(mediafilehouseid ,LENGTH(mediafilehouseid) - LOCATE_IN_STRING(mediafilehouseid,'-',-1) + 1) filename +from VW_ITEMS +where REGEXP_LIKE(left(mediafilehouseid, length(mediafilehouseid)-4), '^^[0-9]+_[0-9]+-[0-9]{3}+-[0-9]+$') + + +fetch first row only + + +select itemid, itemhouseid, mediaid, itemtitle, mediafilehouseid, +LEFT(mediafilehouseid ,LENGTH(mediafilehouseid) - LOCATE_IN_STRING(mediafilehouseid,'-',-1) - 2) filename, +left(mediafilehouseid, length(mediafilehouseid)-4) +from VW_ITEMS fetch first row only + + + + + +select itemid, mediaid, replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename +from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') != mediafilehouseid +and replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') = '75586630_1' + + +--Hamis LOWRES drop view vw_mediafiles_path create view vw_mediafiles_path as select relativepath, count(*) as count from mediafile where storeid=21 group by relativepath diff --git a/server/user.jobengine.osgi.db/sql/ftclob.sql b/server/user.jobengine.osgi.db/sql/ftclob.sql new file mode 100644 index 00000000..2a738a47 --- /dev/null +++ b/server/user.jobengine.osgi.db/sql/ftclob.sql @@ -0,0 +1,25 @@ +drop TABLE DB2ADMIN.ftclob + +CREATE TABLE DB2ADMIN.ftclob ( + id BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1, CACHE 20) NOT NULL, + text CLOB(200000) LOGGED NOT COMPACT, + primary key (id) + ) +IN USERSPACE1 +COMPRESS NO +GO + + + + +insert into ftclob (text) values (select description from media where id = '40186') + +update ftclob set text = concat(text, (select description from media where id = '40186')) + +update ftclob set text = concat(text, ' Vásáry Dani ') + +SELECT id FROM ftclob WHERE CONTAINS(text, 'vásáry + dani') + + +select length(TEXT) from ftclob + diff --git a/server/user.jobengine.osgi.db/sql/stat-rd.sql b/server/user.jobengine.osgi.db/sql/stat-rd.sql index 8bc191f3..b6594d26 100644 --- a/server/user.jobengine.osgi.db/sql/stat-rd.sql +++ b/server/user.jobengine.osgi.db/sql/stat-rd.sql @@ -1,14 +1,113 @@ +DROP VIEW DB2ADMIN.VW_ITEMS +go + +CREATE VIEW "DB2ADMIN"."VW_ITEMS" as +select +i.id as itemid, +i.created as itemcreated, +i.houseid as itemhouseid, +i.title as itemtitle, +m.id as mediaid, +m.created as mediacreated, +m.archived, +m.length, +it.name as mediatype, +m.houseid as mediahouseid, +m.title as mediatitle, +mf.id as mediafileid, +mf.houseid as mediafilehouseid +from mediafile mf +left outer join media m on (m.id = mf.mediaid) +left outer join item i on (i.id = m.itemid) +left outer join itemtype it on (it.id = m.itemtypeid) +where mf.storeid = 1 +go + +DROP VIEW DB2ADMIN.VW_ITEMS_LOWRES +go + +CREATE VIEW DB2ADMIN.VW_ITEMS_LOWRES as +select +i.id as itemid, +i.created as itemcreated, +it.name as itemtype, +i.houseid as itemhouseid, +i.title as itemtitle, +m.id as mediaid, +m.created as mediacreated, +m.archived, +m.length, +it.name as mediatype, +m.houseid as mediahouseid, +m.title as mediatitle, +mf.houseid as mediafilehouseid, +mf.relativepath +from mediafile mf +left outer join media m on (m.id = mf.mediaid) +left outer join item i on (i.id = m.itemid) +left outer join itemtype it on (it.id = i.itemtypeid) +left outer join itemtype itn on (itn.id = m.itemtypeid) +where mf.storeid = 21 +GO + +select itemtitle, mediafilehouseid, length, relativepath from vw_items_lowres +fetch first 10 rows only +go + +drop view vw_items_rd +go create view vw_items_rd as select *, replace(mediafilehouseid, concat('-', itemhouseid), '') as filename from vw_items where itemtitle like '%Echo TV%' and itemtitle like '2%' and mediatitle not like '%CLN%' and mediatitle not like '%PGM%' +go + + +select itemtitle, mediafilehouseid, filename, length, relativepath from vw_items_lowres where filename in ( + select filename, count(*) from vw_items_rd group by filename having count(*) > 1 +) +go + +drop view vw_items_rd_dup +go +create view vw_items_rd_dup as + select filename, count(*) as filecount from vw_items_rd group by filename having count(*) > 1 +go + +drop view vw_items_rd_lh +go + +create view vw_items_rd_lh as +select l.itemid, l.mediaid, l.mediatitle, h.mediafilehouseid, replace(h.mediafilehouseid, concat('-', h.itemhouseid), '') as filename, h.mediafileid, l.relativepath + from vw_items_lowres l, vw_items h where l.mediaid = h.mediaid +go + +select * from vw_items_rd_lh lh, vw_items_rd_dup d where lh.FILENAME = d.FILENAME +order by d.filecount, lh.filename +fetch first 10 rows only + + +select lh.* from vw_items_rd_lh lh, vw_items_rd_dup d where lh.FILENAME = d.FILENAME + and d.filecount=22 +order by d.filecount, lh.filename + + +select * from vw_items_rd_lh lh, vw_items_rd_dup d where lh.FILENAME = d.FILENAME +order by lh.filename, d.filecount +fetch first 1000 rows only + +select lh.itemid, lh.mediaid, d.filecount, d.filename, lh.relativepath from vw_items_rd_lh lh, vw_items_rd_dup d where lh.FILENAME = d.FILENAME +order by lh.filename, d.filecount +fetch first 1000 rows only + + +select * from vw_items_rd_dup where filename ='29410790_2.MXF' order by filecount desc +select * from vw_items_rd where filename ='29410790_2.MXF' +select l.itemid, l.mediaid, l.mediatitle, h.mediafilehouseid, + from vw_items_lowres l where h.mediafilehouseid + +select mediafileid, mediafilehouseid, relativepath from vw_items_rd_lh where filename ='29410790_2.MXF' -select * from vw_items_rd -select count(*) from vw_items_rd +select replace(mediafilehouseid, concat('-', concat(itemhouseid,'.MXF')), '') filename from vw_items where replace(mediafilehouseid, concat('-', itemhouseid), '') !=mediafilehouseid -select filename, count(*) as c from vw_items_rd group by filename order by c desc -select distinct(concat('''', concat(mediafilehouseid,''','))) from vw_items_rd -select itemtitle, mediafilehouseid, filename, archived from vw_items_rd where mediafilehouseid in ( - select distinct(mediafilehouseid) from vw_items_rd -) order by filename