From 1be94376540cc1926e8e4c955ca81959078b1ebb Mon Sep 17 00:00:00 2001 From: elgekko Date: Sun, 5 Mar 2023 21:36:23 +0100 Subject: [PATCH] Eredeti keresesi sebesseg visszaallitva --- .../run-mediacube-server-local.launch | 2 + server/-dependencies/jobengine.target | 1 - server/-dependencies/pom.xml | 5 +- server/-modules/pom.xml | 1 + server/-product/mediacube.product | 2 +- .../LOCAL/settings/application.yaml | 2 +- .../production/LOCAL/settings/mediacube.yaml | 4 +- server/user.commons.zk/META-INF/MANIFEST.MF | 3 +- .../build-remote-sqlj.bat | 10 +- .../user/jobengine/db/BreakDAO_SJProfile0.ser | Bin 3253 -> 3253 bytes .../db/DomainCategoryDAO_SJProfile0.ser | Bin 2552 -> 2552 bytes .../jobengine/db/DomainDAO_SJProfile0.ser | Bin 4043 -> 4043 bytes .../db/DomainIndexDAO_SJProfile0.ser | Bin 3143 -> 3143 bytes .../user/jobengine/db/EntityBaseDAO.java | 1643 +++++++++-------- .../jobengine/db/EntityBaseDAO_SJProfile0.ser | Bin 2286 -> 2286 bytes .../jobengine/db/FileTypeDAO_SJProfile0.ser | Bin 3872 -> 3872 bytes .../jobengine/db/FolderDAO_SJProfile0.ser | Bin 2479 -> 2479 bytes .../jobengine/db/HelperDAO_SJProfile0.ser | Bin 1674 -> 1674 bytes .../user/jobengine/db/ItemDAO_SJProfile0.ser | Bin 4337 -> 4337 bytes .../jobengine/db/ItemTypeDAO_SJProfile0.ser | Bin 2933 -> 2933 bytes .../generated/user/jobengine/db/JobDAO.java | 531 +++--- .../user/jobengine/db/JobDAO_SJProfile0.ser | Bin 5413 -> 5414 bytes .../user/jobengine/db/JobParametersDAO.java | 402 ++-- .../db/JobParametersDAO_SJProfile0.ser | Bin 2355 -> 2355 bytes .../jobengine/db/MasterIdDAO_SJProfile0.ser | Bin 1655 -> 1655 bytes .../generated/user/jobengine/db/MediaDAO.java | 63 +- .../user/jobengine/db/MediaDAO_SJProfile0.ser | Bin 5098 -> 5358 bytes .../jobengine/db/MediaFileDAO_SJProfile0.ser | Bin 5008 -> 5008 bytes .../user/jobengine/db/MetadataDAO.java | 4 +- .../jobengine/db/MetadataDAO_SJProfile0.ser | Bin 6747 -> 6747 bytes .../db/MetadataElementDAO_SJProfile0.ser | Bin 2990 -> 2990 bytes .../db/MetadataTypeDAO_SJProfile0.ser | Bin 3013 -> 3013 bytes .../db/RemoteStoreDAO_SJProfile0.ser | Bin 3178 -> 3178 bytes .../db/SceneContentDAO_SJProfile0.ser | Bin 3376 -> 3376 bytes .../user/jobengine/db/SceneDAO_SJProfile0.ser | Bin 2973 -> 2973 bytes .../db/SearchDefinitionDAO_SJProfile0.ser | Bin 3528 -> 3528 bytes .../user/jobengine/db/ShotDAO_SJProfile0.ser | Bin 3487 -> 3487 bytes .../user/jobengine/db/StoreDAO_SJProfile0.ser | Bin 3164 -> 3164 bytes .../user/jobengine/db/StoreUriDAO.java | 684 +++---- .../jobengine/db/StoreUriDAO_SJProfile0.ser | Bin 4756 -> 4756 bytes .../jobengine/db/UserInfoDAO_SJProfile0.ser | Bin 3637 -> 3637 bytes .../db/WorkflowActionDAO_SJProfile0.ser | Bin 4737 -> 4737 bytes .../src/user/jobengine/db/IItemManager.java | 4 +- .../src/user/jobengine/db/ItemManager.java | 67 +- .../src/user/jobengine/db/Media.java | 9 + .../src/user/jobengine/db/MediaDAO.sqlj | 17 +- .../user/jobengine/search/MediaFinder.java | 342 +--- .../user/jobengine/search/SearchResult.java | 23 +- .../test/user/jobengine/db/TestItem.java | 12 - .../osgi/mediacube/MediaCubeService.java | 3 +- .../user.mediacube.gui/META-INF/MANIFEST.MF | 2 +- server/user.mediacube.gui/css/tagify.css | 8 +- server/user.mediacube.gui/js/searchitems.js | 7 + server/user.mediacube.gui/pages/menu.zul | 12 +- .../user.mediacube.gui/pages/searchitems.zul | 26 +- .../pages/searchitems/details.zul | 3 + .../resources/i3-label_hu.properties | 4 +- .../jobengine/zk/model/AsyncBaseModel.java | 7 +- .../jobengine/zk/model/CachedListModel.java | 30 +- .../jobengine/zk/model/GridSearchModel.java | 81 +- .../zk/model/InitializedCachedListModel.java | 4 +- 61 files changed, 1923 insertions(+), 2095 deletions(-) diff --git a/server/-configuration/run-mediacube-server-local.launch b/server/-configuration/run-mediacube-server-local.launch index ffcac96b..0fd2f9a6 100644 --- a/server/-configuration/run-mediacube-server-local.launch +++ b/server/-configuration/run-mediacube-server-local.launch @@ -12,6 +12,7 @@ + @@ -108,6 +109,7 @@ + diff --git a/server/-dependencies/jobengine.target b/server/-dependencies/jobengine.target index 46a32c90..af41a7e8 100644 --- a/server/-dependencies/jobengine.target +++ b/server/-dependencies/jobengine.target @@ -86,7 +86,6 @@ - win32 diff --git a/server/-dependencies/pom.xml b/server/-dependencies/pom.xml index 40e0e60f..6fd60f09 100644 --- a/server/-dependencies/pom.xml +++ b/server/-dependencies/pom.xml @@ -66,6 +66,7 @@ jar + @@ -91,9 +93,10 @@ default-cli - + org.apache.felix:org.apache.felix.gogo.command:0.12.0 diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 82dc366c..5ec0c60b 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -18,6 +18,7 @@ ../user.jobengine.log4j ../user.commons.zk ../user.tsm.client + ../hu.user.theme.userdark ../-product diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index c98528f5..0dbfa50f 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -38,7 +38,7 @@ - + diff --git a/server/-product/production/LOCAL/settings/application.yaml b/server/-product/production/LOCAL/settings/application.yaml index 9461a30c..42a5e798 100644 --- a/server/-product/production/LOCAL/settings/application.yaml +++ b/server/-product/production/LOCAL/settings/application.yaml @@ -4,7 +4,7 @@ datasource: user: db2admin password: password external-indexer: true - simple-search: true + simple-search: false login-timeout: 5 pool-size: 10 mediacube-nosql: diff --git a/server/-product/production/LOCAL/settings/mediacube.yaml b/server/-product/production/LOCAL/settings/mediacube.yaml index 68a7c549..3861350f 100644 --- a/server/-product/production/LOCAL/settings/mediacube.yaml +++ b/server/-product/production/LOCAL/settings/mediacube.yaml @@ -1,6 +1,6 @@ -#theme: userdark +theme: userdark jobQueuePollInterval: 1000 -searchResultsListCacheSize: 100 +searchResultsListCacheSize: 200 disableHelp: true maestroDisabled: false alternateRetrieveSelector: true diff --git a/server/user.commons.zk/META-INF/MANIFEST.MF b/server/user.commons.zk/META-INF/MANIFEST.MF index 18905611..97386174 100644 --- a/server/user.commons.zk/META-INF/MANIFEST.MF +++ b/server/user.commons.zk/META-INF/MANIFEST.MF @@ -828,6 +828,5 @@ Export-Package: bsh, web.zul.img.wnd, web.zul.less, web.zul.less.font -Require-Bundle: javax.servlet-api;bundle-version="3.1.0", - hu.user.zk.theme.userdark;bundle-version="1.0.0" +Require-Bundle: javax.servlet-api;bundle-version="3.1.0" Import-Package: org.slf4j;version="1.7.2" diff --git a/server/user.jobengine.osgi.db/build-remote-sqlj.bat b/server/user.jobengine.osgi.db/build-remote-sqlj.bat index 19a80e3d..2c0c5492 100644 --- a/server/user.jobengine.osgi.db/build-remote-sqlj.bat +++ b/server/user.jobengine.osgi.db/build-remote-sqlj.bat @@ -6,13 +6,9 @@ ::Remote:: SET REMOTE_LOCATION=/tmp/mediaarch -:: USER -:: SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 86:5b:9b:bc:df:7b:df:90:c6:bf:60:69:d2:c9:61:62 -:: SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.228.198.1 - -:: MV - SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 01:03:8c:04:b0:a2:7d:a4:90:c8:01:c8:d8:4e:44:0d - SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.11.1.90 +::LOCALVM HTV + SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd + SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@localvm CALL :deploy_source if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL% 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 5d29a10e6217addb4f1ab399473d80bb5528b97b..d21fb888ec40398e7758da458fa7bcf30078ddf9 100644 GIT binary patch delta 18 acmdlgxm9ul4a%7ZWGZWd%*!VLgM76(ZH delta 18 Zcmdlgxm9ul4a%7ZUYY!+mE&H(^V!3Zt@ delta 18 Zcmew%{6lyH4Wte_DP64a%7ZU&ZWd(R#RmXOSqIht delta 18 ZcmX>te_DP64uaa>{p4a%7ZVTZ5CuS;|2gpGzUfi delta 18 ZcmX>uaa>{p4 getAll() { - List result = null; - DefaultContext context = manager.getDbContext(); - try { - result = getAll(context); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - return result; - } - - @Override - public List getAll(IDAOIterProvider provider) { - List result = null; - DefaultContext context = manager.getDbContext(); - try { - result = getAll(context, provider); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - return result; - } - - @Override - public IEntityBase get(IDAOIterProvider provider) { - IEntityBase entity = null; - DefaultContext context = manager.getDbContext(); - try { - entity = get(context, provider); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - return entity; - } - - private IEntityBase get(DefaultContext context, IDAOIterProvider provider) { - manager.traceIn(); - IEntityBase entity = null; - try { - ResultSetIterImpl iter = provider.get(context, this); - checkNull(iter, ResultSetIterImpl.class); - entity = getEntity(context, iter); - afterGet(context, entity); - } catch (Exception e) { - throw new ItemManagerException(e); - } - manager.traceOut(); - return entity; - } - - public List getAll(DefaultContext context, IDAOIterProvider provider) { - manager.traceIn(); - List result = null; - try { - ResultSetIterImpl iter = provider.get(context, this); - checkNull(iter, ResultSetIterImpl.class); - result = getList(context, iter, false, true); - } catch (Exception e) { - throw new ItemManagerException(e); - } - manager.traceOut(); - return result; - } - - public List getAll(DefaultContext context) { - manager.traceIn(); - List result = null; - try { - ResultSetIterImpl iter = selectAll(context); - checkNull(iter, ResultSetIterImpl.class); - result = getList(context, iter, false, true); - } catch (Exception e) { - throw new ItemManagerException(e); - } - manager.traceOut(); - return result; - } - - @Override - public List getAll(long id) { - List result = null; - DefaultContext context = manager.getDbContext(); - try { - result = getAll(context, id); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - return result; - } - - public List getAll(DefaultContext context, long id) { - manager.traceIn(); - List result = null; - try { - ResultSetIterImpl iter = selectByForeignKey(context, id); - checkNull(iter, ResultSetIterImpl.class); - result = getList(context, iter, false, true); - } catch (Exception e) { - throw new ItemManagerException(e); - } - manager.traceOut(); - return result; - } - - protected IEntityBase getEntity(DefaultContext context, ResultSetIterImpl iter) { - manager.traceIn(); - IEntityBase entity = null; - try { - List result = getList(context, iter, false, false); - if (result != null) { - if (result.size() != 1) - throw new IllegalStateException("Expected one, found " + result.size() + "."); - entity = result.get(0); - } - } catch (Exception e) { - throw new ItemManagerException(e); - } - manager.traceOut(); - return entity; - } - -// protected List getList(ResultSetIterImpl iter) { -// List result = null; -// DefaultContext context = manager.getDbContext(); -// try { -// result = getList(context, iter); -// } catch (Exception e) { -// throw new ItemManagerException(e); -// } finally { -// manager.putDbContext(context); -// } -// return result; -// } - - protected List getList(ResultSetIterImpl iter, boolean isChunked) { - List result = null; - DefaultContext context = manager.getDbContext(); - try { - result = getList(context, iter, isChunked, true); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - return result; - } - - protected List getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) { - return getList(context, iter, isChunked, true); - } - - protected List getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked, boolean enablecache) { - manager.traceIn(); - List result = null; - try { - if (useMemoryCache() && enablecache) - result = manager.getAllCached(getCacheType()); - - if (result == null) { - result = entities(context, iter, isChunked); - if (useMemoryCache() && enablecache) - manager.setAllCached(getCacheType(), result); - } - - /* @lineinfo:generated-code *//* @lineinfo:280^3 */ - -// ************************************************************ -// #sql [context] { COMMIT }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 3); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:280^27 */ - } catch (Exception e) { - try { - /* @lineinfo:generated-code */ - /* @lineinfo:283^4 */ - -// ************************************************************ -// #sql [context] { ROLLBACK }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 4); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:283^30 */ - } catch (Exception e1) { - } - manager.throwError(e); - } - manager.traceOut(); - return result; - } - - @Override - public void modify(IEntityBase entity) { - DefaultContext context = manager.getDbContext(); - try { - modify(context, entity); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - } - - @Override - public void merge(IEntityBase entity) { - DefaultContext context = manager.getDbContext(); - try { - if (entity.getId() == 0) - add(entity); - else - modify(context, entity); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - } - - public void modify(DefaultContext context, IEntityBase entity) { - manager.traceIn(); - try { - checkNull(entity, IEntityBase.class); - long id = entity.getId(); - entity.checkParameter("ID", id, false); - update(context, entity); - afterModify(context, entity); - /* @lineinfo:generated-code *//* @lineinfo:327^3 */ - -// ************************************************************ -// #sql [context] { COMMIT }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 5); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:327^27 */ - if (useMemoryCache()) - manager.storeCached(entity.getId(), entity); - } catch (Exception e) { - try { - /* @lineinfo:generated-code */ - /* @lineinfo:332^4 */ - -// ************************************************************ -// #sql [context] { ROLLBACK }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 6); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:332^30 */ - } catch (Exception e1) { - } - manager.throwError(e); - } - manager.traceOut(); - } - - @Override - public void remove(IEntityBase entity) { - DefaultContext context = manager.getDbContext(); - try { - remove(context, entity); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - } - - public void remove(DefaultContext context, IEntityBase entity) { - manager.traceIn(); - try { - checkNull(entity, IEntityBase.class); - long id = entity.getId(); - entity.checkParameter("ID", id, false); - beforeDelete(context, entity); - delete(context, id); - afterDelete(context, entity); - /* @lineinfo:generated-code *//* @lineinfo:361^3 */ - -// ************************************************************ -// #sql [context] { COMMIT }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 7); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:361^27 */ - if (useMemoryCache()) - manager.removeCached(getCacheType(), entity.getId()); - } catch (Exception e) { - try { - /* @lineinfo:generated-code */ - /* @lineinfo:366^4 */ - -// ************************************************************ -// #sql [context] { ROLLBACK }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 8); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:366^30 */ - } catch (Exception e1) { - } - manager.throwError(e); - } - manager.traceOut(); - } - - @Override - public void remove(List ids) { - DefaultContext context = manager.getDbContext(); - try { - remove(context, ids); - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - } - - protected void remove(DefaultContext context, List ids) { - manager.traceIn(); - try { - for (long id : ids) - delete(context, id); - /* @lineinfo:generated-code *//* @lineinfo:390^3 */ - -// ************************************************************ -// #sql [context] { COMMIT }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 9); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:390^27 */ - if (useMemoryCache()) { - for (long id : ids) - manager.removeCached(getCacheType(), id); - } - } catch (Exception e) { - try { - /* @lineinfo:generated-code */ - /* @lineinfo:397^4 */ - -// ************************************************************ -// #sql [context] { ROLLBACK }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 10); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:397^30 */ - } catch (Exception e1) { - } - manager.throwError(e); - } - manager.traceOut(); - } - - @Override - public void truncate() { - manager.traceIn(); - DefaultContext context = manager.getDbContext(); - try { - truncateTable(context); - /* @lineinfo:generated-code *//* @lineinfo:411^3 */ - -// ************************************************************ -// #sql [context] { COMMIT }; -// ************************************************************ - - { - 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, EntityBaseDAO_SJProfileKeys.getKey(0), 11); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:411^27 */ - } catch (Exception e) { - throw new ItemManagerException(e); - } finally { - manager.putDbContext(context); - } - manager.traceOut(); - } - - protected void afterGet(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void beforeAdd(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void afterAdd(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void afterModify(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void beforeDelete(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void afterDelete(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected List entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException { - return null; - } - - public List entities(DefaultContext context, ResultSet rs) throws SQLException { - return null; - } - - protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException { - return null; - } - - protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException { - return null; - } - - protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException { - return null; - } - - protected void delete(DefaultContext context, long id) throws SQLException { - } - - protected void truncateTable(DefaultContext context) throws SQLException { - } - - protected void insert(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected void update(DefaultContext context, IEntityBase entity) throws SQLException { - } - - protected boolean useMemoryCache() { - return false; - } - - protected Class getCacheType() { - return null; - } -} - -/* @lineinfo:generated-code */class EntityBaseDAO_SJProfileKeys { - private java.lang.Object[] keys; - private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass()); - private static EntityBaseDAO_SJProfileKeys inst = null; - - public static java.lang.Object getKey(int keyNum) throws java.sql.SQLException { - synchronized (user.jobengine.db.EntityBaseDAO_SJProfileKeys.class) { - if (inst == null) { - inst = new EntityBaseDAO_SJProfileKeys(); - } - } - return inst.keys[keyNum]; - } - - private EntityBaseDAO_SJProfileKeys() throws java.sql.SQLException { - keys = new java.lang.Object[1]; - keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.EntityBaseDAO_SJProfile0"); - } -} +/*@lineinfo:filename=EntityBaseDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db; + +import user.commons.IEntityBase; +import user.commons.logging.LogUtils; +import java.sql.SQLException; +import java.sql.ResultSet; +import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import sqlj.runtime.ref.DefaultContext; +import sqlj.runtime.ref.ResultSetIterImpl; +/** + * Az entitasok alap DAO osztalya. + */ +@SuppressWarnings("unused") +public abstract class EntityBaseDAO implements IEntityBaseDAO { + protected ItemManager manager; + protected static final Logger logger = LogManager.getLogger(); + + public EntityBaseDAO(ItemManager manager) { + this.manager = manager; + } + + @SuppressWarnings("rawtypes") + protected void checkNull(Object obj, Class type) { + if (obj == null) + throw new IllegalArgumentException(type.getName() + " can not be null."); + } + + @Override + public void add(IEntityBase entity) { + DefaultContext context = manager.getDbContext(); + try { + add(context, entity); + } catch (Exception e) { + //TODO reszletezes + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + } + + public void add(DefaultContext context, IEntityBase entity) { + manager.traceIn(); + try { + checkNull(entity, IEntityBase.class); + beforeAdd(context, entity); + long id = entity.getId(); + + insert(context, entity); + if (id == 0) { + /*@lineinfo:generated-code*//*@lineinfo:52^4*/ + +// ************************************************************ +// #sql [context] { SELECT IDENTITY_VAL_LOCAL() INTO :id, FROM SYSIBM.SYSDUMMY1 }; +// ************************************************************ + +{ + sqlj.runtime.profile.RTResultSet __sJT_rtRs; + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 0); + try + { + __sJT_rtRs = __sJT_execCtx.executeQuery(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } + try + { + sqlj.runtime.ref.ResultSetIterImpl.checkColumns(__sJT_rtRs, 1); + if (!__sJT_rtRs.next()) + { + sqlj.runtime.error.RuntimeRefErrors.raise_NO_ROW_SELECT_INTO(); + } + id = __sJT_rtRs.getLongNoNull(1); + if (__sJT_rtRs.next()) + { + sqlj.runtime.error.RuntimeRefErrors.raise_MULTI_ROW_SELECT_INTO(); + } + } + finally + { + __sJT_rtRs.close(); + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:52^80*/ + entity.setId(id); + } + afterAdd(context, entity); + /*@lineinfo:generated-code*//*@lineinfo:56^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 1); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:56^27*/ + if (useMemoryCache()) + manager.storeCached(entity.getId(), entity); + + } catch (Exception e) { + try { + /*@lineinfo:generated-code*//*@lineinfo:62^4*/ + +// ************************************************************ +// #sql [context] { ROLLBACK }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 2); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:62^30*/ + } catch(Exception e1) { + } + manager.throwError(e); + } + manager.traceOut(); + } + + @Override + public IEntityBase get(long id) { + IEntityBase entity = null; + DefaultContext context = manager.getDbContext(); + try { + entity = get(context, id); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return entity; + } + + public IEntityBase get(DefaultContext context, long id) { + manager.traceIn(); + IEntityBase entity = null; + try { + if (id == 0) + throw new IllegalArgumentException("Cannot get EntityBase with 0 ID."); + if (useMemoryCache()) + entity = manager.retrieveCached(getCacheType(), id); + if (entity == null) { + ResultSetIterImpl iter = selectByKey(context, id); + checkNull(iter, ResultSetIterImpl.class); + entity = getEntity(context, iter); + if (useMemoryCache()) + manager.storeCached(id, entity); + } + afterGet(context, entity); + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return entity; + } + + @Override + public List getAll() { + List result = null; + DefaultContext context = manager.getDbContext(); + try { + result = getAll(context); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return result; + } + + @Override + public List getAll(IDAOIterProvider provider) { + List result = null; + DefaultContext context = manager.getDbContext(); + try { + result = getAll(context, provider); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return result; + } + + @Override + public IEntityBase get(IDAOIterProvider provider) { + IEntityBase entity = null; + DefaultContext context = manager.getDbContext(); + try { + entity = get(context, provider); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return entity; + } + + private IEntityBase get(DefaultContext context, IDAOIterProvider provider) { + manager.traceIn(); + IEntityBase entity = null; + try { + ResultSetIterImpl iter = provider.get(context, this); + checkNull(iter, ResultSetIterImpl.class); + entity = getEntity(context, iter); + afterGet(context, entity); + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return entity; + } + + public List getAll(DefaultContext context, IDAOIterProvider provider) { + manager.traceIn(); + List result = null; + try { + ResultSetIterImpl iter = provider.get(context, this); + checkNull(iter, ResultSetIterImpl.class); + result = getList(context, iter, false, true); + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return result; + } + + public List getAll(DefaultContext context) { + manager.traceIn(); + List result = null; + try { + ResultSetIterImpl iter = selectAll(context); + checkNull(iter, ResultSetIterImpl.class); + result = getList(context, iter, false, true); + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return result; + } + + @Override + public List getAll(long id) { + List result = null; + DefaultContext context = manager.getDbContext(); + try { + result = getAll(context, id); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return result; + } + + public List getAll(DefaultContext context, long id) { + manager.traceIn(); + List result = null; + try { + ResultSetIterImpl iter = selectByForeignKey(context, id); + checkNull(iter, ResultSetIterImpl.class); + result = getList(context, iter, false, true); + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return result; + } + + protected IEntityBase getEntity(DefaultContext context, ResultSetIterImpl iter) { + manager.traceIn(); + IEntityBase entity = null; + try { + List result = getList(context, iter, false, false); + if (result != null) { + if (result.size() != 1) + throw new IllegalStateException("Expected one, found " + result.size() + "."); + entity = result.get(0); + } + } catch (Exception e) { + throw new ItemManagerException(e); + } + manager.traceOut(); + return entity; + } + +// protected List getList(ResultSetIterImpl iter) { +// List result = null; +// DefaultContext context = manager.getDbContext(); +// try { +// result = getList(context, iter); +// } catch (Exception e) { +// throw new ItemManagerException(e); +// } finally { +// manager.putDbContext(context); +// } +// return result; +// } + + protected List getList(ResultSetIterImpl iter, boolean isChunked) { + List result = null; + DefaultContext context = manager.getDbContext(); + try { + result = getList(context, iter, isChunked, true); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + return result; + } + + protected List getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) { + return getList(context, iter, isChunked, true); + } + + protected List getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked, boolean enablecache) { + manager.traceIn(); + List result = null; + try { + if (useMemoryCache() && enablecache) + result = manager.getAllCached(getCacheType()); + + if (result == null) { + result = entities(context, iter, isChunked); + if (useMemoryCache() && enablecache) + manager.setAllCached(getCacheType(), result); + } + + /*@lineinfo:generated-code*//*@lineinfo:280^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 3); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:280^27*/ + } catch (Exception e) { + try { + /*@lineinfo:generated-code*//*@lineinfo:283^4*/ + +// ************************************************************ +// #sql [context] { ROLLBACK }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 4); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:283^30*/ + } catch(Exception e1) { + } + manager.throwError(e); + } + manager.traceOut(); + return result; + } + + @Override + public void modify(IEntityBase entity) { + DefaultContext context = manager.getDbContext(); + try { + modify(context, entity); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + } + + @Override + public void merge(IEntityBase entity) { + DefaultContext context = manager.getDbContext(); + try { + if (entity.getId() == 0) + add(entity); + else + modify(context, entity); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + } + + public void modify(DefaultContext context, IEntityBase entity) { + manager.traceIn(); + try { + checkNull(entity, IEntityBase.class); + long id = entity.getId(); + entity.checkParameter("ID", id, false); + update(context, entity); + afterModify(context, entity); + /*@lineinfo:generated-code*//*@lineinfo:327^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 5); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:327^27*/ + if (useMemoryCache()) + manager.storeCached(entity.getId(), entity); + } catch (Exception e) { + try { + /*@lineinfo:generated-code*//*@lineinfo:332^4*/ + +// ************************************************************ +// #sql [context] { ROLLBACK }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 6); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:332^30*/ + } catch(Exception e1) { + } + manager.throwError(e); + } + manager.traceOut(); + } + + @Override + public void remove(IEntityBase entity) { + DefaultContext context = manager.getDbContext(); + try { + remove(context, entity); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + } + + public void remove(DefaultContext context, IEntityBase entity) { + manager.traceIn(); + try { + checkNull(entity, IEntityBase.class); + long id = entity.getId(); + entity.checkParameter("ID", id, false); + beforeDelete(context, entity); + delete(context, id); + afterDelete(context, entity); + /*@lineinfo:generated-code*//*@lineinfo:361^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 7); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:361^27*/ + if (useMemoryCache()) + manager.removeCached(getCacheType(), entity.getId()); + } catch (Exception e) { + try { + /*@lineinfo:generated-code*//*@lineinfo:366^4*/ + +// ************************************************************ +// #sql [context] { ROLLBACK }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 8); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:366^30*/ + } catch(Exception e1) { + } + manager.throwError(e); + } + manager.traceOut(); + } + + public void remove(List ids) { + DefaultContext context = manager.getDbContext(); + try { + remove(context, ids); + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + } + + protected void remove(DefaultContext context, List ids) { + manager.traceIn(); + try { + for (long id : ids) + delete(context, id); + /*@lineinfo:generated-code*//*@lineinfo:390^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 9); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:390^27*/ + if (useMemoryCache()) { + for (long id : ids) + manager.removeCached(getCacheType(), id); + } + } catch (Exception e) { + try { + /*@lineinfo:generated-code*//*@lineinfo:397^4*/ + +// ************************************************************ +// #sql [context] { ROLLBACK }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 10); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:397^30*/ + } catch(Exception e1) { + } + manager.throwError(e); + } + manager.traceOut(); + } + + @Override + public void truncate() { + manager.traceIn(); + DefaultContext context = manager.getDbContext(); + try { + truncateTable(context); + /*@lineinfo:generated-code*//*@lineinfo:411^3*/ + +// ************************************************************ +// #sql [context] { COMMIT }; +// ************************************************************ + +{ + 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, EntityBaseDAO_SJProfileKeys.getKey(0), 11); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + + +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:411^27*/ + } catch (Exception e) { + throw new ItemManagerException(e); + } finally { + manager.putDbContext(context); + } + manager.traceOut(); + } + + protected void afterGet(DefaultContext context, IEntityBase entity) throws SQLException { } + protected void beforeAdd(DefaultContext context, IEntityBase entity) throws SQLException { } + protected void afterAdd(DefaultContext context, IEntityBase entity) throws SQLException { } + protected void afterModify(DefaultContext context, IEntityBase entity) throws SQLException { } + protected void beforeDelete(DefaultContext context, IEntityBase entity) throws SQLException { } + protected void afterDelete(DefaultContext context, IEntityBase entity) throws SQLException { } + + protected List entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException { + return null; + } + + public List entities(DefaultContext context, ResultSet rs) throws SQLException { + return null; + } + + protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException { + return null; + } + + protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException { + return null; + } + + protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException { + return null; + } + + protected void delete(DefaultContext context, long id) throws SQLException { } + + protected void truncateTable(DefaultContext context) throws SQLException { } + + protected void insert(DefaultContext context, IEntityBase entity) throws SQLException { } + + protected void update(DefaultContext context, IEntityBase entity) throws SQLException { } + + protected boolean useMemoryCache() { return false; } + + protected Class getCacheType() { return null; } +}/*@lineinfo:generated-code*/class EntityBaseDAO_SJProfileKeys +{ + private java.lang.Object[] keys; + private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass()); + private static EntityBaseDAO_SJProfileKeys inst = null; + public static java.lang.Object getKey(int keyNum) + throws java.sql.SQLException + { + synchronized(user.jobengine.db.EntityBaseDAO_SJProfileKeys.class) { + if (inst == null) + { + inst = new EntityBaseDAO_SJProfileKeys(); + } + } + return inst.keys[keyNum]; + } + private EntityBaseDAO_SJProfileKeys() + throws java.sql.SQLException + { + keys = new java.lang.Object[1]; + keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.EntityBaseDAO_SJProfile0"); + } +} 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 aa68a34b92d4ec4ab2fb8bc7279811a813f347af..de2b0008d90a49bad0a05e67849517b0d9409b6b 100644 GIT binary patch delta 18 acmaDS_)c&G4a%7ZW8ZWd&`%MJie_6RTl delta 18 ZcmaDS_)c&G4a%7ZU|ZWd(Z=K}yl?FRDz delta 18 ZcmZ1=w?J+K4a%7d?%HVZP&;{X6a;0BHW delta 18 ZcmZ24yk2+%4Bf3;vmj$7D*!L>1ls@r 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 55fff32ccfff85fc706be960799fb4b2927fc65b..6118bbd029ea39204f088dfeda2a57be8c514e31 100644 GIT binary patch delta 18 acmeyU_)&2K4a%7d>YHVZO7;0FLqa|ew8 delta 18 ZcmeyU_)&2K4%_yIvm22cP1 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 3d6ed2ba4ad6a7926e753ed6e1f284a13294f39d..846f31dc5dac8404f91a472833514a9f6aaa4d45 100644 GIT binary patch delta 18 acmew=_El^H4a%7d>|Hw!YRZ~*{H><0?~ delta 18 Zcmew=_El^H4 entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) - throws SQLException { + protected List entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException { List result = null; JobIter iterator = (JobIter) iter; while (iterator.next()) { @@ -33,8 +34,8 @@ class JobDAO extends EntityBaseDAO { entity.setName(iterator.name()); entity.setOwner(iterator.owner()); entity.setPriority(iterator.priority()); - entity.setProgress(iterator.progress()); - entity.setStatus(JobStatus.valueOf(iterator.status())); + entity.setProgress(iterator.progress()); + entity.setStatus(JobStatus.valueOf(iterator.status())); entity.setDescription(iterator.description()); entity.setSubmitted(iterator.submitted()); entity.setFinished(iterator.finished()); @@ -42,218 +43,219 @@ class JobDAO extends EntityBaseDAO { entity.setScheduledTime(iterator.scheduledTime()); entity.setRelated(iterator.related()); if (result == null) - result = new ArrayList(); + result = new ArrayList(); result.add(entity); - } + } iterator.close(); return result; } - + @Override public List entities(DefaultContext context, ResultSet rs) throws SQLException { JobIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:56^2 */ + /*@lineinfo:generated-code*//*@lineinfo:56^2*/ // ************************************************************ // #sql [context] iter = { CAST :rs }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 0); - try { - __sJT_stmt.setObject(2, rs); - __sJT_execCtx.executeUpdate(); - iter = ((JobIter) (__sJT_stmt.getObject(1, JobIter.class))); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 0); + try + { + __sJT_stmt.setObject(2, rs); + __sJT_execCtx.executeUpdate(); + iter = ((JobIter)(__sJT_stmt.getObject(1, JobIter.class))); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:56^35 */ +/*@lineinfo:user-code*//*@lineinfo:56^35*/ return entities(context, iter, false); } - + @Override - protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException { + protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ JobIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:63^2 */ + /*@lineinfo:generated-code*//*@lineinfo:63^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME, RELATED FROM JOB WHERE ID = :id }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 1); - try { - __sJT_stmt.setLong(1, id); - iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 1); + try + { + __sJT_stmt.setLong(1, id); + iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:63^169 */ +/*@lineinfo:user-code*//*@lineinfo:63^169*/ return iter; } @Override - protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException { + protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ JobIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:70^2 */ + /*@lineinfo:generated-code*//*@lineinfo:70^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME, RELATED FROM JOB }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 2); - try { - iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 2); + try + { + iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:70^154 */ +/*@lineinfo:user-code*//*@lineinfo:70^154*/ return iter; } - public ResultSetIterImpl selectByRelated(DefaultContext context, String related) throws SQLException { + public ResultSetIterImpl selectByRelated(DefaultContext context, String related) throws SQLException{ JobIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:76^2 */ + /*@lineinfo:generated-code*//*@lineinfo:76^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME, RELATED FROM JOB WHERE LOOKUP(RELATED, :related) > 0 }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 3); - try { - __sJT_stmt.setString(1, related); - iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 3); + try + { + __sJT_stmt.setString(1, related); + iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:76^190 */ +/*@lineinfo:user-code*//*@lineinfo:76^190*/ return iter; } - + @Override - protected void delete(DefaultContext context, long id) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:82^2 */ + protected void delete(DefaultContext context, long id) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:82^2*/ // ************************************************************ // #sql [context] { DELETE FROM JOB WHERE ID = :id }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 4); - try { - __sJT_stmt.setLong(1, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 4); + try + { + __sJT_stmt.setLong(1, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:82^50 */ +/*@lineinfo:user-code*//*@lineinfo:82^50*/ } - + @Override - protected void truncateTable(DefaultContext context) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:87^2 */ + protected void truncateTable(DefaultContext context) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:87^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE JOB DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 5); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 5); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:87^84 */ +/*@lineinfo:user-code*//*@lineinfo:87^84*/ } - + @Override - protected void update(DefaultContext context, IEntityBase entity) throws SQLException { + protected void update(DefaultContext context, IEntityBase entity) throws SQLException{ Job obj = (Job) entity; long id = obj.getId(); String name = obj.getName(); @@ -267,50 +269,51 @@ class JobDAO extends EntityBaseDAO { String template = obj.getTemplate(); Timestamp scheduledTime = obj.getScheduledTime(); String related = obj.getRelated(); - - /* @lineinfo:generated-code *//* @lineinfo:106^2 */ + + /*@lineinfo:generated-code*//*@lineinfo:106^2*/ // ************************************************************ // #sql [context] { UPDATE JOB SET NAME = :name, OWNER = :owner, PRIORITY = :priority, PROGRESS = :progress, STATUS = :status, DESCRIPTION = :description, SUBMITTED = :submitted, FINISHED = :finished, TEMPLATE = :template, SCHEDULEDTIME = :scheduledTime, RELATED = :related WHERE ID = :id }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 6); - try { - __sJT_stmt.setString(1, name); - __sJT_stmt.setString(2, owner); - __sJT_stmt.setInt(3, priority); - __sJT_stmt.setInt(4, progress); - __sJT_stmt.setString(5, status); - __sJT_stmt.setString(6, description); - __sJT_stmt.setTimestamp(7, submitted); - __sJT_stmt.setTimestamp(8, finished); - __sJT_stmt.setString(9, template); - __sJT_stmt.setTimestamp(10, scheduledTime); - __sJT_stmt.setString(11, related); - __sJT_stmt.setLong(12, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 6); + try + { + __sJT_stmt.setString(1, name); + __sJT_stmt.setString(2, owner); + __sJT_stmt.setInt(3, priority); + __sJT_stmt.setInt(4, progress); + __sJT_stmt.setString(5, status); + __sJT_stmt.setString(6, description); + __sJT_stmt.setTimestamp(7, submitted); + __sJT_stmt.setTimestamp(8, finished); + __sJT_stmt.setString(9, template); + __sJT_stmt.setTimestamp(10, scheduledTime); + __sJT_stmt.setString(11, related); + __sJT_stmt.setLong(12, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:106^288 */ +/*@lineinfo:user-code*//*@lineinfo:106^288*/ } - + @Override - protected void insert(DefaultContext context, IEntityBase entity) throws SQLException { + protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{ Job obj = (Job) entity; String name = obj.getName(); String owner = obj.getOwner(); @@ -321,58 +324,59 @@ class JobDAO extends EntityBaseDAO { Timestamp submitted = obj.getSubmitted(); Timestamp finished = obj.getFinished(); String template = obj.getTemplate(); - Timestamp scheduledTime = obj.getScheduledTime(); + Timestamp scheduledTime = obj.getScheduledTime(); String related = obj.getRelated(); - /* @lineinfo:generated-code *//* @lineinfo:124^2 */ + /*@lineinfo:generated-code*//*@lineinfo:124^2*/ // ************************************************************ // #sql [context] { INSERT INTO JOB (NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME, RELATED) // VALUES (:name, :owner, :priority, :progress, :status, :description, :submitted, :finished, :template, :scheduledTime, :related) }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 7); - try { - __sJT_stmt.setString(1, name); - __sJT_stmt.setString(2, owner); - __sJT_stmt.setInt(3, priority); - __sJT_stmt.setInt(4, progress); - __sJT_stmt.setString(5, status); - __sJT_stmt.setString(6, description); - __sJT_stmt.setTimestamp(7, submitted); - __sJT_stmt.setTimestamp(8, finished); - __sJT_stmt.setString(9, template); - __sJT_stmt.setTimestamp(10, scheduledTime); - __sJT_stmt.setString(11, related); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 7); + try + { + __sJT_stmt.setString(1, name); + __sJT_stmt.setString(2, owner); + __sJT_stmt.setInt(3, priority); + __sJT_stmt.setInt(4, progress); + __sJT_stmt.setString(5, status); + __sJT_stmt.setString(6, description); + __sJT_stmt.setTimestamp(7, submitted); + __sJT_stmt.setTimestamp(8, finished); + __sJT_stmt.setString(9, template); + __sJT_stmt.setTimestamp(10, scheduledTime); + __sJT_stmt.setString(11, related); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} -// ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:125^130 */ - } +// ************************************************************ +/*@lineinfo:user-code*//*@lineinfo:125^130*/ + } + public List getAllIncomplete(String template) { manager.traceIn(); List result = null; DefaultContext context = manager.getDbContext(); try { JobIter iter = null; - // ResultSetIterImpl iter = null; - /* @lineinfo:generated-code *//* @lineinfo:135^3 */ + //ResultSetIterImpl iter = null; + /*@lineinfo:generated-code*//*@lineinfo:135^3*/ // ************************************************************ // #sql [context] iter = { SELECT ID, NAME, OWNER, PRIORITY, PROGRESS, STATUS, DESCRIPTION, SUBMITTED, FINISHED, TEMPLATE, SCHEDULEDTIME, RELATED @@ -380,29 +384,29 @@ class JobDAO extends EntityBaseDAO { // AND STATUS IN ('EXECUTING', 'WAIT_EXECUTOR', 'WAIT_SUSPEND', 'RUNNABLE') }; // ************************************************************ - { - 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, - JobDAO_SJProfileKeys.getKey(0), 8); - try { - __sJT_stmt.setString(1, template); - iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobDAO_SJProfileKeys.getKey(0), 8); + try + { + __sJT_stmt.setString(1, template); + iter = new JobIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:137^80 */ +/*@lineinfo:user-code*//*@lineinfo:137^81*/ result = getList(context, iter, false); } catch (Exception e) { throw new ItemManagerException(e); @@ -411,26 +415,27 @@ class JobDAO extends EntityBaseDAO { } manager.traceOut(); return result; - } -} - -/* @lineinfo:generated-code */class JobDAO_SJProfileKeys { - private java.lang.Object[] keys; - private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime() - .getLoaderForClass(getClass()); - private static JobDAO_SJProfileKeys inst = null; - - public static java.lang.Object getKey(int keyNum) throws java.sql.SQLException { - synchronized (user.jobengine.db.JobDAO_SJProfileKeys.class) { - if (inst == null) { - inst = new JobDAO_SJProfileKeys(); - } - } - return inst.keys[keyNum]; - } - - private JobDAO_SJProfileKeys() throws java.sql.SQLException { - keys = new java.lang.Object[1]; - keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.JobDAO_SJProfile0"); - } + } +}/*@lineinfo:generated-code*/class JobDAO_SJProfileKeys +{ + private java.lang.Object[] keys; + private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass()); + private static JobDAO_SJProfileKeys inst = null; + public static java.lang.Object getKey(int keyNum) + throws java.sql.SQLException + { + synchronized(user.jobengine.db.JobDAO_SJProfileKeys.class) { + if (inst == null) + { + inst = new JobDAO_SJProfileKeys(); + } + } + return inst.keys[keyNum]; + } + private JobDAO_SJProfileKeys() + throws java.sql.SQLException + { + keys = new java.lang.Object[1]; + keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.JobDAO_SJProfile0"); + } } 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 a3d4184441f2ab34a1fb135b48d87316495b0bed..9f1469135219269398b97199e84882a06851ba68 100644 GIT binary patch delta 28 kcmZ3gwM=UR4a%7d>=HVZPo7GnG``LFQH$xlTb0IHu1djJ3c delta 28 kcmZ3cwNz^Z4 entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) - throws SQLException { + protected List entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException { List result = null; JobParametersIter iterator = (JobParametersIter) iter; while (iterator.next()) { @@ -62,239 +71,242 @@ class JobParametersDAO extends EntityBaseDAO { entity.setId(iterator.id()); entity.setData(iterator.data()); if (result == null) - result = new ArrayList(); + result = new ArrayList(); result.add(entity); - } + } iterator.close(); return result; } - + @Override - protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException { + protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ JobParametersIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:43^2 */ + /*@lineinfo:generated-code*//*@lineinfo:43^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, DATA FROM JOBPARAMETERS WHERE ID = :id }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 0); - try { - __sJT_stmt.setLong(1, id); - iter = new JobParametersIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 0); + try + { + __sJT_stmt.setLong(1, id); + iter = new JobParametersIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:43^76 */ +/*@lineinfo:user-code*//*@lineinfo:43^76*/ return iter; } @Override - protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException { + protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ JobParametersIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:50^2 */ + /*@lineinfo:generated-code*//*@lineinfo:50^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, DATA FROM JOBPARAMETERS }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 1); - try { - iter = new JobParametersIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 1); + try + { + iter = new JobParametersIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:50^61 */ +/*@lineinfo:user-code*//*@lineinfo:50^61*/ return iter; } - + @Override - protected void delete(DefaultContext context, long id) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:56^2 */ + protected void delete(DefaultContext context, long id) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:56^2*/ // ************************************************************ // #sql [context] { DELETE FROM JOBPARAMETERS WHERE ID = :id }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 2); - try { - __sJT_stmt.setLong(1, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 2); + try + { + __sJT_stmt.setLong(1, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:56^60 */ +/*@lineinfo:user-code*//*@lineinfo:56^60*/ } - + @Override - protected void truncateTable(DefaultContext context) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:61^2 */ + protected void truncateTable(DefaultContext context) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:61^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE JOBPARAMETERS DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 3); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 3); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:61^94 */ +/*@lineinfo:user-code*//*@lineinfo:61^94*/ } - + @Override - protected void update(DefaultContext context, IEntityBase entity) throws SQLException { + protected void update(DefaultContext context, IEntityBase entity) throws SQLException{ JobParameters obj = (JobParameters) entity; long id = obj.getId(); byte[] data = obj.getData(); - - /* @lineinfo:generated-code *//* @lineinfo:70^2 */ + + /*@lineinfo:generated-code*//*@lineinfo:70^2*/ // ************************************************************ // #sql [context] { UPDATE JOBPARAMETERS DATA = :data WHERE ID = :id }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 4); - try { - __sJT_stmt.setBytes(1, data); - __sJT_stmt.setLong(2, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 4); + try + { + __sJT_stmt.setBytes(1, data); + __sJT_stmt.setLong(2, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:70^68 */ +/*@lineinfo:user-code*//*@lineinfo:70^68*/ } - + @Override - protected void insert(DefaultContext context, IEntityBase entity) throws SQLException { + protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{ JobParameters obj = (JobParameters) entity; long id = obj.getId(); byte[] data = obj.getData(); - - /* @lineinfo:generated-code *//* @lineinfo:79^2 */ + + /*@lineinfo:generated-code*//*@lineinfo:79^2*/ // ************************************************************ // #sql [context] { INSERT INTO JOBPARAMETERS (ID, DATA) VALUES (:id, :data) }; // ************************************************************ - { - 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, - JobParametersDAO_SJProfileKeys.getKey(0), 5); - try { - __sJT_stmt.setLong(1, id); - __sJT_stmt.setBytes(2, data); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } - -// ************************************************************ - - /* @lineinfo:user-code *//* @lineinfo:79^76 */ - } +{ + 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, JobParametersDAO_SJProfileKeys.getKey(0), 5); + try + { + __sJT_stmt.setLong(1, id); + __sJT_stmt.setBytes(2, data); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } } -/* @lineinfo:generated-code */class JobParametersDAO_SJProfileKeys { - private java.lang.Object[] keys; - private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime() - .getLoaderForClass(getClass()); - private static JobParametersDAO_SJProfileKeys inst = null; - - public static java.lang.Object getKey(int keyNum) throws java.sql.SQLException { - synchronized (user.jobengine.db.JobParametersDAO_SJProfileKeys.class) { - if (inst == null) { - inst = new JobParametersDAO_SJProfileKeys(); - } - } - return inst.keys[keyNum]; - } - private JobParametersDAO_SJProfileKeys() throws java.sql.SQLException { - keys = new java.lang.Object[1]; - keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.JobParametersDAO_SJProfile0"); +// ************************************************************ + +/*@lineinfo:user-code*//*@lineinfo:79^76*/ } +}/*@lineinfo:generated-code*/class JobParametersDAO_SJProfileKeys +{ + private java.lang.Object[] keys; + private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass()); + private static JobParametersDAO_SJProfileKeys inst = null; + public static java.lang.Object getKey(int keyNum) + throws java.sql.SQLException + { + synchronized(user.jobengine.db.JobParametersDAO_SJProfileKeys.class) { + if (inst == null) + { + inst = new JobParametersDAO_SJProfileKeys(); + } + } + return inst.keys[keyNum]; + } + private JobParametersDAO_SJProfileKeys() + throws java.sql.SQLException + { + keys = new java.lang.Object[1]; + keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.JobParametersDAO_SJProfile0"); + } } 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 75b1a4df1ac0e639fed510acaac172fe8c1d82b6..27214e3ee99095b9c574df5da0a976ab1089ee95 100644 GIT binary patch delta 18 acmdliv{`5a4a%7d?LHw!Wa%7d>QHVZPQu>t@}kp~k1 delta 18 Zcmey)^POh{4(); @@ -198,10 +207,10 @@ class MediaDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:80^2*/ + /*@lineinfo:generated-code*//*@lineinfo:81^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ID = :id }; // ************************************************************ { @@ -226,17 +235,17 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:80^166*/ +/*@lineinfo:user-code*//*@lineinfo:81^177*/ return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:87^2*/ + /*@lineinfo:generated-code*//*@lineinfo:88^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ITEMID = :id }; // ************************************************************ { @@ -261,16 +270,16 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:87^170*/ +/*@lineinfo:user-code*//*@lineinfo:88^181*/ return iter; } public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{ MediaIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:93^2*/ + /*@lineinfo:generated-code*//*@lineinfo:94^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE TITLE = :title }; // ************************************************************ { @@ -295,17 +304,17 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:93^172*/ +/*@lineinfo:user-code*//*@lineinfo:94^183*/ return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaIter iter = null; - /*@lineinfo:generated-code*//*@lineinfo:100^2*/ + /*@lineinfo:generated-code*//*@lineinfo:101^2*/ // ************************************************************ -// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA }; +// #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA }; // ************************************************************ { @@ -329,13 +338,13 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:100^151*/ +/*@lineinfo:user-code*//*@lineinfo:101^162*/ return iter; } @Override protected void delete(DefaultContext context, long id) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:106^2*/ + /*@lineinfo:generated-code*//*@lineinfo:107^2*/ // ************************************************************ // #sql [context] { DELETE FROM MEDIA WHERE ID = :id }; @@ -363,12 +372,12 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:106^52*/ +/*@lineinfo:user-code*//*@lineinfo:107^52*/ } @Override protected void truncateTable(DefaultContext context) throws SQLException{ - /*@lineinfo:generated-code*//*@lineinfo:111^2*/ + /*@lineinfo:generated-code*//*@lineinfo:112^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE MEDIA DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; @@ -395,7 +404,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:111^86*/ +/*@lineinfo:user-code*//*@lineinfo:112^86*/ } @Override @@ -412,11 +421,12 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); + int fileCount = obj.getFileCount(); - /*@lineinfo:generated-code*//*@lineinfo:129^2*/ + /*@lineinfo:generated-code*//*@lineinfo:131^2*/ // ************************************************************ -// #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id }; +// #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id }; // ************************************************************ { @@ -438,7 +448,8 @@ class MediaDAO extends EntityBaseDAO { __sJT_stmt.setTimestamp(8, archived); __sJT_stmt.setTimestamp(9, modified); __sJT_stmt.setTimestamp(10, creation); - __sJT_stmt.setLong(11, id); + __sJT_stmt.setInt(11, fileCount); + __sJT_stmt.setLong(12, id); __sJT_execCtx.executeUpdate(); } finally @@ -451,7 +462,7 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:129^260*/ +/*@lineinfo:user-code*//*@lineinfo:131^284*/ } @Override @@ -468,11 +479,12 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); + int fileCount = obj.getFileCount(); - /*@lineinfo:generated-code*//*@lineinfo:147^2*/ + /*@lineinfo:generated-code*//*@lineinfo:150^2*/ // ************************************************************ -// #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) }; +// #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount) }; // ************************************************************ { @@ -495,6 +507,7 @@ class MediaDAO extends EntityBaseDAO { __sJT_stmt.setTimestamp(9, archived); __sJT_stmt.setTimestamp(10, modified); __sJT_stmt.setTimestamp(11, creation); + __sJT_stmt.setInt(12, fileCount); __sJT_execCtx.executeUpdate(); } finally @@ -507,11 +520,11 @@ class MediaDAO extends EntityBaseDAO { // ************************************************************ -/*@lineinfo:user-code*//*@lineinfo:147^255*/ +/*@lineinfo:user-code*//*@lineinfo:150^278*/ } /** - * Besz\ufffd\ufffd\ufffdrja az Item objektumhoz kapcsol\ufffd\ufffd\ufffdd\ufffd\ufffd\ufffd statikus/dinamikus Media adatokat. + * Besz\ufffd\ufffdrja az Item objektumhoz kapcsol\ufffd\ufffdd\ufffd\ufffd statikus/dinamikus Media adatokat. */ void addAll(DefaultContext context, IEntityBase entity) throws SQLException { manager.traceIn(); 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 7cf17e5150b872faffbd9a6983aebc4c63ff3499..f9a233381afbb470ee4d4adb2a193a7603844b47 100644 GIT binary patch delta 778 zcmaE*{!ViP4a%7d@`Hw!X`GBXBFPG@SC$Hx&20cC_XulFNU!I%zDI^#MlgCG4f1~<(Fm* z-CW6U$*8iEfq{V$6mVc4B8M9!5EvL3PE4-klV?0V`Le(&L8L%buvJj7SD3tyU6O-? z0Su;rjOXToYwVhQKu}t?A8G>+$OaV<5eio^WwMWubp1?_ivR!r{{~6Qf{0eQig_4v z?Qprp7$$eZxRp%h06T}S!GdJ&rrwE3zyskH8d6^X$T_v;d0wCB7lTZdVqjpXXJBAp{Qv*|Z;*g2 zh>(NJwSeS6HiLv!Ktv#1t`kG97B1I^VP-vCZZb$t0>#2cxa5q<7lfo4=T3ejBwfD< zYRF%Zy%r#%9jAo78a 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 05218e6037c1dcd3e083e5876b0e4db6c5963c77..89a865010f7e9706e23a4d3f0988148592b28ba1 100644 GIT binary patch delta 18 acmbQBK0$p04a%7d?BHVZP=3jqK@Dh9m( delta 18 ZcmbQBK0$p04 metadatas = itemType.getMetadatas(); @@ -648,7 +648,7 @@ class MetadataDAO extends EntityBaseDAO { } /** - * T\ufffdrli a param\ufffdterk\ufffdnt kapott ItemType azonos\ufffdt\ufffdhoz tartoz\ufffd Metadata bejegyz\ufffdseket. + * T\ufffd\ufffdrli a param\ufffd\ufffdterk\ufffd\ufffdnt kapott ItemType azonos\ufffd\ufffdt\ufffd\ufffdhoz tartoz\ufffd\ufffd Metadata bejegyz\ufffd\ufffdseket. */ void removeAll(DefaultContext context, long filterId) throws SQLException { manager.traceIn(); 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 fbde73470e618aac335623b8961833fa852cf621..f9359c445e93f002fa4eecb8fc525d3232a01878 100644 GIT binary patch delta 18 acmca@a@%AB4a%7d@+HVZO(Ndf>&$p=vY delta 18 Zcmca@a@%AB4a%7d>eHVZP&qepGw|4a%7d>OHw!Xu;Q|0hbO%`g delta 18 ZcmX>qepGw|4a%7d>uHw!XGasvQM`3F+~ delta 18 ZcmaDQ@k(L?4a%7d?_Y!+mc=K%mjR0g#G delta 18 ZcmdlWwLxkF4a%7d@wZ5Cwg;Q|0cf(HHo delta 18 ZcmbO$K39AL4heL{Kz4a%7d@AY!+nP&I15Rln0*x delta 18 ZcmX>heL{Kz4a%7d@=Z5Cwg;{gCf3a%7d>?Y!+nn<^}*udk1I$ delta 18 Zcmca3aYteU4 entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) - throws SQLException { + protected List entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException { List result = null; StoreUriIter iterator = (StoreUriIter) iter; while (iterator.next()) { @@ -143,186 +158,186 @@ class StoreUriDAO extends EntityBaseDAO { entity.setPortNumber(iterator.portNumber()); entity.setDelivery(ItemManagerData.toDeliveryMethod(iterator.delivery())); entity.setProtocol(ItemManagerData.toRemoteStoreProtocol(iterator.protocol())); - + if (result == null) - result = new ArrayList(); + result = new ArrayList(); result.add(entity); - } + } iterator.close(); return result; } - + @Override - protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException { + protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ StoreUriIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:52^2 */ + /*@lineinfo:generated-code*//*@lineinfo:52^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI WHERE ID = :id }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 0); - try { - __sJT_stmt.setLong(1, id); - iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 0); + try + { + __sJT_stmt.setLong(1, id); + iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:52^171 */ +/*@lineinfo:user-code*//*@lineinfo:52^171*/ return iter; } @Override - protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException { + protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ StoreUriIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:59^2 */ + /*@lineinfo:generated-code*//*@lineinfo:59^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI WHERE STOREID = :id }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 1); - try { - __sJT_stmt.setLong(1, id); - iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 1); + try + { + __sJT_stmt.setLong(1, id); + iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:59^176 */ +/*@lineinfo:user-code*//*@lineinfo:59^176*/ return iter; } @Override - protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException { + protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ StoreUriIter iter = null; - /* @lineinfo:generated-code *//* @lineinfo:66^2 */ + /*@lineinfo:generated-code*//*@lineinfo:66^2*/ // ************************************************************ // #sql [context] iter = { SELECT ID, STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL FROM STOREURI }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 2); - try { - iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), - __sJT_execCtx.getMaxRows()); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 2); + try + { + iter = new StoreUriIter(__sJT_execCtx.executeQuery(), __sJT_execCtx.getFetchSize(), __sJT_execCtx.getMaxRows()); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:66^156 */ +/*@lineinfo:user-code*//*@lineinfo:66^156*/ return iter; } - + @Override - protected void delete(DefaultContext context, long id) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:72^2 */ + protected void delete(DefaultContext context, long id) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:72^2*/ // ************************************************************ // #sql [context] { DELETE FROM STOREURI WHERE ID = :id }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 3); - try { - __sJT_stmt.setLong(1, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 3); + try + { + __sJT_stmt.setLong(1, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:72^55 */ +/*@lineinfo:user-code*//*@lineinfo:72^55*/ } - + @Override - protected void truncateTable(DefaultContext context) throws SQLException { - /* @lineinfo:generated-code */ - /* @lineinfo:77^2 */ + protected void truncateTable(DefaultContext context) throws SQLException{ + /*@lineinfo:generated-code*//*@lineinfo:77^2*/ // ************************************************************ // #sql [context] { TRUNCATE TABLE STOREURI DROP STORAGE IGNORE DELETE TRIGGERS IMMEDIATE }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 4); - try { - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 4); + try + { + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:77^89 */ +/*@lineinfo:user-code*//*@lineinfo:77^89*/ } - + @Override - protected void update(DefaultContext context, IEntityBase entity) throws SQLException { + protected void update(DefaultContext context, IEntityBase entity) throws SQLException{ StoreUri obj = (StoreUri) entity; long id = obj.getId(); long storeId = obj.getStoreId(); @@ -336,50 +351,51 @@ class StoreUriDAO extends EntityBaseDAO { Integer portNumber = obj.getPortNumber(); String delivery = obj.getDelivery() == null ? null : obj.getDelivery().toString(); String protocol = obj.getProtocol() == null ? null : obj.getProtocol().toString(); - - /* @lineinfo:generated-code *//* @lineinfo:96^2 */ + + /*@lineinfo:generated-code*//*@lineinfo:96^2*/ // ************************************************************ // #sql [context] { UPDATE STOREURI SET STOREID = :storeId, URI = :uri, ISSTREAM = :isStream, ISSOURCE = :isSource, ISTARGET = :isTarget, USERNAME = :userName, PASSWORD = :password, ROOTPATH = :rootPath, PORTNUMBER = :portNumber, DELIVERY = :delivery, PROTOCOL = :protocol WHERE ID = :id }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 5); - try { - __sJT_stmt.setLong(1, storeId); - __sJT_stmt.setString(2, uri); - __sJT_stmt.setString(3, isStream); - __sJT_stmt.setString(4, isSource); - __sJT_stmt.setString(5, isTarget); - __sJT_stmt.setString(6, userName); - __sJT_stmt.setString(7, password); - __sJT_stmt.setString(8, rootPath); - __sJT_stmt.setIntWrapper(9, portNumber); - __sJT_stmt.setString(10, delivery); - __sJT_stmt.setString(11, protocol); - __sJT_stmt.setLong(12, id); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 5); + try + { + __sJT_stmt.setLong(1, storeId); + __sJT_stmt.setString(2, uri); + __sJT_stmt.setString(3, isStream); + __sJT_stmt.setString(4, isSource); + __sJT_stmt.setString(5, isTarget); + __sJT_stmt.setString(6, userName); + __sJT_stmt.setString(7, password); + __sJT_stmt.setString(8, rootPath); + __sJT_stmt.setIntWrapper(9, portNumber); + __sJT_stmt.setString(10, delivery); + __sJT_stmt.setString(11, protocol); + __sJT_stmt.setLong(12, id); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:96^287 */ +/*@lineinfo:user-code*//*@lineinfo:96^287*/ } - + @Override - protected void insert(DefaultContext context, IEntityBase entity) throws SQLException { + protected void insert(DefaultContext context, IEntityBase entity) throws SQLException{ StoreUri obj = (StoreUri) entity; long storeId = obj.getStoreId(); String uri = obj.getUri(); @@ -393,51 +409,52 @@ class StoreUriDAO extends EntityBaseDAO { String delivery = obj.getDelivery() == null ? null : obj.getDelivery().toString(); String protocol = obj.getProtocol() == null ? null : obj.getProtocol().toString(); - /* @lineinfo:generated-code *//* @lineinfo:114^2 */ + /*@lineinfo:generated-code*//*@lineinfo:114^2*/ // ************************************************************ // #sql [context] { INSERT INTO STOREURI (STOREID, URI, ISSTREAM, ISSOURCE, ISTARGET, USERNAME, PASSWORD, ROOTPATH, PORTNUMBER, DELIVERY, PROTOCOL) VALUES (:storeId, :uri, :isStream, :isSource, :isTarget, :userName, :password, :rootPath, :portNumber, :delivery, :protocol) }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 6); - try { - __sJT_stmt.setLong(1, storeId); - __sJT_stmt.setString(2, uri); - __sJT_stmt.setString(3, isStream); - __sJT_stmt.setString(4, isSource); - __sJT_stmt.setString(5, isTarget); - __sJT_stmt.setString(6, userName); - __sJT_stmt.setString(7, password); - __sJT_stmt.setString(8, rootPath); - __sJT_stmt.setIntWrapper(9, portNumber); - __sJT_stmt.setString(10, delivery); - __sJT_stmt.setString(11, protocol); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 6); + try + { + __sJT_stmt.setLong(1, storeId); + __sJT_stmt.setString(2, uri); + __sJT_stmt.setString(3, isStream); + __sJT_stmt.setString(4, isSource); + __sJT_stmt.setString(5, isTarget); + __sJT_stmt.setString(6, userName); + __sJT_stmt.setString(7, password); + __sJT_stmt.setString(8, rootPath); + __sJT_stmt.setIntWrapper(9, portNumber); + __sJT_stmt.setString(10, delivery); + __sJT_stmt.setString(11, protocol); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:114^272 */ +/*@lineinfo:user-code*//*@lineinfo:114^272*/ } - + void addAll(DefaultContext context, IEntityBase entity) throws SQLException { manager.traceIn(); - Store store = (Store) entity; + Store store = (Store) entity; if (store != null && store.getStoreUris() != null) { - for (StoreUri su : store.getStoreUris()) { + for (StoreUri su: store.getStoreUris()) { su.setStoreId(store.getId()); add(context, su); } @@ -446,61 +463,62 @@ class StoreUriDAO extends EntityBaseDAO { } /** - * T\ufffdrli a param\ufffdterk\ufffdnt kapott Store azonos\ufffdt\ufffdhoz - * tartoz\ufffd StoreUri bejegyz\ufffdseket. + * T\ufffd\ufffdrli a param\ufffd\ufffdterk\ufffd\ufffdnt kapott Store azonos\ufffd\ufffdt\ufffd\ufffdhoz tartoz\ufffd\ufffd StoreUri bejegyz\ufffd\ufffdseket. */ void removeAll(DefaultContext context, long filterId) throws SQLException { manager.traceIn(); - /* @lineinfo:generated-code *//* @lineinfo:134^2 */ + /*@lineinfo:generated-code*//*@lineinfo:134^2*/ // ************************************************************ // #sql [context] { DELETE FROM STOREURI WHERE STOREID = :filterId }; // ************************************************************ - { - 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, - StoreUriDAO_SJProfileKeys.getKey(0), 7); - try { - __sJT_stmt.setLong(1, filterId); - __sJT_execCtx.executeUpdate(); - } finally { - __sJT_execCtx.releaseStatement(); - } - } - } +{ + 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, StoreUriDAO_SJProfileKeys.getKey(0), 7); + try + { + __sJT_stmt.setLong(1, filterId); + __sJT_execCtx.executeUpdate(); + } + finally + { + __sJT_execCtx.releaseStatement(); + } + } +} + // ************************************************************ - /* @lineinfo:user-code *//* @lineinfo:134^66 */ +/*@lineinfo:user-code*//*@lineinfo:134^66*/ manager.traceOut(); } -} - -/* @lineinfo:generated-code */class StoreUriDAO_SJProfileKeys { - private java.lang.Object[] keys; - private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime() - .getLoaderForClass(getClass()); - private static StoreUriDAO_SJProfileKeys inst = null; - - public static java.lang.Object getKey(int keyNum) throws java.sql.SQLException { - synchronized (user.jobengine.db.StoreUriDAO_SJProfileKeys.class) { - if (inst == null) { - inst = new StoreUriDAO_SJProfileKeys(); - } - } - return inst.keys[keyNum]; - } - - private StoreUriDAO_SJProfileKeys() throws java.sql.SQLException { - keys = new java.lang.Object[1]; - keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.StoreUriDAO_SJProfile0"); - } +}/*@lineinfo:generated-code*/class StoreUriDAO_SJProfileKeys +{ + private java.lang.Object[] keys; + private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass()); + private static StoreUriDAO_SJProfileKeys inst = null; + public static java.lang.Object getKey(int keyNum) + throws java.sql.SQLException + { + synchronized(user.jobengine.db.StoreUriDAO_SJProfileKeys.class) { + if (inst == null) + { + inst = new StoreUriDAO_SJProfileKeys(); + } + } + return inst.keys[keyNum]; + } + private StoreUriDAO_SJProfileKeys() + throws java.sql.SQLException + { + keys = new java.lang.Object[1]; + keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.StoreUriDAO_SJProfile0"); + } } 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 3e33e1b9c4efdbc2c1de52cf048828baf4996b7a..89ce9145c525a60c054c9c0a5b32ca7e9167bce7 100644 GIT binary patch delta 18 acmbQDIz@E@4a%7d>iZx&>176br9LkBwm delta 18 ZcmbQDIz@E@4#wN1nK|) 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 f21929d1d6e0dfcf53c0a0f56e0e5d207eb71a28..c1113d8dc660f0b61b4779e5a49bebbf525a899b 100644 GIT binary patch delta 18 acmdlgvsGpT4a%7d@&Y!+lx;ROIj`3DgI delta 18 ZcmdlgvsGpT4BiQ(S&*?n5CAY&1i=6R diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java index 287b933c..140789b7 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java @@ -206,7 +206,7 @@ public interface IItemManager extends IEntityPersister { Item getItem(long id); - Item getItemByHouseID(String houseID, String title); +// Item getItemByHouseID(String houseID, String title); ItemType getItemType(String itemTypeName); @@ -448,7 +448,5 @@ public interface IItemManager extends IEntityPersister { */ void truncate(Class classInfo); - BasicDBObject simpleSearch(BasicDBObject searchParameters); - SearchResult search(SearchOptions options, IExecutionDurationNotification cb); } \ No newline at end of file diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java index e7430ba3..fa0cbb4f 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java @@ -10,7 +10,6 @@ import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.time.Instant; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.Hashtable; @@ -41,8 +40,6 @@ import user.commons.remotestore.RemoteStoreProtocol; import user.commons.server.tcp.SignalServer; import user.jobengine.changehandler.IChangeHandler; import user.jobengine.changehandler.ItemTypeChangeHandlerFactory; -import user.jobengine.db.ItemManagerData.FilterLogic; -import user.jobengine.db.ItemManagerData.FilterValueLogic; import user.jobengine.db.ItemManagerData.GuiType; import user.jobengine.db.ItemManagerData.ListType; import user.jobengine.db.ItemManagerData.MdType; @@ -182,7 +179,7 @@ public class ItemManager extends MemoryCache implements IItemManager { private IMediaFinder createFinder() { IMediaFinder finder = null; - boolean externalIndexer = systemConfig.value("datasource.mediacube.external-indexer", false); +// boolean externalIndexer = systemConfig.value("datasource.mediacube.external-indexer", false); // if (externalIndexer) { // finder = new LuceneMediaFinder(this); // } else { @@ -847,34 +844,34 @@ public class ItemManager extends MemoryCache implements IItemManager { return (Item) get(Item.class, id); } - @Override - public Item getItemByHouseID(String houseID, String title) { - traceIn(); - Item result = null; - SearchFilter filter = new SearchFilter(); - filter.setMetadata(getStaticItemType().getMetadata("Anyag house ID")); - filter.setValueLogic(FilterValueLogic.EQUALS); - filter.setValues(Arrays.asList((Object) houseID)); - - SearchFilter filter1 = new SearchFilter(); - filter1.setLogic(FilterLogic.AND); - filter1.setMetadata(getStaticItemType().getMetadata("Anyag cím")); - filter1.setValueLogic(FilterValueLogic.EQUALS); - filter1.setValues(Arrays.asList((Object) title)); - - QueryObject qo = new QueryObject(); - qo.setFilters(Arrays.asList(filter, filter1)); - - // Exercise - List> searchResult = searchItem(qo); - - if (searchResult != null && searchResult.size() > 0 && searchResult.get(0).getItemCount() == 1) { - SearchResult sr = searchResult.get(0); - result = sr.getItems().get(0); - } - traceOut(); - return result; - } +// @Override +// public Item getItemByHouseID(String houseID, String title) { +// traceIn(); +// Item result = null; +// SearchFilter filter = new SearchFilter(); +// filter.setMetadata(getStaticItemType().getMetadata("Anyag house ID")); +// filter.setValueLogic(FilterValueLogic.EQUALS); +// filter.setValues(Arrays.asList((Object) houseID)); +// +// SearchFilter filter1 = new SearchFilter(); +// filter1.setLogic(FilterLogic.AND); +// filter1.setMetadata(getStaticItemType().getMetadata("Anyag cím")); +// filter1.setValueLogic(FilterValueLogic.EQUALS); +// filter1.setValues(Arrays.asList((Object) title)); +// +// QueryObject qo = new QueryObject(); +// qo.setFilters(Arrays.asList(filter, filter1)); +// +// // Exercise +// List> searchResult = searchItem(qo); +// +// if (searchResult != null && searchResult.size() > 0 && searchResult.get(0).getItemCount() == 1) { +// SearchResult sr = searchResult.get(0); +// result = sr.getItem(null); +// } +// traceOut(); +// return result; +// } @Override public ItemType getItemType(String itemTypeName) { @@ -1484,10 +1481,4 @@ public class ItemManager extends MemoryCache implements IItemManager { } } - @Override - public BasicDBObject simpleSearch(BasicDBObject searchParameters) { - MediaFinder finder = new MediaFinder(this); - return finder.simpleSearch(searchParameters); - } - } diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java index 60625e39..f45ea1ef 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java @@ -33,6 +33,7 @@ public class Media extends DynamicAttributes { private String mediaFilesName; private String mediaFileRealName; private int mediaFilesCount = -1; + private int fileCount = 0; public void appendMediaFile(MediaFile mediaFile) { checkParameter("MediaFile", mediaFile, true); @@ -193,4 +194,12 @@ public class Media extends DynamicAttributes { this.creation = creation; } + public int getFileCount() { + return fileCount; + } + + public void setFileCount(int fileCount) { + this.fileCount = fileCount; + } + } \ No newline at end of file diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj index 34e36a25..9e590b17 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj @@ -7,7 +7,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, byte[] poster, Timestamp creation); +#sql iterator MediaIter(long id, String title, String description, long itemId, long itemTypeId, String houseId, long length, Timestamp created, Timestamp archived, Timestamp modified, byte[] poster, Timestamp creation, int fileCount); @SuppressWarnings("unused") class MediaDAO extends EntityBaseDAO { @@ -65,6 +65,7 @@ class MediaDAO extends EntityBaseDAO { entity.setModified(iterator.modified()); entity.setPoster(iterator.poster()); entity.setCreation(iterator.creation()); + entity.setFileCount(iterator.fileCount()); if (result == null) result = new ArrayList(); @@ -77,27 +78,27 @@ class MediaDAO extends EntityBaseDAO { @Override protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ID = :id }; return iter; } @Override protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ITEMID = :id }; return iter; } public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE TITLE = :title }; return iter; } @Override protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{ MediaIter iter = null; - #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA }; + #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA }; return iter; } @@ -125,8 +126,9 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); + int fileCount = obj.getFileCount(); - #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation WHERE ID = :id }; + #sql [context] { UPDATE MEDIA SET TITLE = :title, DESCRIPTION = :description, ITEMID = :itemId, ITEMTYPEID = :itemTypeId, HOUSEID = :houseId, LENGTH = :length, POSTER = :poster, ARCHIVED = :archived, MODIFIED = :modified, CREATION = :creation, FILECOUNT = :fileCount WHERE ID = :id }; } @Override @@ -143,8 +145,9 @@ class MediaDAO extends EntityBaseDAO { Timestamp archived = obj.getArchived(); Timestamp modified = obj.getModified(); Timestamp creation = obj.getCreation(); + int fileCount = obj.getFileCount(); - #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation) }; + #sql [context] { INSERT INTO MEDIA (ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, POSTER, ARCHIVED, MODIFIED, CREATION, FILECOUNT) VALUES (:id, :title, :description, :itemId, :itemTypeId, :houseId, :length, :poster, :archived, :modified, :creation, :fileCount) }; } /** diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java b/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java index 2056925b..7a42ba89 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java @@ -7,17 +7,12 @@ import java.sql.SQLException; import java.text.SimpleDateFormat; import java.time.Duration; import java.time.Instant; -import java.util.ArrayList; -import java.util.List; import java.util.Objects; import org.apache.ibatis.jdbc.SQL; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.ibm.nosql.json.api.BasicDBList; -import com.ibm.nosql.json.api.BasicDBObject; - import sqlj.runtime.ref.DefaultContext; import user.jobengine.db.ArchivedMedia; import user.jobengine.db.Item; @@ -35,8 +30,8 @@ public class MediaFinder implements IMediaFinder { this.manager = manager; } - private PreparedStatement createStatement(Connection connection, String criteria, SearchOptions options) throws Exception { - String criteriasPattern = getCriteriasRegexPattern(criteria); + private PreparedStatement createStatement(Connection connection, SearchOptions options) throws Exception { + String criteria = options.getText(); StringBuilder sql = new StringBuilder(); sql.append("SELECT "); @@ -53,18 +48,15 @@ public class MediaFinder implements IMediaFinder { sql.append("m.created,"); sql.append("m.modified,"); sql.append("m.length,"); + sql.append("m.filecount,"); sql.append("m.itemtypeid mediaitemtypeid,"); -// sql.append(String.format("HIGHLIGHT(md.description, '', '', '%s') description,", criteriasPattern)); sql.append("it.name mediaitemtypename,"); sql.append("m.houseid mediahouseid,"); sql.append("mf.houseid mediafilehouseid"); -// sql.append("vw_mf.mediafilecount"); } sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md, ITEMTYPE it"); - // sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md, VW_MEDIAFILES vw_mf, ITEMTYPE it"); sql.append(" WHERE i.id = md.itemid AND m.id = md.mediaid AND mf.id = md.mediafileid"); -// sql.append(" AND m.id=vw_mf.mediaid AND m.itemTypeId = it.id"); sql.append(" AND m.itemTypeId = it.id"); StringBuilder criteriaForType = options.getCriteriaForType(); @@ -102,8 +94,8 @@ public class MediaFinder implements IMediaFinder { if (options.getTo() != null) sql.append(String.format(" AND m.creation < '%s'", df.format(options.getTo()))); -// if (options.isMissingProxy()) -// sql.append(" AND vw_mf.mediafilecount=1"); + if (options.isMissingProxy()) + sql.append(" AND m.filecount = 1"); if (options.getDescLength() > 0) sql.append(" AND LENGTH(m.description) < " + options.getDescLength()); @@ -118,165 +110,78 @@ public class MediaFinder implements IMediaFinder { } } - if (!options.isCountOnly() && (options.getToResult() != 0)) { - - sql.append(" LIMIT " + (options.getToResult() - options.getFromResult())); - sql.append(" OFFSET " + options.getFromResult()); - } - - String query = sql.toString(); - logger.info(query); +// if (!options.isCountOnly() && (options.getToResult() != 0)) { +// +// sql.append(" LIMIT " + (options.getToResult() - options.getFromResult())); +// sql.append(" OFFSET " + options.getFromResult()); +// } - PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE); -// PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, -// ResultSet.CONCUR_READ_ONLY); + logger.info(sql.toString()); - // TODO Ettol elszall a 11.5-on a kereses - // if (criteria != null && criteria.trim().length() > 0) { - // st.setString(1, criteria); - // logger.info("Parameter is {}", criteria); - // } - return st; + return connection.prepareStatement(sql.toString(), ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE); } -// private PreparedStatement createGroupingStatement(Connection connection, String criteria, SearchOptions options) throws Exception { -// boolean simpleSearch = manager.getSystemConfig().value("datasource.mediacube.simple-search", true); -// String criteriasPattern = getCriteriasRegexPattern(criteria); -// -// SQL innerSql = new SQL(); -// innerSql.SELECT("max(vi.mediaid)"); -// innerSql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md"); -// innerSql.WHERE("vi.mediafileid = md.mediafileid"); -// -// if (simpleSearch) { -// // TODO ezen az agon nem jo!!!!! -// String simpleTextCriteria = formatSimpleSearchValue(criteria); -// if (simpleTextCriteria != null && simpleTextCriteria.trim().length() > 0) { -// innerSql.AND(); -// innerSql.WHERE("("); -// innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.mediatitle", simpleTextCriteria)); -// innerSql.OR(); -// innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.itemtitle", simpleTextCriteria)); -// innerSql.OR(); -// innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.mediarelativepath", simpleTextCriteria)); -// innerSql.WHERE(")"); -// } -// } else { -// String textCriteria = formatSearchValue(criteria); -// if (textCriteria != null && textCriteria.trim().length() > 0) { -// innerSql.AND(); -// innerSql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria)); -// } -// } -// innerSql.GROUP_BY("vi.mediarelativepath"); -// -// SQL mainSql = new SQL(); -// if (options.isCountOnly()) -// mainSql.SELECT("COUNT(1) AS NumberOfRecords"); -// else -// mainSql.SELECT("vi.itemid", "vi.itemtitle", "vi.mediaid", "vi.mediatitle", "vi.mediarelativepath", "vi.mediaarchived", "vi.mediacreation", -// "vi.medialength", "vf.mediafilecount", -// String.format("HIGHLIGHT(md.description, '', '', '%s') description", criteriasPattern)); -// -// mainSql.FROM("VW_ITEMS_WITH_PATH vi", "VW_MEDIAFILES vf", "MEDIADESCRIPTION md"); -// mainSql.WHERE("vf.mediaid = vi.mediaid"); -// mainSql.AND(); -// mainSql.WHERE("vi.mediafileid = md.mediafileid"); -// mainSql.AND(); -// mainSql.WHERE(String.format("vi.mediaid IN (\r\n%s\r\n)", innerSql.toString())); -// -// StringBuilder criteriaForType = options.getCriteriaForType(); -// if (criteriaForType != null) { -// mainSql.AND(); -// mainSql.WHERE(String.format("vi.mediaitemtypeid IN (%s)", criteriaForType.toString())); -// } -// -// StringBuilder criteriaForTag = options.getCriteriaForTag(); -// if (criteriaForTag != null) { -// SQL tagSql = new SQL(); -// tagSql.SELECT("mediaid"); -// tagSql.FROM("MEDIATAGS"); -// tagSql.WHERE(String.format("vi.mediaitemtypeid IN (%s)", criteriaForTag.toString())); -// -// mainSql.AND(); -// mainSql.WHERE(String.format("vi.mediaid IN (%s)", tagSql.toString())); -// } -// -// if (options.getFrom() != null) { -// mainSql.AND(); -// mainSql.WHERE(String.format("vi.mediacreation > '%s'", df.format(options.getFrom()))); -// } -// -// if (options.getTo() != null) { -// mainSql.AND(); -// mainSql.WHERE(String.format("vi.mediacreation < '%s'", df.format(options.getTo()))); -// } -// -// if (options.isMissingProxy()) { -// mainSql.AND(); -// mainSql.WHERE("vf.mediafilecount = 1"); -// } -// -// if (options.getDescLength() > 0) { -// mainSql.AND(); -// mainSql.WHERE(String.format("LENGTH(vi.mediadescription) < %s", options.getDescLength())); -// } -// -// if (!options.isCountOnly() && (options.getToResult() != 0)) { -// mainSql.ORDER_BY("vi.mediacreation DESC"); -// mainSql.LIMIT((options.getToResult() - options.getFromResult())); -// mainSql.OFFSET(options.getFromResult()); -// } -// -// String query = mainSql.toString(); -// logger.info(query); -// PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE); -// return st; -// } - private String formatSearchValue(String value) { String[] specials = new String[] { ":", "?", "%", "(", ")" }; - String result = value; + String result = value.trim(); for (String c : specials) { result = result.replace(c, "\\" + c); } + if (!(result.startsWith("\"") && result.endsWith("\"")) && result.length() != 0) result += "*"; return result; } - private String getCriteriasRegexPattern(String criteria) { - String[] criterias = criteria.replace("*", "").replace("+", " ").split(" "); - if (criteria.startsWith("\"") && criteria.endsWith("\"")) - criterias = new String[] { criteria.replace("\"", "") }; - - StringBuilder sb = new StringBuilder(); - for (String word : criterias) { - if (sb.length() > 0) - sb.append("|"); - sb.append(word); - } - return sb.toString(); - } - - private long getTotalCount(SearchOptions options) { + private SearchResult getSearchResults(SearchOptions options) { long start = System.currentTimeMillis(); - long result = 0; + + SearchResult result = new SearchResult<>(); ResultSet rs = null; PreparedStatement st = null; - DefaultContext context = manager.getDbContext(); Connection connection = context.getConnection(); + try { - logger.info("Query total count"); - options.setCountOnly(true); - // creating a query for checking resultset size - st = createStatement(connection, options.getText(), options); + st = createStatement(connection, options); rs = st.executeQuery(); - if (rs.next()) { - result = rs.getLong("totalCount"); + + rs.last(); + result.setItemCount(rs.getRow()); + + // set begining position + int fromResult = options.getFromResult(); + int toResult = options.getToResult(); + + if (fromResult > -1) { + if (fromResult <= result.getItemCount()) { + if (fromResult > 1) { + rs.absolute(fromResult - 1); + } else { + rs.beforeFirst(); + } + } else { + if (result.getItemCount() > 0) { + throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: " + result.getItemCount()); + } + } + } else { + rs.beforeFirst(); + } + + int maxRecords = toResult - fromResult; + + while (rs.next() && maxRecords > 0) { + ArchivedMedia am = createArchiveMedia(rs); + result.addItem(am.getMedia().getId(), am); + + maxRecords--; } + + mergeRelevantDescriptions(connection, result, options.getText()); + + logger.info("Query result processed"); connection.commit(); } catch (Exception e) { try { @@ -289,54 +194,35 @@ public class MediaFinder implements IMediaFinder { try { if (rs != null) rs.close(); - } catch (Exception e2) { + } catch (Exception e1) { } - try { if (st != null) st.close(); - } catch (Exception e2) { + } catch (Exception e1) { } manager.putDbContext(context); } long end = System.currentTimeMillis(); - logger.info("getNumberOfRecords execution time is {} s", (float) (end - start) / 1000); + logger.info("getSearchResults execution time is {} s", (float) (end - start) / 1000); return result; } - private void getSearchResults(SearchResult searchResults, SearchOptions options) { - long start = System.currentTimeMillis(); - ResultSet rs = null; + private void mergeRelevantDescriptions(Connection connection, SearchResult searchResult, String criteria) { PreparedStatement st = null; - - DefaultContext context = manager.getDbContext(); - Connection connection = context.getConnection(); - + ResultSet rs = null; try { - options.setCountOnly(false); - st = createStatement(connection, options.getText(), options); + SQL query = SearchSQL.descriptionsQuery(criteria, searchResult.getKeys()); + st = connection.prepareStatement(query.toString()); rs = st.executeQuery(); - - List resultList = null; while (rs.next()) { - ArchivedMedia am = createArchiveMedia(rs); - // am.setRelevant(rs.getString("description")); - if (resultList == null) { - resultList = new ArrayList<>(); - searchResults.setItems(resultList); - } - resultList.add(am); + long mediaId = rs.getLong("mediaid"); + String description = rs.getString("description"); + searchResult.getItem(mediaId).setRelevant(description); } - logger.info("Query result processed"); - connection.commit(); } catch (Exception e) { - try { - connection.rollback(); - } catch (Exception e1) { - logger.throwing(e1); - } - manager.throwError(e); + logger.error(e.getMessage()); } finally { try { if (rs != null) @@ -348,19 +234,7 @@ public class MediaFinder implements IMediaFinder { st.close(); } catch (Exception e1) { } - - manager.putDbContext(context); } - long end = System.currentTimeMillis(); - logger.info("getSearchResults execution time is {} s", (float) (end - start) / 1000); - } - - private String formatSimpleSearchValue(String value) { - String result = value; - if (value.endsWith("*")) - result = value.replace("*", ""); - result = result.trim(); - return result; } private ArchivedMedia createArchiveMedia(ResultSet rs) throws SQLException { @@ -384,7 +258,7 @@ public class MediaFinder implements IMediaFinder { media.setModified(rs.getTimestamp("modified")); media.setArchived(rs.getTimestamp("archived")); media.setLength(rs.getLong("length")); - // media.setMediaFilesCount(rs.getInt("mediafilecount")); + media.setFileCount(rs.getInt("filecount")); media.setMediaFilesName(rs.getString("mediafilehouseid")); media.setMediaFilesCount(1); @@ -398,93 +272,11 @@ public class MediaFinder implements IMediaFinder { public SearchResult search(SearchOptions options, IExecutionDurationNotification cb) { Instant started = Instant.now(); manager.traceIn(); - SearchResult result = new SearchResult<>(); - - if (options.getFromResult() == 0) { - long numberOfRecords = getTotalCount(options); - logger.info("Number of records {}", numberOfRecords); - - result.setItemCount(numberOfRecords); - } - - getSearchResults(result, options); + SearchResult result = getSearchResults(options); manager.traceOut(); Instant finished = Instant.now(); if (Objects.nonNull(cb)) cb.notify(Duration.between(started, finished)); return result; } - - public BasicDBObject simpleSearch(BasicDBObject searchParameters) { - BasicDBObject result = new BasicDBObject(); - BasicDBList items = new BasicDBList(); - result.put("data", items); - - String criteria = searchParameters.getString("criteria"); - String criteriasPattern = getCriteriasRegexPattern(criteria); - String textCriteria = formatSearchValue(criteria); - - int paginationSize = searchParameters.getInt("size"); - int page = searchParameters.getInt("page"); - if (page == 1) { - SQL sql = new SQL(); - sql.SELECT("COUNT(*) resultcount"); - sql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md"); - sql.WHERE("vi.mediafileid = md.mediafileid"); - if (textCriteria != null && textCriteria.trim().length() > 0) { - sql.AND(); - sql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria)); - } - - String query = sql.toString(); - manager.executeQuery(query, rs -> { - int resultCount = rs.getInt("resultcount"); - int pageCount = (int) Math.floor(resultCount / paginationSize); - logger.info("Result count {}, pagecount {}", resultCount, pageCount); - result.put("last_page", pageCount); - return false; - }, st -> { - - }); - } - SQL sql = new SQL(); - String relevantField = String.format("HIGHLIGHT(md.description, '', '', '%s') AS relevant", criteriasPattern); - sql.SELECT("vi.itemid", "vi.itemtitle", "vi.mediaid", "vi.mediatitle", "vi.mediacreation", "vi.medialength", "vi.mediaitemtypename", "vi.mediahouseid", - "vi.mediarelativepath", relevantField); - sql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md"); - sql.WHERE("vi.mediafileid = md.mediafileid"); - if (textCriteria != null && textCriteria.trim().length() > 0) { - sql.AND(); - sql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria)); - } - sql.LIMIT(paginationSize); - int offset = (page - 1) * paginationSize; - sql.OFFSET(offset); - sql.ORDER_BY("vi.mediacreation DESC"); - String query = sql.toString(); - logger.info(query); - - result.put("last_row", offset); - - manager.executeQuery(query, rs -> { - BasicDBObject item = new BasicDBObject(); - item.put("itemId", rs.getString("itemid")); - item.put("itemTitle", rs.getString("itemtitle")); - item.put("mediaId", rs.getString("mediaid")); - item.put("mediaTitle", rs.getString("mediatitle")); - item.put("creation", rs.getString("mediacreation")); - item.put("length", rs.getInt("medialength")); - item.put("typeName", rs.getString("mediaitemtypename")); - item.put("houseId", rs.getString("mediahouseid")); - item.put("fileName", rs.getString("mediarelativepath")); - item.put("relevant", rs.getString("relevant")); - items.add(item); - result.put("last_row", result.getInt("last_row") + 1); - return true; - }, st -> { - - }); - return result; - } - } diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java b/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java index 34299a58..23aa24e7 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java @@ -1,26 +1,37 @@ package user.jobengine.search; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; public class SearchResult { private long itemCount; - private List items; + private Map items = new LinkedHashMap<>(); public long getItemCount() { return itemCount; } public List getItems() { - return items; + return new ArrayList<>(items.values()); } - public void setItemCount(long itemCount) { - this.itemCount = itemCount; + public List getKeys() { + return new ArrayList<>(items.keySet()); + } + + public void addItem(Long id, T item) { + items.put(id, item); } - public void setItems(List items) { - this.items = items; + public T getItem(Long id) { + return items.get(id); + } + + public void setItemCount(long itemCount) { + this.itemCount = itemCount; } } \ No newline at end of file diff --git a/server/user.jobengine.osgi.db/test/user/jobengine/db/TestItem.java b/server/user.jobengine.osgi.db/test/user/jobengine/db/TestItem.java index f9291daa..0c7f26f0 100644 --- a/server/user.jobengine.osgi.db/test/user/jobengine/db/TestItem.java +++ b/server/user.jobengine.osgi.db/test/user/jobengine/db/TestItem.java @@ -377,18 +377,6 @@ public class TestItem extends TestBase { // } // } - @Test - public void testSearchItem_byHouseID() { - - // TestDB.createStaticItemTypes(); - // Fixture - // Exercise - Item result = manager.getItemByHouseID("11111", null); - - // Verify - assertNotNull(result); - } - @Test public void testSetAttribute() { // Fixture diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java index d9690125..51aeea0d 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java @@ -340,7 +340,8 @@ public class MediaCubeService { logger.info("Request: {}", searchParameters.toPrettyString("")); try { IItemManager manager = ComponentBinder.getItemManager(); - BasicDBObject searchResult = manager.simpleSearch(searchParameters); +// BasicDBObject searchResult = manager.search(searchParameters, null); + BasicDBObject searchResult = null; result = Response.ok(searchResult).build(); } catch (Exception e) { result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); diff --git a/server/user.mediacube.gui/META-INF/MANIFEST.MF b/server/user.mediacube.gui/META-INF/MANIFEST.MF index aecc8865..42408eb0 100644 --- a/server/user.mediacube.gui/META-INF/MANIFEST.MF +++ b/server/user.mediacube.gui/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: user.jobengine.osgi.db;bundle-version="1.0.0", user.commons.zk;bundle-version="1.0.0", org.apache.servicemix.bundles.quartz;bundle-version="2.3.0", user.jobengine.osgi.server, - hu.user.zk.theme.userdark;bundle-version="1.0.0" + hu.user.theme.userdark;bundle-version="1.0.0" Export-Package: user.jobengine.gui DynamicImport-Package: * Bundle-ClassPath: . diff --git a/server/user.mediacube.gui/css/tagify.css b/server/user.mediacube.gui/css/tagify.css index c603236e..a0358436 100644 --- a/server/user.mediacube.gui/css/tagify.css +++ b/server/user.mediacube.gui/css/tagify.css @@ -7,12 +7,14 @@ .tagify{ /* --tags-border-color:#DDD;*/ - --tags-border-color: #1d1d1d; +/*dark --tags-border-color: #1d1d1d;*/ + --tags-border-color: #cfcfcf; --tags-disabled-bg:#F1F1F1; /* --tags-hover-border-color:#CCC;*/ - --tags-hover-border-color: #1d1d1d; + --tags-hover-border-color: #cfcfcf; /* --tags-focus-border-color:#3595f6;*/ - --tags-focus-border-color: #1d1d1d; + --tags-focus-border-color: #cfcfcf; + --tag-bg:#1d1d1d; --tag-hover:#D3E2E2; /* diff --git a/server/user.mediacube.gui/js/searchitems.js b/server/user.mediacube.gui/js/searchitems.js index 27c2f0e8..b54f3033 100644 --- a/server/user.mediacube.gui/js/searchitems.js +++ b/server/user.mediacube.gui/js/searchitems.js @@ -79,6 +79,8 @@ player.ready(function(){ var duration; this.on('loadedmetadata', function(){ +/* + //kulon csikba az idok container= player.getChild('controlBar').addChild('timecodeContainer'); start= container.addChild('startTime'); current= container.addChild('currentTime'); @@ -88,6 +90,7 @@ player.ready(function(){ current.updateTextContent(SMPTEToString(secondsToSMPTEWithSOM(player.currentTime()))); end.updateTextContent(SMPTEToString(secondsToSMPTEWithSOM(player.duration()))); duration.updateTextContent(SMPTEToString(secondsToSMPTE(player.duration()))); +*/ }); this.on('timeupdate', function(){ @@ -165,6 +168,8 @@ videojs.setFormatTime(customTimeFormat); var Component = videojs.getComponent('Component'); +/* +//kulon csikba az idok var timecodeContainer = videojs.extend(Component, { constructor: function(player, options) { Component.apply(this, arguments); @@ -187,6 +192,7 @@ var timecodeContainer = videojs.extend(Component, { }); videojs.registerComponent('timecodeContainer', timecodeContainer); + var timeBox = videojs.extend(timecodeContainer, { constructor: function(player, options) { Component.apply(this, arguments); @@ -231,6 +237,7 @@ videojs.registerComponent('startTime', timeBox); videojs.registerComponent('currentTime', currenttimeBox); videojs.registerComponent('endTime', timeBox); videojs.registerComponent('duration', timeBox); +*/ function createBreakPoint() { var current = player.currentTime(); diff --git a/server/user.mediacube.gui/pages/menu.zul b/server/user.mediacube.gui/pages/menu.zul index 365b35ab..f712d6db 100644 --- a/server/user.mediacube.gui/pages/menu.zul +++ b/server/user.mediacube.gui/pages/menu.zul @@ -35,12 +35,12 @@ - - - - - - + + + + + + diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul index 8e7baa85..094a147c 100644 --- a/server/user.mediacube.gui/pages/searchitems.zul +++ b/server/user.mediacube.gui/pages/searchitems.zul @@ -39,37 +39,15 @@
- +
- - - - - - - - - - - - - - - - - - - - - -
@@ -77,7 +55,7 @@
- +
uiTasks = new ArrayList<>(); protected void doKeepAlive() { @@ -28,8 +30,7 @@ public class AsyncBaseModel extends BaseModel { @Command public void uiTick() { - // logger.info("{} tick {}", this.getClass().getSimpleName(), - // System.currentTimeMillis()); + // logger.info("{} tick {}", this.getClass().getSimpleName(), System.currentTimeMillis()); doKeepAlive(); synchronized (uiTasks) { for (UITask task : uiTasks) { diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java index 6c2b29c3..3f496e23 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java @@ -40,7 +40,6 @@ public class CachedListModel extends ListModelList { private SearchOptions options; private IExecutionDurationNotification cb; - private boolean enableCache = true; private int cacheSize = SessionUtil.getMediaCubeConfig().getSearchResultsListCacheSize(); public CachedListModel(SearchOptions options, IExecutionDurationNotification cb) { @@ -72,8 +71,7 @@ public class CachedListModel extends ListModelList { protected SearchResult createSearchResult(int startPos, int endPos) { options.setFromResult(startPos); options.setToResult(endPos); - SearchResult sr = itemManager.search(options, cb); - return sr; + return itemManager.search(options, cb); } public void fireListEvent() { @@ -107,7 +105,7 @@ public class CachedListModel extends ListModelList { @Override public ArchivedMedia getElementAt(int index) { - logger.info("getElementAt {}", index); + // logger.info("getElementAt {}", index); ArchivedMedia ret = cache.get(index); if (ret == null) { loadCache(index); @@ -139,22 +137,18 @@ public class CachedListModel extends ListModelList { SearchResult sr = null; int startPos = 0; - if (enableCache) { - int halfSize = this.cacheSize / 2; - int rowLimit = this.cacheSize; // 200 - if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0 - // cache=0-200, forIndex=150 - // startPos=50 cache=50-250 - startPos = (forIndex - halfSize); - } + int halfSize = this.cacheSize / 2; + int rowLimit = this.cacheSize; // 200 + if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0 + // cache=0-200, forIndex=150 + // startPos=50 cache=50-250 + startPos = (forIndex - halfSize); + } - int endPos = (startPos + rowLimit); - endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize; + int endPos = (startPos + rowLimit); + endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize; - sr = createSearchResult(startPos, endPos); - } else { - sr = createSearchResult(startPos, 0); - } + sr = createSearchResult(startPos, endPos); if (sr != null) { diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java index a4a04c70..b8032b8d 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java @@ -221,12 +221,11 @@ public class GridSearchModel extends AsyncBaseModel { // A MediaFileServlet a services/proxy alatt szolgal ki // Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4', // 'video/mp4')"); + Selectors.wireComponents(view, this, false); + Selectors.wireEventListeners(view, this); try { - Selectors.wireComponents(view, this, false); - Selectors.wireEventListeners(view, this); - boolean typeFiltersVisible = SessionUtil.getTypeFiltersVisibility(); if (typeFiltersVisible) { toggleShowTypeFilters.setChecked(true); @@ -282,6 +281,7 @@ public class GridSearchModel extends AsyncBaseModel { paginal.addEventListener("onPaging", event -> { PagingEvent evt = (PagingEvent) event; preventAfterRender = false; + // ensureVisible(0); }); for (Component child : itemsGrid.getColumns().getChildren()) { @@ -423,7 +423,6 @@ public class GridSearchModel extends AsyncBaseModel { } void ensureVisible(int pos) { - registerTask(() -> { logger.info("Scrolling to pos {} begin", pos); List children = itemsGrid.getRows().getChildren(); @@ -480,7 +479,7 @@ public class GridSearchModel extends AsyncBaseModel { return itemSelectedValidator; } - public String getLowresMediaFilePath() throws Exception { + public String getLowresMediaFilePath() { String ret = null; if (selectedObject != null) { List mediaFiles = selectedObject.getMedia().getMediaFiles(); @@ -502,13 +501,17 @@ public class GridSearchModel extends AsyncBaseModel { StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP); if (sourceStoreUri != null && sourceStoreUri.isStream()) { - - String noProtocolUri = sourceStoreUri.toString(true); - String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false); - if (!base.endsWith("/")) - base += "/"; - String relative = mf.getRelativePath().replace("\\", "/"); - ret = base + relative; + try { + String noProtocolUri = sourceStoreUri.toString(true); + String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false); + if (!base.endsWith("/")) + base += "/"; + String relative = mf.getRelativePath().replace("\\", "/"); + ret = base + relative; + + } catch (Exception e) { + Clients.showNotification(e.getMessage(), "error", btnSearch, "start_center", 3000); + } logger.info("Found lowres on store {}, url is {}", store.getName(), ret); break; } @@ -672,13 +675,16 @@ public class GridSearchModel extends AsyncBaseModel { highlight(selectedObject, true); notifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath"); } else { - if (!preventAfterRender) { - preventAfterRender = true; - if (positionToScroll != -1) { - ensureVisible(positionToScroll); - } - } + ensureVisible(0); +// +// if (!preventAfterRender) { +// preventAfterRender = true; +// +// if (positionToScroll != -1) { +// ensureVisible(positionToScroll); +// } +// } } } catch (Exception e) { handleSearchError(e); @@ -1091,31 +1097,30 @@ public class GridSearchModel extends AsyncBaseModel { // tags setMediaTags(mediaId); - - try { - // proxy - String video = getLowresMediaFilePath(); - if (video == null) { - Clients.evalJavaScript("setSource(null, null)"); - } else { - String srcType = null; - if (video.endsWith(".m3u8")) - srcType = "application/x-mpegURL"; - else - srcType = "video/mp4"; - - Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType)); - } - - } catch (Exception e) { - logger.error(e); - } - + final String proxyUrl = getLowresMediaFilePath(); + registerTask(() -> { + loadProxy(proxyUrl); + }); + timer.start(); } else Clients.evalJavaScript("addMediaTags([]);"); } + private void loadProxy(String video) { + if (video == null) { + Clients.evalJavaScript("setSource(null, null)"); + } else { + String srcType = null; + if (video.endsWith(".m3u8")) + srcType = "application/x-mpegURL"; + else + srcType = "video/mp4"; + + Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType)); + } + } + private void setSettingsPageSize(int pageSize) { List searchSettingItems = searchSettings.getChildren(); for (Component c : searchSettingItems) { diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/InitializedCachedListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/InitializedCachedListModel.java index 81fe4984..c14f536b 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/InitializedCachedListModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/InitializedCachedListModel.java @@ -1,7 +1,5 @@ package user.jobengine.zk.model; -import java.util.Arrays; - import user.jobengine.db.ArchivedMedia; import user.jobengine.db.Media; import user.jobengine.db.SearchOptions; @@ -25,7 +23,7 @@ public class InitializedCachedListModel extends CachedListModel { ArchivedMedia archivedMedia = new ArchivedMedia(); archivedMedia.setMedia(media); archivedMedia.setItem(itemManager.getItem(media.getItemId())); - sr.setItems(Arrays.asList(archivedMedia)); + sr.addItem(archivedMedia.getMedia().getId(), archivedMedia); return sr; } -- 2.54.0