Eredeti keresesi sebesseg visszaallitva
authorelgekko <vasary@elgekko.net>
Sun, 5 Mar 2023 20:36:23 +0000 (21:36 +0100)
committerelgekko <vasary@elgekko.net>
Sun, 5 Mar 2023 20:36:23 +0000 (21:36 +0100)
61 files changed:
server/-configuration/run-mediacube-server-local.launch
server/-dependencies/jobengine.target
server/-dependencies/pom.xml
server/-modules/pom.xml
server/-product/mediacube.product
server/-product/production/LOCAL/settings/application.yaml
server/-product/production/LOCAL/settings/mediacube.yaml
server/user.commons.zk/META-INF/MANIFEST.MF
server/user.jobengine.osgi.db/build-remote-sqlj.bat
server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO.java
server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser
server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser
server/user.jobengine.osgi.db/src/user/jobengine/db/IItemManager.java
server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
server/user.jobengine.osgi.db/src/user/jobengine/db/MediaDAO.sqlj
server/user.jobengine.osgi.db/src/user/jobengine/search/MediaFinder.java
server/user.jobengine.osgi.db/src/user/jobengine/search/SearchResult.java
server/user.jobengine.osgi.db/test/user/jobengine/db/TestItem.java
server/user.jobengine.osgi.services/src/user/jobengine/osgi/mediacube/MediaCubeService.java
server/user.mediacube.gui/META-INF/MANIFEST.MF
server/user.mediacube.gui/css/tagify.css
server/user.mediacube.gui/js/searchitems.js
server/user.mediacube.gui/pages/menu.zul
server/user.mediacube.gui/pages/searchitems.zul
server/user.mediacube.gui/pages/searchitems/details.zul
server/user.mediacube.gui/resources/i3-label_hu.properties
server/user.mediacube.gui/src/user/jobengine/zk/model/AsyncBaseModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/CachedListModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java
server/user.mediacube.gui/src/user/jobengine/zk/model/InitializedCachedListModel.java

index ffcac96bebbac0cc891bf2bba07f4a431716ff65..0fd2f9a68a15c7f50ebb176f4b35bcdb1852f198 100644 (file)
@@ -12,6 +12,7 @@
     <intAttribute key="default_start_level" value="4"/>\r
     <setAttribute key="deselected_workspace_bundles"/>\r
     <booleanAttribute key="includeOptional" value="false"/>\r
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>\r
     <mapAttribute key="org.eclipse.debug.core.environmentVariables">\r
         <mapEntry key="DSMI_CONFIG" value="${workspace_loc}\-product\production\LOCAL\settings\dsm.opt"/>\r
         <mapEntry key="DSMI_DIR" value="c:\apps\TSM\baclient"/>\r
         <setEntry value="slf4j.simple@default:false"/>\r
     </setAttribute>\r
     <setAttribute key="selected_workspace_bundles">\r
+        <setEntry value="hu.user.theme.userdark@default:default"/>\r
         <setEntry value="user.commons.zk@default:default"/>\r
         <setEntry value="user.jobengine.log4j@1:true"/>\r
         <setEntry value="user.jobengine.osgi.commons@default:true"/>\r
index 46a32c903c80284bfa425d9c29f4148d24dd62e6..af41a7e8898998626615ba526fe01dd8d143b4f9 100644 (file)
@@ -86,7 +86,6 @@
        <plugin id="org.objectweb.asm.tree"/>\r
        <plugin id="org.objectweb.asm.commons"/>\r
        <plugin id="com.sun.jna.platform"/>\r
-       <plugin id="hu.user.zk.theme.userdark"/>\r
 </includeBundles>\r
 <environment>\r
        <os>win32</os>\r
index 40e0e60f71dd9951eb96d5d6a4de8df281dddcb6..6fd60f0996b59b0d22ac3e65a691b3616a6e6b8b 100644 (file)
@@ -66,6 +66,7 @@
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
+<!--                                   \r
                                        <execution>\r
                                                <id>install3</id>\r
                                                <phase>package</phase>\r
@@ -80,6 +81,7 @@
                                                        <packaging>jar</packaging>\r
                                                </configuration>\r
                                        </execution>\r
+-->                            \r
                                </executions>\r
                        </plugin>\r
                        <plugin>\r
                                                <id>default-cli</id>\r
                                                <configuration>\r
                                                        <artifacts>\r
-                                                               <artifact>\r
+<!--                                                           <artifact>\r
                                                                        <id>hu.user.zk.theme:userdark:1.0.0</id>\r
                                                                </artifact>\r
+-->                                                            \r
                                                                <artifact>\r
                                                                        <id>org.apache.felix:org.apache.felix.gogo.command:0.12.0</id>\r
                                                                </artifact>\r
index 82dc366c434552c526ee5ac5e5828fb31b4ea6cb..5ec0c60b03ab7008e1fe8666362eab9002447bb9 100644 (file)
@@ -18,6 +18,7 @@
                <module>../user.jobengine.log4j</module>\r
                <module>../user.commons.zk</module>\r
                <module>../user.tsm.client</module>\r
+               <module>../hu.user.theme.userdark</module>\r
                <module>../-product</module>\r
        </modules>\r
 \r
index c98528f51b6f9e82752cf738fe446455efb7b8a0..0dbfa50fcbe8d14c29c0d05715d1ba5f1a9c49f9 100644 (file)
@@ -38,7 +38,7 @@
       <plugin id="com.sun.jna"/>\r
       <plugin id="com.sun.jna.platform"/>\r
       <plugin id="groovy"/>\r
-      <plugin id="hu.user.zk.theme.userdark"/>\r
+      <plugin id="hu.user.theme.userdark"/>\r
       <plugin id="javax.annotation-api"/>\r
       <plugin id="javax.mail"/>\r
       <plugin id="javax.servlet-api"/>\r
index 9461a30c5fdf91964f781e0337e13e8a9d9e0d08..42a5e798d02815e4a8bf3edcfcaea01668634c6e 100644 (file)
@@ -4,7 +4,7 @@ datasource:
     user: db2admin\r
     password: password\r
     external-indexer: true\r
-    simple-search: true\r
+    simple-search: false\r
     login-timeout: 5\r
     pool-size: 10\r
   mediacube-nosql:\r
index 68a7c5491e405a9f96cb80ceee7a7963dcdc0d63..3861350f6b87179f1f66c841bc24cfdf3317e625 100644 (file)
@@ -1,6 +1,6 @@
-#theme: userdark\r
+theme: userdark\r
 jobQueuePollInterval: 1000\r
-searchResultsListCacheSize: 100\r
+searchResultsListCacheSize: 200\r
 disableHelp: true\r
 maestroDisabled: false\r
 alternateRetrieveSelector: true\r
index 18905611c5a2979f0307f0b33b26a64c2205a9a7..97386174747108fe16acb97727fb757ae2a5f823 100644 (file)
@@ -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"
index 19a80e3d87d2a8adc20e2f91224d3fe1e4ac655e..2c0c549273e819a55dacd6cbfb47c867db57f047 100644 (file)
@@ -6,13 +6,9 @@
        ::Remote::\r
        SET REMOTE_LOCATION=/tmp/mediaarch\r
 \r
-::  USER       \r
-::     SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 86:5b:9b:bc:df:7b:df:90:c6:bf:60:69:d2:c9:61:62\r
-::     SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.228.198.1\r
-       \r
-::  MV \r
-       SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 01:03:8c:04:b0:a2:7d:a4:90:c8:01:c8:d8:4e:44:0d\r
-       SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@10.11.1.90\r
+::LOCALVM HTV\r
+       SET REMOTE_SERVER_HOSTKEY=ssh-ed25519 256 ea:58:1c:d3:b8:d5:7a:92:4c:a3:a5:8d:e2:7b:07:fd\r
+       SET REMOTE_SERVER_ADDRESS=scp://db2admin:password@localvm\r
        \r
        CALL :deploy_source\r
        if %ERRORLEVEL% neq 0 exit /b %ERRORLEVEL%\r
index 5d29a10e6217addb4f1ab399473d80bb5528b97b..d21fb888ec40398e7758da458fa7bcf30078ddf9 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/BreakDAO_SJProfile0.ser differ
index dcb30d2d039d73e220419d798051521e5092feab..cca40b999d6a9d0cf6dea0b07546291cde53c891 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainCategoryDAO_SJProfile0.ser differ
index bd4f7326b2cdcb317d58160508b04018d63e92b6..6e2b3cf64236ebf4158898d5af30e699c0762a48 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainDAO_SJProfile0.ser differ
index b68051e275ea3200a11fd23484b2eb102c72b5f1..923cb88c6ba15c64a33a39cbf5b24ba9bc9a54f0 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/DomainIndexDAO_SJProfile0.ser differ
index 1829f5962128dc1d948bfd46b03daf2b1b5f69db..f52862755e0c96ebef93504b09b994be80ea8dbc 100644 (file)
-/*@lineinfo:filename=EntityBaseDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/\r
-package user.jobengine.db;\r
-\r
-import java.sql.ResultSet;\r
-import java.sql.SQLException;\r
-import java.util.List;\r
-\r
-import org.apache.logging.log4j.LogManager;\r
-import org.apache.logging.log4j.Logger;\r
-\r
-import sqlj.runtime.ref.DefaultContext;\r
-import sqlj.runtime.ref.ResultSetIterImpl;\r
-import user.commons.IEntityBase;\r
-\r
-/**\r
- * Az entitasok alap DAO osztalya.\r
- */\r
-@SuppressWarnings("unused")\r
-public abstract class EntityBaseDAO implements IEntityBaseDAO {\r
-       protected ItemManager manager;\r
-       protected static final Logger logger = LogManager.getLogger();\r
-\r
-       public EntityBaseDAO(ItemManager manager) {\r
-               this.manager = manager;\r
-       }\r
-\r
-       @SuppressWarnings("rawtypes")\r
-       protected void checkNull(Object obj, Class type) {\r
-               if (obj == null)\r
-                       throw new IllegalArgumentException(type.getName() + " can not be null.");\r
-       }\r
-\r
-       @Override\r
-       public void add(IEntityBase entity) {\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       add(context, entity);\r
-               } catch (Exception e) {\r
-\r
-                       // TODO reszletezes\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-       }\r
-\r
-       public void add(DefaultContext context, IEntityBase entity) {\r
-               manager.traceIn();\r
-               try {\r
-                       checkNull(entity, IEntityBase.class);\r
-                       beforeAdd(context, entity);\r
-                       long id = entity.getId();\r
-\r
-                       insert(context, entity);\r
-                       if (id == 0) {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:52^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { SELECT IDENTITY_VAL_LOCAL()  INTO :id,  FROM SYSIBM.SYSDUMMY1  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.profile.RTResultSet __sJT_rtRs;\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 0);\r
-                                               try {\r
-                                                       __sJT_rtRs = __sJT_execCtx.executeQuery();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                                       try {\r
-                                               sqlj.runtime.ref.ResultSetIterImpl.checkColumns(__sJT_rtRs, 1);\r
-                                               if (!__sJT_rtRs.next()) {\r
-                                                       sqlj.runtime.error.RuntimeRefErrors.raise_NO_ROW_SELECT_INTO();\r
-                                               }\r
-                                               id = __sJT_rtRs.getLongNoNull(1);\r
-                                               if (__sJT_rtRs.next()) {\r
-                                                       sqlj.runtime.error.RuntimeRefErrors.raise_MULTI_ROW_SELECT_INTO();\r
-                                               }\r
-                                       } finally {\r
-                                               __sJT_rtRs.close();\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:52^80 */\r
-                               entity.setId(id);\r
-                       }\r
-                       afterAdd(context, entity);\r
-                       /* @lineinfo:generated-code *//* @lineinfo:56^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 1);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:56^27 */\r
-                       if (useMemoryCache())\r
-                               manager.storeCached(entity.getId(), entity);\r
-\r
-               } catch (Exception e) {\r
-                       try {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:62^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { ROLLBACK  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 2);\r
-                                               try {\r
-                                                       __sJT_execCtx.executeUpdate();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:62^30 */\r
-                       } catch (Exception e1) {\r
-                       }\r
-                       manager.throwError(e);\r
-               }\r
-               manager.traceOut();\r
-       }\r
-\r
-       @Override\r
-       public IEntityBase get(long id) {\r
-               IEntityBase entity = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       entity = get(context, id);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return entity;\r
-       }\r
-\r
-       public IEntityBase get(DefaultContext context, long id) {\r
-               manager.traceIn();\r
-               IEntityBase entity = null;\r
-               try {\r
-                       if (id == 0)\r
-                               throw new IllegalArgumentException("Cannot get EntityBase with 0 ID.");\r
-                       if (useMemoryCache())\r
-                               entity = manager.retrieveCached(getCacheType(), id);\r
-                       if (entity == null) {\r
-                               ResultSetIterImpl iter = selectByKey(context, id);\r
-                               checkNull(iter, ResultSetIterImpl.class);\r
-                               entity = getEntity(context, iter);\r
-                               if (useMemoryCache())\r
-                                       manager.storeCached(id, entity);\r
-                       }\r
-                       afterGet(context, entity);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return entity;\r
-       }\r
-\r
-       @Override\r
-       public List<IEntityBase> getAll() {\r
-               List<IEntityBase> result = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       result = getAll(context);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return result;\r
-       }\r
-\r
-       @Override\r
-       public List<IEntityBase> getAll(IDAOIterProvider provider) {\r
-               List<IEntityBase> result = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       result = getAll(context, provider);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return result;\r
-       }\r
-\r
-       @Override\r
-       public IEntityBase get(IDAOIterProvider provider) {\r
-               IEntityBase entity = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       entity = get(context, provider);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return entity;\r
-       }\r
-\r
-       private IEntityBase get(DefaultContext context, IDAOIterProvider provider) {\r
-               manager.traceIn();\r
-               IEntityBase entity = null;\r
-               try {\r
-                       ResultSetIterImpl iter = provider.get(context, this);\r
-                       checkNull(iter, ResultSetIterImpl.class);\r
-                       entity = getEntity(context, iter);\r
-                       afterGet(context, entity);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return entity;\r
-       }\r
-\r
-       public List<IEntityBase> getAll(DefaultContext context, IDAOIterProvider provider) {\r
-               manager.traceIn();\r
-               List<IEntityBase> result = null;\r
-               try {\r
-                       ResultSetIterImpl iter = provider.get(context, this);\r
-                       checkNull(iter, ResultSetIterImpl.class);\r
-                       result = getList(context, iter, false, true);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return result;\r
-       }\r
-\r
-       public List<IEntityBase> getAll(DefaultContext context) {\r
-               manager.traceIn();\r
-               List<IEntityBase> result = null;\r
-               try {\r
-                       ResultSetIterImpl iter = selectAll(context);\r
-                       checkNull(iter, ResultSetIterImpl.class);\r
-                       result = getList(context, iter, false, true);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return result;\r
-       }\r
-\r
-       @Override\r
-       public List<IEntityBase> getAll(long id) {\r
-               List<IEntityBase> result = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       result = getAll(context, id);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return result;\r
-       }\r
-\r
-       public List<IEntityBase> getAll(DefaultContext context, long id) {\r
-               manager.traceIn();\r
-               List<IEntityBase> result = null;\r
-               try {\r
-                       ResultSetIterImpl iter = selectByForeignKey(context, id);\r
-                       checkNull(iter, ResultSetIterImpl.class);\r
-                       result = getList(context, iter, false, true);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return result;\r
-       }\r
-\r
-       protected IEntityBase getEntity(DefaultContext context, ResultSetIterImpl iter) {\r
-               manager.traceIn();\r
-               IEntityBase entity = null;\r
-               try {\r
-                       List<IEntityBase> result = getList(context, iter, false, false);\r
-                       if (result != null) {\r
-                               if (result.size() != 1)\r
-                                       throw new IllegalStateException("Expected one, found " + result.size() + ".");\r
-                               entity = result.get(0);\r
-                       }\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               }\r
-               manager.traceOut();\r
-               return entity;\r
-       }\r
-\r
-//     protected List<IEntityBase> getList(ResultSetIterImpl iter) {\r
-//             List<IEntityBase> result = null;\r
-//             DefaultContext context = manager.getDbContext();\r
-//             try {\r
-//                     result = getList(context, iter);\r
-//             } catch (Exception e) {\r
-//                     throw new ItemManagerException(e);\r
-//             } finally {\r
-//                     manager.putDbContext(context);\r
-//             }\r
-//             return result;\r
-//     }\r
-\r
-       protected List<IEntityBase> getList(ResultSetIterImpl iter, boolean isChunked) {\r
-               List<IEntityBase> result = null;\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       result = getList(context, iter, isChunked, true);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               return result;\r
-       }\r
-\r
-       protected List<IEntityBase> getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) {\r
-               return getList(context, iter, isChunked, true);\r
-       }\r
-\r
-       protected List<IEntityBase> getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked, boolean enablecache) {\r
-               manager.traceIn();\r
-               List<IEntityBase> result = null;\r
-               try {\r
-                       if (useMemoryCache() && enablecache)\r
-                               result = manager.getAllCached(getCacheType());\r
-\r
-                       if (result == null) {\r
-                               result = entities(context, iter, isChunked);\r
-                               if (useMemoryCache() && enablecache)\r
-                                       manager.setAllCached(getCacheType(), result);\r
-                       }\r
-\r
-                       /* @lineinfo:generated-code *//* @lineinfo:280^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 3);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:280^27 */\r
-               } catch (Exception e) {\r
-                       try {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:283^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { ROLLBACK  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 4);\r
-                                               try {\r
-                                                       __sJT_execCtx.executeUpdate();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:283^30 */\r
-                       } catch (Exception e1) {\r
-                       }\r
-                       manager.throwError(e);\r
-               }\r
-               manager.traceOut();\r
-               return result;\r
-       }\r
-\r
-       @Override\r
-       public void modify(IEntityBase entity) {\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       modify(context, entity);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public void merge(IEntityBase entity) {\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       if (entity.getId() == 0)\r
-                               add(entity);\r
-                       else\r
-                               modify(context, entity);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-       }\r
-\r
-       public void modify(DefaultContext context, IEntityBase entity) {\r
-               manager.traceIn();\r
-               try {\r
-                       checkNull(entity, IEntityBase.class);\r
-                       long id = entity.getId();\r
-                       entity.checkParameter("ID", id, false);\r
-                       update(context, entity);\r
-                       afterModify(context, entity);\r
-                       /* @lineinfo:generated-code *//* @lineinfo:327^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 5);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:327^27 */\r
-                       if (useMemoryCache())\r
-                               manager.storeCached(entity.getId(), entity);\r
-               } catch (Exception e) {\r
-                       try {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:332^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { ROLLBACK  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 6);\r
-                                               try {\r
-                                                       __sJT_execCtx.executeUpdate();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:332^30 */\r
-                       } catch (Exception e1) {\r
-                       }\r
-                       manager.throwError(e);\r
-               }\r
-               manager.traceOut();\r
-       }\r
-\r
-       @Override\r
-       public void remove(IEntityBase entity) {\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       remove(context, entity);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-       }\r
-\r
-       public void remove(DefaultContext context, IEntityBase entity) {\r
-               manager.traceIn();\r
-               try {\r
-                       checkNull(entity, IEntityBase.class);\r
-                       long id = entity.getId();\r
-                       entity.checkParameter("ID", id, false);\r
-                       beforeDelete(context, entity);\r
-                       delete(context, id);\r
-                       afterDelete(context, entity);\r
-                       /* @lineinfo:generated-code *//* @lineinfo:361^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 7);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:361^27 */\r
-                       if (useMemoryCache())\r
-                               manager.removeCached(getCacheType(), entity.getId());\r
-               } catch (Exception e) {\r
-                       try {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:366^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { ROLLBACK  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 8);\r
-                                               try {\r
-                                                       __sJT_execCtx.executeUpdate();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:366^30 */\r
-                       } catch (Exception e1) {\r
-                       }\r
-                       manager.throwError(e);\r
-               }\r
-               manager.traceOut();\r
-       }\r
-\r
-       @Override\r
-       public void remove(List<Long> ids) {\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       remove(context, ids);\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-       }\r
-\r
-       protected void remove(DefaultContext context, List<Long> ids) {\r
-               manager.traceIn();\r
-               try {\r
-                       for (long id : ids)\r
-                               delete(context, id);\r
-                       /* @lineinfo:generated-code *//* @lineinfo:390^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 9);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:390^27 */\r
-                       if (useMemoryCache()) {\r
-                               for (long id : ids)\r
-                                       manager.removeCached(getCacheType(), id);\r
-                       }\r
-               } catch (Exception e) {\r
-                       try {\r
-                               /* @lineinfo:generated-code */\r
-                               /* @lineinfo:397^4 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { ROLLBACK  };\r
-//  ************************************************************\r
-\r
-                               {\r
-                                       sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                                       if (__sJT_connCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                                       sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                                       if (__sJT_execCtx == null)\r
-                                               sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                                       synchronized (__sJT_execCtx) {\r
-                                               sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 10);\r
-                                               try {\r
-                                                       __sJT_execCtx.executeUpdate();\r
-                                               } finally {\r
-                                                       __sJT_execCtx.releaseStatement();\r
-                                               }\r
-                                       }\r
-                               }\r
-\r
-//  ************************************************************\r
-\r
-                               /* @lineinfo:user-code *//* @lineinfo:397^30 */\r
-                       } catch (Exception e1) {\r
-                       }\r
-                       manager.throwError(e);\r
-               }\r
-               manager.traceOut();\r
-       }\r
-\r
-       @Override\r
-       public void truncate() {\r
-               manager.traceIn();\r
-               DefaultContext context = manager.getDbContext();\r
-               try {\r
-                       truncateTable(context);\r
-                       /* @lineinfo:generated-code *//* @lineinfo:411^3 */\r
-\r
-//  ************************************************************\r
-//  #sql [context] { COMMIT  };\r
-//  ************************************************************\r
-\r
-                       {\r
-                               sqlj.runtime.ConnectionContext __sJT_connCtx = context;\r
-                               if (__sJT_connCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_DEFAULT_CONN_CTX();\r
-                               sqlj.runtime.ExecutionContext __sJT_execCtx = __sJT_connCtx.getExecutionContext();\r
-                               if (__sJT_execCtx == null)\r
-                                       sqlj.runtime.error.RuntimeRefErrors.raise_NULL_EXEC_CTX();\r
-                               synchronized (__sJT_execCtx) {\r
-                                       sqlj.runtime.profile.RTStatement __sJT_stmt = __sJT_execCtx.registerStatement(__sJT_connCtx, EntityBaseDAO_SJProfileKeys.getKey(0), 11);\r
-                                       try {\r
-                                               __sJT_execCtx.executeUpdate();\r
-                                       } finally {\r
-                                               __sJT_execCtx.releaseStatement();\r
-                                       }\r
-                               }\r
-                       }\r
-\r
-//  ************************************************************\r
-\r
-                       /* @lineinfo:user-code *//* @lineinfo:411^27 */\r
-               } catch (Exception e) {\r
-                       throw new ItemManagerException(e);\r
-               } finally {\r
-                       manager.putDbContext(context);\r
-               }\r
-               manager.traceOut();\r
-       }\r
-\r
-       protected void afterGet(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void beforeAdd(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void afterAdd(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void afterModify(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void beforeDelete(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void afterDelete(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {\r
-               return null;\r
-       }\r
-\r
-       public List<IEntityBase> entities(DefaultContext context, ResultSet rs) throws SQLException {\r
-               return null;\r
-       }\r
-\r
-       protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException {\r
-               return null;\r
-       }\r
-\r
-       protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException {\r
-               return null;\r
-       }\r
-\r
-       protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException {\r
-               return null;\r
-       }\r
-\r
-       protected void delete(DefaultContext context, long id) throws SQLException {\r
-       }\r
-\r
-       protected void truncateTable(DefaultContext context) throws SQLException {\r
-       }\r
-\r
-       protected void insert(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected void update(DefaultContext context, IEntityBase entity) throws SQLException {\r
-       }\r
-\r
-       protected boolean useMemoryCache() {\r
-               return false;\r
-       }\r
-\r
-       protected Class<? extends IEntityBase> getCacheType() {\r
-               return null;\r
-       }\r
-}\r
-\r
-/* @lineinfo:generated-code */class EntityBaseDAO_SJProfileKeys {\r
-       private java.lang.Object[] keys;\r
-       private final sqlj.runtime.profile.Loader loader = sqlj.runtime.RuntimeContext.getRuntime().getLoaderForClass(getClass());\r
-       private static EntityBaseDAO_SJProfileKeys inst = null;\r
-\r
-       public static java.lang.Object getKey(int keyNum) throws java.sql.SQLException {\r
-               synchronized (user.jobengine.db.EntityBaseDAO_SJProfileKeys.class) {\r
-                       if (inst == null) {\r
-                               inst = new EntityBaseDAO_SJProfileKeys();\r
-                       }\r
-               }\r
-               return inst.keys[keyNum];\r
-       }\r
-\r
-       private EntityBaseDAO_SJProfileKeys() throws java.sql.SQLException {\r
-               keys = new java.lang.Object[1];\r
-               keys[0] = DefaultContext.getProfileKey(loader, "user.jobengine.db.EntityBaseDAO_SJProfile0");\r
-       }\r
-}\r
+/*@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<IEntityBase> getAll() {
+               List<IEntityBase> 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<IEntityBase> getAll(IDAOIterProvider provider) {
+               List<IEntityBase> 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<IEntityBase> getAll(DefaultContext context, IDAOIterProvider provider) {
+               manager.traceIn();
+               List<IEntityBase> 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<IEntityBase> getAll(DefaultContext context) {
+               manager.traceIn();
+               List<IEntityBase> 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<IEntityBase> getAll(long id) {
+               List<IEntityBase> 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<IEntityBase> getAll(DefaultContext context, long id) {
+               manager.traceIn();
+               List<IEntityBase> 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<IEntityBase> 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<IEntityBase> getList(ResultSetIterImpl iter) {
+//             List<IEntityBase> 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<IEntityBase> getList(ResultSetIterImpl iter, boolean isChunked) {
+               List<IEntityBase> 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<IEntityBase> getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) {
+               return getList(context, iter, isChunked, true);
+       }
+       
+       protected List<IEntityBase> getList(DefaultContext context, ResultSetIterImpl iter, boolean isChunked, boolean enablecache) {
+               manager.traceIn();
+               List<IEntityBase> 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<Long> 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<Long> 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<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
+               return null;    
+       }
+
+       public List<IEntityBase> 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<? extends IEntityBase> 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");
+  }
+}
index aa68a34b92d4ec4ab2fb8bc7279811a813f347af..de2b0008d90a49bad0a05e67849517b0d9409b6b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/EntityBaseDAO_SJProfile0.ser differ
index c85818110da7cc951cbe68e07681246a82fa2a1d..fa13d0812a71a85cb5f37e2760a19cf6a44b04be 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FileTypeDAO_SJProfile0.ser differ
index 298ec28f0019651014becffb60d4e370d8444714..500e75281ea2bf3c95be2f83af6264da3a0eee55 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/FolderDAO_SJProfile0.ser differ
index a75535f6347508d506485732ea25cd0928c22122..ee0954fa2c9cb515172d6f84b938dbc4a8436fe4 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/HelperDAO_SJProfile0.ser differ
index 55fff32ccfff85fc706be960799fb4b2927fc65b..6118bbd029ea39204f088dfeda2a57be8c514e31 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemDAO_SJProfile0.ser differ
index 3d6ed2ba4ad6a7926e753ed6e1f284a13294f39d..846f31dc5dac8404f91a472833514a9f6aaa4d45 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ItemTypeDAO_SJProfile0.ser differ
index c775e77503ce4a44f9a7aff605b530781b444be5..79a90f67c64df4aaeb108593f472b30360285748 100644 (file)
@@ -1,30 +1,31 @@
-/*@lineinfo:filename=JobDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/
-package user.jobengine.db;
+/*@lineinfo:filename=JobDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-
-import sqlj.runtime.ref.DefaultContext;
-import sqlj.runtime.ref.ResultSetIterImpl;
 import user.commons.IEntityBase;
+import sqlj.runtime.ref.*;
 import user.commons.Job;
 import user.commons.JobStatus;
+import java.sql.Timestamp;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.util.List;
+import java.util.ArrayList;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectOutputStream;
+
 
 @SuppressWarnings("unused")
 class JobDAO extends EntityBaseDAO {
        private ItemManager manager;
-
+               
        public JobDAO(ItemManager manager) {
                super(manager);
                this.manager = manager;
        }
 
        @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked)
-                       throws SQLException {
+       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
                List<IEntityBase> 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<IEntityBase>();
+                               result = new ArrayList<IEntityBase>();                          
                        result.add(entity);
-               }
+               }       
                iterator.close();
                return result;
        }
-
+       
        @Override
        public List<IEntityBase> 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<IEntityBase> getAllIncomplete(String template) {
                manager.traceIn();
                List<IEntityBase> 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");
+  }
 }
index a3d4184441f2ab34a1fb135b48d87316495b0bed..9f1469135219269398b97199e84882a06851ba68 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobDAO_SJProfile0.ser differ
index d0c480503211bc31c16918a277d5249cf335899d..c651dd94632d86c946328d260429e75441d99f67 100644 (file)
@@ -1,13 +1,16 @@
-/*@lineinfo:filename=JobParametersDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/
-package user.jobengine.db;
+/*@lineinfo:filename=JobParametersDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
 
+import user.commons.IEntityBase;
+import sqlj.runtime.ref.*;
+import user.commons.Job;
+import user.commons.JobStatus;
+import java.sql.Timestamp;
+import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
+import java.sql.Statement;
+import java.sql.ResultSet;
 import java.util.List;
-
-import sqlj.runtime.ref.DefaultContext;
-import sqlj.runtime.ref.ResultSetIterImpl;
-import user.commons.IEntityBase;
+import java.util.ArrayList;
 
 /*@lineinfo:generated-code*//*@lineinfo:15^2*/
 
@@ -15,46 +18,52 @@ import user.commons.IEntityBase;
 //  SQLJ iterator declaration:
 //  ************************************************************
 
-class JobParametersIter extends sqlj.runtime.ref.ResultSetIterImpl implements sqlj.runtime.NamedIterator {
-       private int dataNdx;
-       private int idNdx;
-
-       public JobParametersIter(sqlj.runtime.profile.RTResultSet resultSet) throws java.sql.SQLException {
-               super(resultSet);
-               idNdx = findColumn("id");
-               dataNdx = findColumn("data");
-       }
-
-       public JobParametersIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows)
-                       throws java.sql.SQLException {
-               super(resultSet, fetchSize, maxRows);
-               idNdx = findColumn("id");
-               dataNdx = findColumn("data");
-       }
-
-       public long id() throws java.sql.SQLException {
-               return resultSet.getLongNoNull(idNdx);
-       }
-
-       public byte[] data() throws java.sql.SQLException {
-               return resultSet.getBytes(dataNdx);
-       }
+class JobParametersIter 
+extends sqlj.runtime.ref.ResultSetIterImpl
+implements sqlj.runtime.NamedIterator
+{
+  private int dataNdx;
+  private int idNdx;
+  public JobParametersIter(sqlj.runtime.profile.RTResultSet resultSet) 
+    throws java.sql.SQLException 
+  {
+    super(resultSet);
+    idNdx = findColumn("id");
+    dataNdx = findColumn("data");
+  }
+  public JobParametersIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
+    throws java.sql.SQLException 
+  {
+    super(resultSet, fetchSize, maxRows);
+    idNdx = findColumn("id");
+    dataNdx = findColumn("data");
+  }
+  public long id() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getLongNoNull(idNdx);
+  }
+  public byte[] data() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getBytes(dataNdx);
+  }
 }
 
+
 //  ************************************************************
 
-/* @lineinfo:user-code *//* @lineinfo:15^52 */
+/*@lineinfo:user-code*//*@lineinfo:15^52*/
 
 @SuppressWarnings("unused")
 class JobParametersDAO extends EntityBaseDAO {
-
+               
        public JobParametersDAO(ItemManager manager) {
                super(manager);
        }
 
        @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked)
-                       throws SQLException {
+       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
                List<IEntityBase> 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<IEntityBase>();
+                               result = new ArrayList<IEntityBase>();                          
                        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");
+  }
 }
index 75b1a4df1ac0e639fed510acaac172fe8c1d82b6..27214e3ee99095b9c574df5da0a976ab1089ee95 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/JobParametersDAO_SJProfile0.ser differ
index ff5c2d58dc97eb78caee030aca25714eafb35d30..38032664216ca11b6384b61482f3c56b380c51cb 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MasterIdDAO_SJProfile0.ser differ
index 60f415b34a356de88fdd32fabe9760b66c3c34bd..6ab99cc47d1f4d30183500968f733b1fc5e2d12f 100644 (file)
@@ -17,6 +17,7 @@ class MediaIter
 extends sqlj.runtime.ref.ResultSetIterImpl
 implements sqlj.runtime.NamedIterator
 {
+  private int fileCountNdx;
   private int creationNdx;
   private int posterNdx;
   private int modifiedNdx;
@@ -45,6 +46,7 @@ implements sqlj.runtime.NamedIterator
     modifiedNdx = findColumn("modified");
     posterNdx = findColumn("poster");
     creationNdx = findColumn("creation");
+    fileCountNdx = findColumn("fileCount");
   }
   public MediaIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
     throws java.sql.SQLException 
@@ -62,6 +64,7 @@ implements sqlj.runtime.NamedIterator
     modifiedNdx = findColumn("modified");
     posterNdx = findColumn("poster");
     creationNdx = findColumn("creation");
+    fileCountNdx = findColumn("fileCount");
   }
   public long id() 
     throws java.sql.SQLException 
@@ -123,12 +126,17 @@ implements sqlj.runtime.NamedIterator
   {
     return resultSet.getTimestamp(creationNdx);
   }
+  public int fileCount() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getIntNoNull(fileCountNdx);
+  }
 }
 
 
 //  ************************************************************
 
-/*@lineinfo:user-code*//*@lineinfo:10^218*/
+/*@lineinfo:user-code*//*@lineinfo:10^233*/
 
 @SuppressWarnings("unused")
 class MediaDAO extends EntityBaseDAO {
@@ -186,6 +194,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<IEntityBase>();                          
@@ -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();
index 7cf17e5150b872faffbd9a6983aebc4c63ff3499..f9a233381afbb470ee4d4adb2a193a7603844b47 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaDAO_SJProfile0.ser differ
index 05218e6037c1dcd3e083e5876b0e4db6c5963c77..89a865010f7e9706e23a4d3f0988148592b28ba1 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MediaFileDAO_SJProfile0.ser differ
index 3dc91a0878cdb7d80df1c1059b7cbb5e6b957461..200f2221ad85d40b24a90055c1ca8e16a0470e11 100644 (file)
@@ -635,7 +635,7 @@ class MetadataDAO extends EntityBaseDAO {
        }
        
        /**
-        * Besz\ufffdrja az ItemType objektumhoz kapcsol\ufffdd\ufffd Metadata adatokat. 
+        * Besz\ufffd\ufffdrja az ItemType objektumhoz kapcsol\ufffd\ufffdd\ufffd\ufffd Metadata adatokat. 
         */
        void addAll(DefaultContext context, ItemType itemType) throws SQLException {
                List<Metadata> 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();
index fbde73470e618aac335623b8961833fa852cf621..f9359c445e93f002fa4eecb8fc525d3232a01878 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataDAO_SJProfile0.ser differ
index 30f555c292c2cc2a15b8bdbdf5f596fa64aa212d..8e1b38491f8b3fe6d4611650a9b519d86a8cbaad 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataElementDAO_SJProfile0.ser differ
index 77db96cc632df74cdae4178a51dbbdd6074a4390..6489ee7f7653d7dc2e949e7530f0907d7454273f 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/MetadataTypeDAO_SJProfile0.ser differ
index f95851324e8e9433a2dae9de9be5258e358891b8..67f9262a4c885b91938a80991fb9b9c586398b2a 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/RemoteStoreDAO_SJProfile0.ser differ
index fece95b9692c17e56b0c359f5c1540d33a8b5590..d83fe252d0949fee7fcac0a22a9ab0a137c02310 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneContentDAO_SJProfile0.ser differ
index 7c4d89fff8ba387366e9e616a09360025d5444ab..66d96f471f1408041b24310f0a555775f0735f1b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SceneDAO_SJProfile0.ser differ
index dfb821026f0efd714e63f5105c8299169528aa6d..79020c66f1bf901979ff684519c433b8606f24f7 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/SearchDefinitionDAO_SJProfile0.ser differ
index 9d79a600ae399bcbc0fdb2571412bd6484e80301..75db3eebf590dd0a85f1843a3aef5b82ca4b1f1e 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/ShotDAO_SJProfile0.ser differ
index 0fbd9bae048e5b50ee590604225efe37bc64722a..b590640bd3fb819b7fcc7de684d5b1e14cc2dd24 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreDAO_SJProfile0.ser differ
index ad11cd78c5ee0eaee7d735a3bbc4512f1e0980f0..d6be36db484e03ae14f2012482d2c0b3ddabbae7 100644 (file)
@@ -1,14 +1,13 @@
-/*@lineinfo:filename=StoreUriDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/
-package user.jobengine.db;
+/*@lineinfo:filename=StoreUriDAO*//*@lineinfo:user-code*//*@lineinfo:1^1*/package user.jobengine.db;
 
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import sqlj.runtime.ref.DefaultContext;
-import sqlj.runtime.ref.ResultSetIterImpl;
 import user.commons.IEntityBase;
+import sqlj.runtime.ref.*;
 import user.commons.StoreUri;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.ArrayList;
+import user.commons.remotestore.RemoteStoreProtocol;
+import user.commons.remotestore.DeliveryMethod;
 
 /*@lineinfo:generated-code*//*@lineinfo:12^2*/
 
@@ -16,117 +15,133 @@ import user.commons.StoreUri;
 //  SQLJ iterator declaration:
 //  ************************************************************
 
-class StoreUriIter extends sqlj.runtime.ref.ResultSetIterImpl implements sqlj.runtime.NamedIterator {
-       private int protocolNdx;
-       private int deliveryNdx;
-       private int portNumberNdx;
-       private int rootPathNdx;
-       private int passwordNdx;
-       private int userNameNdx;
-       private int isTargetNdx;
-       private int isSourceNdx;
-       private int isStreamNdx;
-       private int uriNdx;
-       private int storeIdNdx;
-       private int idNdx;
-
-       public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet) throws java.sql.SQLException {
-               super(resultSet);
-               idNdx = findColumn("id");
-               storeIdNdx = findColumn("storeId");
-               uriNdx = findColumn("uri");
-               isStreamNdx = findColumn("isStream");
-               isSourceNdx = findColumn("isSource");
-               isTargetNdx = findColumn("isTarget");
-               userNameNdx = findColumn("userName");
-               passwordNdx = findColumn("password");
-               rootPathNdx = findColumn("rootPath");
-               portNumberNdx = findColumn("portNumber");
-               deliveryNdx = findColumn("delivery");
-               protocolNdx = findColumn("protocol");
-       }
-
-       public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows)
-                       throws java.sql.SQLException {
-               super(resultSet, fetchSize, maxRows);
-               idNdx = findColumn("id");
-               storeIdNdx = findColumn("storeId");
-               uriNdx = findColumn("uri");
-               isStreamNdx = findColumn("isStream");
-               isSourceNdx = findColumn("isSource");
-               isTargetNdx = findColumn("isTarget");
-               userNameNdx = findColumn("userName");
-               passwordNdx = findColumn("password");
-               rootPathNdx = findColumn("rootPath");
-               portNumberNdx = findColumn("portNumber");
-               deliveryNdx = findColumn("delivery");
-               protocolNdx = findColumn("protocol");
-       }
-
-       public long id() throws java.sql.SQLException {
-               return resultSet.getLongNoNull(idNdx);
-       }
-
-       public long storeId() throws java.sql.SQLException {
-               return resultSet.getLongNoNull(storeIdNdx);
-       }
-
-       public String uri() throws java.sql.SQLException {
-               return resultSet.getString(uriNdx);
-       }
-
-       public String isStream() throws java.sql.SQLException {
-               return resultSet.getString(isStreamNdx);
-       }
-
-       public String isSource() throws java.sql.SQLException {
-               return resultSet.getString(isSourceNdx);
-       }
-
-       public String isTarget() throws java.sql.SQLException {
-               return resultSet.getString(isTargetNdx);
-       }
-
-       public String userName() throws java.sql.SQLException {
-               return resultSet.getString(userNameNdx);
-       }
-
-       public String password() throws java.sql.SQLException {
-               return resultSet.getString(passwordNdx);
-       }
-
-       public String rootPath() throws java.sql.SQLException {
-               return resultSet.getString(rootPathNdx);
-       }
-
-       public Integer portNumber() throws java.sql.SQLException {
-               return resultSet.getIntWrapper(portNumberNdx);
-       }
-
-       public String delivery() throws java.sql.SQLException {
-               return resultSet.getString(deliveryNdx);
-       }
-
-       public String protocol() throws java.sql.SQLException {
-               return resultSet.getString(protocolNdx);
-       }
+class StoreUriIter 
+extends sqlj.runtime.ref.ResultSetIterImpl
+implements sqlj.runtime.NamedIterator
+{
+  private int protocolNdx;
+  private int deliveryNdx;
+  private int portNumberNdx;
+  private int rootPathNdx;
+  private int passwordNdx;
+  private int userNameNdx;
+  private int isTargetNdx;
+  private int isSourceNdx;
+  private int isStreamNdx;
+  private int uriNdx;
+  private int storeIdNdx;
+  private int idNdx;
+  public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet) 
+    throws java.sql.SQLException 
+  {
+    super(resultSet);
+    idNdx = findColumn("id");
+    storeIdNdx = findColumn("storeId");
+    uriNdx = findColumn("uri");
+    isStreamNdx = findColumn("isStream");
+    isSourceNdx = findColumn("isSource");
+    isTargetNdx = findColumn("isTarget");
+    userNameNdx = findColumn("userName");
+    passwordNdx = findColumn("password");
+    rootPathNdx = findColumn("rootPath");
+    portNumberNdx = findColumn("portNumber");
+    deliveryNdx = findColumn("delivery");
+    protocolNdx = findColumn("protocol");
+  }
+  public StoreUriIter(sqlj.runtime.profile.RTResultSet resultSet, int fetchSize, int maxRows) 
+    throws java.sql.SQLException 
+  {
+    super(resultSet, fetchSize, maxRows);
+    idNdx = findColumn("id");
+    storeIdNdx = findColumn("storeId");
+    uriNdx = findColumn("uri");
+    isStreamNdx = findColumn("isStream");
+    isSourceNdx = findColumn("isSource");
+    isTargetNdx = findColumn("isTarget");
+    userNameNdx = findColumn("userName");
+    passwordNdx = findColumn("password");
+    rootPathNdx = findColumn("rootPath");
+    portNumberNdx = findColumn("portNumber");
+    deliveryNdx = findColumn("delivery");
+    protocolNdx = findColumn("protocol");
+  }
+  public long id() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getLongNoNull(idNdx);
+  }
+  public long storeId() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getLongNoNull(storeIdNdx);
+  }
+  public String uri() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(uriNdx);
+  }
+  public String isStream() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(isStreamNdx);
+  }
+  public String isSource() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(isSourceNdx);
+  }
+  public String isTarget() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(isTargetNdx);
+  }
+  public String userName() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(userNameNdx);
+  }
+  public String password() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(passwordNdx);
+  }
+  public String rootPath() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(rootPathNdx);
+  }
+  public Integer portNumber() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getIntWrapper(portNumberNdx);
+  }
+  public String delivery() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(deliveryNdx);
+  }
+  public String protocol() 
+    throws java.sql.SQLException 
+  {
+    return resultSet.getString(protocolNdx);
+  }
 }
 
+
 //  ************************************************************
 
-/* @lineinfo:user-code *//* @lineinfo:12^216 */
+/*@lineinfo:user-code*//*@lineinfo:12^216*/
 
 @SuppressWarnings("unused")
 
 class StoreUriDAO extends EntityBaseDAO {
-
+       
        public StoreUriDAO(ItemManager manager) {
                super(manager);
        }
-
+       
        @Override
-       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked)
-                       throws SQLException {
+       protected List<IEntityBase> entities(DefaultContext context, ResultSetIterImpl iter, boolean isChunked) throws SQLException {
                List<IEntityBase> 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<IEntityBase>();
+                               result = new ArrayList<IEntityBase>();                          
                        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");
+  }
 }
index 3e33e1b9c4efdbc2c1de52cf048828baf4996b7a..89ce9145c525a60c054c9c0a5b32ca7e9167bce7 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/StoreUriDAO_SJProfile0.ser differ
index f21929d1d6e0dfcf53c0a0f56e0e5d207eb71a28..c1113d8dc660f0b61b4779e5a49bebbf525a899b 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/UserInfoDAO_SJProfile0.ser differ
index 751acc2087c70fa75aa06e8c7e37c5d49513c380..cbb4e30c34f55d4de49728ff32464d5304bff900 100644 (file)
Binary files a/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser and b/server/user.jobengine.osgi.db/generated/user/jobengine/db/WorkflowActionDAO_SJProfile0.ser differ
index 287b933c2b3703367d976d557d617298de6ccd48..140789b7602eec59aca022f2df4f1dd31f287016 100644 (file)
@@ -206,7 +206,7 @@ public interface IItemManager extends IEntityPersister {
 \r
        Item getItem(long id);\r
 \r
-       Item getItemByHouseID(String houseID, String title);\r
+//     Item getItemByHouseID(String houseID, String title);\r
 \r
        ItemType getItemType(String itemTypeName);\r
 \r
@@ -448,7 +448,5 @@ public interface IItemManager extends IEntityPersister {
         */\r
        void truncate(Class<? extends IEntityBase> classInfo);\r
 \r
-       BasicDBObject simpleSearch(BasicDBObject searchParameters);\r
-\r
        SearchResult<ArchivedMedia> search(SearchOptions options, IExecutionDurationNotification cb);\r
 }
\ No newline at end of file
index e7430ba3d3576f64b6fa4bb21fa12017c5256133..fa0cbb4f298852831e313d2e98bf4c1f355cfca9 100644 (file)
@@ -10,7 +10,6 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;\r
 import java.time.Instant;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 import java.util.Hashtable;\r
@@ -41,8 +40,6 @@ import user.commons.remotestore.RemoteStoreProtocol;
 import user.commons.server.tcp.SignalServer;\r
 import user.jobengine.changehandler.IChangeHandler;\r
 import user.jobengine.changehandler.ItemTypeChangeHandlerFactory;\r
-import user.jobengine.db.ItemManagerData.FilterLogic;\r
-import user.jobengine.db.ItemManagerData.FilterValueLogic;\r
 import user.jobengine.db.ItemManagerData.GuiType;\r
 import user.jobengine.db.ItemManagerData.ListType;\r
 import user.jobengine.db.ItemManagerData.MdType;\r
@@ -182,7 +179,7 @@ public class ItemManager extends MemoryCache implements IItemManager {
 \r
        private IMediaFinder createFinder() {\r
                IMediaFinder finder = null;\r
-               boolean externalIndexer = systemConfig.value("datasource.mediacube.external-indexer", false);\r
+//             boolean externalIndexer = systemConfig.value("datasource.mediacube.external-indexer", false);\r
 //             if (externalIndexer) {\r
 //                     finder = new LuceneMediaFinder(this);\r
 //             } else {\r
@@ -847,34 +844,34 @@ public class ItemManager extends MemoryCache implements IItemManager {
                return (Item) get(Item.class, id);\r
        }\r
 \r
-       @Override\r
-       public Item getItemByHouseID(String houseID, String title) {\r
-               traceIn();\r
-               Item result = null;\r
-               SearchFilter filter = new SearchFilter();\r
-               filter.setMetadata(getStaticItemType().getMetadata("Anyag house ID"));\r
-               filter.setValueLogic(FilterValueLogic.EQUALS);\r
-               filter.setValues(Arrays.asList((Object) houseID));\r
-\r
-               SearchFilter filter1 = new SearchFilter();\r
-               filter1.setLogic(FilterLogic.AND);\r
-               filter1.setMetadata(getStaticItemType().getMetadata("Anyag cím"));\r
-               filter1.setValueLogic(FilterValueLogic.EQUALS);\r
-               filter1.setValues(Arrays.asList((Object) title));\r
-\r
-               QueryObject qo = new QueryObject();\r
-               qo.setFilters(Arrays.asList(filter, filter1));\r
-\r
-               // Exercise\r
-               List<SearchResult<Item>> searchResult = searchItem(qo);\r
-\r
-               if (searchResult != null && searchResult.size() > 0 && searchResult.get(0).getItemCount() == 1) {\r
-                       SearchResult<Item> sr = searchResult.get(0);\r
-                       result = sr.getItems().get(0);\r
-               }\r
-               traceOut();\r
-               return result;\r
-       }\r
+//     @Override\r
+//     public Item getItemByHouseID(String houseID, String title) {\r
+//             traceIn();\r
+//             Item result = null;\r
+//             SearchFilter filter = new SearchFilter();\r
+//             filter.setMetadata(getStaticItemType().getMetadata("Anyag house ID"));\r
+//             filter.setValueLogic(FilterValueLogic.EQUALS);\r
+//             filter.setValues(Arrays.asList((Object) houseID));\r
+//\r
+//             SearchFilter filter1 = new SearchFilter();\r
+//             filter1.setLogic(FilterLogic.AND);\r
+//             filter1.setMetadata(getStaticItemType().getMetadata("Anyag cím"));\r
+//             filter1.setValueLogic(FilterValueLogic.EQUALS);\r
+//             filter1.setValues(Arrays.asList((Object) title));\r
+//\r
+//             QueryObject qo = new QueryObject();\r
+//             qo.setFilters(Arrays.asList(filter, filter1));\r
+//\r
+//             // Exercise\r
+//             List<SearchResult<Item>> searchResult = searchItem(qo);\r
+//\r
+//             if (searchResult != null && searchResult.size() > 0 && searchResult.get(0).getItemCount() == 1) {\r
+//                     SearchResult<Item> sr = searchResult.get(0);\r
+//                     result = sr.getItem(null);\r
+//             }\r
+//             traceOut();\r
+//             return result;\r
+//     }\r
 \r
        @Override\r
        public ItemType getItemType(String itemTypeName) {\r
@@ -1484,10 +1481,4 @@ public class ItemManager extends MemoryCache implements IItemManager {
                }\r
        }\r
 \r
-       @Override\r
-       public BasicDBObject simpleSearch(BasicDBObject searchParameters) {\r
-               MediaFinder finder = new MediaFinder(this);\r
-               return finder.simpleSearch(searchParameters);\r
-       }\r
-\r
 }\r
index 60625e397f1105e8277411e271b4346a521c505a..f45ea1ef01b352f7f9b527d804eccbcd73a257d5 100644 (file)
@@ -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
index 34e36a25a1e56f634986892a96692a69fdee5c03..9e590b172a60ff95b163fc27aaf33ed4960df2f6 100644 (file)
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-#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);\r
+#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);\r
 \r
 @SuppressWarnings("unused")\r
 class MediaDAO extends EntityBaseDAO {\r
@@ -65,6 +65,7 @@ class MediaDAO extends EntityBaseDAO {
                        entity.setModified(iterator.modified());\r
                        entity.setPoster(iterator.poster());\r
                        entity.setCreation(iterator.creation());\r
+                       entity.setFileCount(iterator.fileCount());\r
 \r
                        if (result == null)\r
                                result = new ArrayList<IEntityBase>();                          \r
@@ -77,27 +78,27 @@ class MediaDAO extends EntityBaseDAO {
        @Override\r
        protected ResultSetIterImpl selectByKey(DefaultContext context, long id) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ID = :id };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ID = :id };\r
                return iter;\r
        }\r
 \r
        @Override\r
        protected ResultSetIterImpl selectByForeignKey(DefaultContext context, long id) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE ITEMID = :id };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE ITEMID = :id };\r
                return iter;\r
        }\r
        \r
        public ResultSetIterImpl selectByTitle(DefaultContext context, String title) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA WHERE TITLE = :title };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA WHERE TITLE = :title };\r
                return iter;\r
        }\r
        \r
        @Override\r
        protected ResultSetIterImpl selectAll(DefaultContext context) throws SQLException{\r
                MediaIter iter = null;\r
-               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION FROM MEDIA };\r
+               #sql [context] iter = { SELECT ID, TITLE, DESCRIPTION, ITEMID, ITEMTYPEID, HOUSEID, LENGTH, CREATED, ARCHIVED, MODIFIED, POSTER, CREATION, FILECOUNT FROM MEDIA };\r
                return iter;\r
        }\r
        \r
@@ -125,8 +126,9 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
                Timestamp creation = obj.getCreation();\r
+               int fileCount = obj.getFileCount();\r
 \r
-               #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 };\r
+               #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 };\r
        }\r
        \r
        @Override\r
@@ -143,8 +145,9 @@ class MediaDAO extends EntityBaseDAO {
                Timestamp archived = obj.getArchived();\r
                Timestamp modified = obj.getModified();\r
                Timestamp creation = obj.getCreation();\r
+               int fileCount = obj.getFileCount();\r
                \r
-               #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) };\r
+               #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) };\r
        }\r
        \r
        /**\r
index 2056925ba933d95e8167e37e842903a20453c605..7a42ba89864a5645fbce4a3bf0632508b6eb377f 100644 (file)
@@ -7,17 +7,12 @@ import java.sql.SQLException;
 import java.text.SimpleDateFormat;\r
 import java.time.Duration;\r
 import java.time.Instant;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
 import java.util.Objects;\r
 \r
 import org.apache.ibatis.jdbc.SQL;\r
 import org.apache.logging.log4j.LogManager;\r
 import org.apache.logging.log4j.Logger;\r
 \r
-import com.ibm.nosql.json.api.BasicDBList;\r
-import com.ibm.nosql.json.api.BasicDBObject;\r
-\r
 import sqlj.runtime.ref.DefaultContext;\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.db.Item;\r
@@ -35,8 +30,8 @@ public class MediaFinder implements IMediaFinder {
                this.manager = manager;\r
        }\r
 \r
-       private PreparedStatement createStatement(Connection connection, String criteria, SearchOptions options) throws Exception {\r
-               String criteriasPattern = getCriteriasRegexPattern(criteria);\r
+       private PreparedStatement createStatement(Connection connection, SearchOptions options) throws Exception {\r
+               String criteria = options.getText();\r
 \r
                StringBuilder sql = new StringBuilder();\r
                sql.append("SELECT ");\r
@@ -53,18 +48,15 @@ public class MediaFinder implements IMediaFinder {
                        sql.append("m.created,");\r
                        sql.append("m.modified,");\r
                        sql.append("m.length,");\r
+                       sql.append("m.filecount,");\r
                        sql.append("m.itemtypeid mediaitemtypeid,");\r
-//                     sql.append(String.format("HIGHLIGHT(md.description, '<span class=''rhl''>', '</span>', '%s') description,", criteriasPattern));\r
                        sql.append("it.name mediaitemtypename,");\r
                        sql.append("m.houseid mediahouseid,");\r
                        sql.append("mf.houseid mediafilehouseid");\r
-//                     sql.append("vw_mf.mediafilecount");\r
                }\r
 \r
                sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md, ITEMTYPE it");\r
-               // sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md, VW_MEDIAFILES vw_mf, ITEMTYPE it");\r
                sql.append(" WHERE i.id = md.itemid AND m.id = md.mediaid AND mf.id = md.mediafileid");\r
-//             sql.append(" AND m.id=vw_mf.mediaid AND m.itemTypeId = it.id");\r
                sql.append(" AND m.itemTypeId = it.id");\r
 \r
                StringBuilder criteriaForType = options.getCriteriaForType();\r
@@ -102,8 +94,8 @@ public class MediaFinder implements IMediaFinder {
 \r
                if (options.getTo() != null)\r
                        sql.append(String.format(" AND m.creation < '%s'", df.format(options.getTo())));\r
-//             if (options.isMissingProxy())\r
-//                     sql.append(" AND vw_mf.mediafilecount=1");\r
+               if (options.isMissingProxy())\r
+                       sql.append(" AND m.filecount = 1");\r
 \r
                if (options.getDescLength() > 0)\r
                        sql.append(" AND LENGTH(m.description) < " + options.getDescLength());\r
@@ -118,165 +110,78 @@ public class MediaFinder implements IMediaFinder {
                        }\r
                }\r
 \r
-               if (!options.isCountOnly() && (options.getToResult() != 0)) {\r
-\r
-                       sql.append(" LIMIT " + (options.getToResult() - options.getFromResult()));\r
-                       sql.append(" OFFSET " + options.getFromResult());\r
-               }\r
-\r
-               String query = sql.toString();\r
-               logger.info(query);\r
+//             if (!options.isCountOnly() && (options.getToResult() != 0)) {\r
+//\r
+//                     sql.append(" LIMIT " + (options.getToResult() - options.getFromResult()));\r
+//                     sql.append(" OFFSET " + options.getFromResult());\r
+//             }\r
 \r
-               PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);\r
-//             PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE,\r
-//                             ResultSet.CONCUR_READ_ONLY);\r
+               logger.info(sql.toString());\r
 \r
-               // TODO Ettol elszall a 11.5-on a kereses\r
-               // if (criteria != null && criteria.trim().length() > 0) {\r
-               // st.setString(1, criteria);\r
-               // logger.info("Parameter is {}", criteria);\r
-               // }\r
-               return st;\r
+               return connection.prepareStatement(sql.toString(), ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);\r
        }\r
 \r
-//     private PreparedStatement createGroupingStatement(Connection connection, String criteria, SearchOptions options) throws Exception {\r
-//             boolean simpleSearch = manager.getSystemConfig().value("datasource.mediacube.simple-search", true);\r
-//             String criteriasPattern = getCriteriasRegexPattern(criteria);\r
-//\r
-//             SQL innerSql = new SQL();\r
-//             innerSql.SELECT("max(vi.mediaid)");\r
-//             innerSql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md");\r
-//             innerSql.WHERE("vi.mediafileid = md.mediafileid");\r
-//\r
-//             if (simpleSearch) {\r
-//                     // TODO ezen az agon nem jo!!!!!\r
-//                     String simpleTextCriteria = formatSimpleSearchValue(criteria);\r
-//                     if (simpleTextCriteria != null && simpleTextCriteria.trim().length() > 0) {\r
-//                             innerSql.AND();\r
-//                             innerSql.WHERE("(");\r
-//                             innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.mediatitle", simpleTextCriteria));\r
-//                             innerSql.OR();\r
-//                             innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.itemtitle", simpleTextCriteria));\r
-//                             innerSql.OR();\r
-//                             innerSql.WHERE(String.format("%s LIKE '%%%s%%'", "vi.mediarelativepath", simpleTextCriteria));\r
-//                             innerSql.WHERE(")");\r
-//                     }\r
-//             } else {\r
-//                     String textCriteria = formatSearchValue(criteria);\r
-//                     if (textCriteria != null && textCriteria.trim().length() > 0) {\r
-//                             innerSql.AND();\r
-//                             innerSql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria));\r
-//                     }\r
-//             }\r
-//             innerSql.GROUP_BY("vi.mediarelativepath");\r
-//\r
-//             SQL mainSql = new SQL();\r
-//             if (options.isCountOnly())\r
-//                     mainSql.SELECT("COUNT(1) AS NumberOfRecords");\r
-//             else\r
-//                     mainSql.SELECT("vi.itemid", "vi.itemtitle", "vi.mediaid", "vi.mediatitle", "vi.mediarelativepath", "vi.mediaarchived", "vi.mediacreation",\r
-//                                     "vi.medialength", "vf.mediafilecount",\r
-//                                     String.format("HIGHLIGHT(md.description, '<span class=''rhl''>', '</span>', '%s') description", criteriasPattern));\r
-//\r
-//             mainSql.FROM("VW_ITEMS_WITH_PATH vi", "VW_MEDIAFILES vf", "MEDIADESCRIPTION md");\r
-//             mainSql.WHERE("vf.mediaid = vi.mediaid");\r
-//             mainSql.AND();\r
-//             mainSql.WHERE("vi.mediafileid = md.mediafileid");\r
-//             mainSql.AND();\r
-//             mainSql.WHERE(String.format("vi.mediaid IN (\r\n%s\r\n)", innerSql.toString()));\r
-//\r
-//             StringBuilder criteriaForType = options.getCriteriaForType();\r
-//             if (criteriaForType != null) {\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE(String.format("vi.mediaitemtypeid IN (%s)", criteriaForType.toString()));\r
-//             }\r
-//\r
-//             StringBuilder criteriaForTag = options.getCriteriaForTag();\r
-//             if (criteriaForTag != null) {\r
-//                     SQL tagSql = new SQL();\r
-//                     tagSql.SELECT("mediaid");\r
-//                     tagSql.FROM("MEDIATAGS");\r
-//                     tagSql.WHERE(String.format("vi.mediaitemtypeid IN (%s)", criteriaForTag.toString()));\r
-//\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE(String.format("vi.mediaid IN (%s)", tagSql.toString()));\r
-//             }\r
-//\r
-//             if (options.getFrom() != null) {\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE(String.format("vi.mediacreation > '%s'", df.format(options.getFrom())));\r
-//             }\r
-//\r
-//             if (options.getTo() != null) {\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE(String.format("vi.mediacreation < '%s'", df.format(options.getTo())));\r
-//             }\r
-//\r
-//             if (options.isMissingProxy()) {\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE("vf.mediafilecount = 1");\r
-//             }\r
-//\r
-//             if (options.getDescLength() > 0) {\r
-//                     mainSql.AND();\r
-//                     mainSql.WHERE(String.format("LENGTH(vi.mediadescription) < %s", options.getDescLength()));\r
-//             }\r
-//\r
-//             if (!options.isCountOnly() && (options.getToResult() != 0)) {\r
-//                     mainSql.ORDER_BY("vi.mediacreation DESC");\r
-//                     mainSql.LIMIT((options.getToResult() - options.getFromResult()));\r
-//                     mainSql.OFFSET(options.getFromResult());\r
-//             }\r
-//\r
-//             String query = mainSql.toString();\r
-//             logger.info(query);\r
-//             PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE);\r
-//             return st;\r
-//     }\r
-\r
        private String formatSearchValue(String value) {\r
                String[] specials = new String[] { ":", "?", "%", "(", ")" };\r
-               String result = value;\r
+               String result = value.trim();\r
                for (String c : specials) {\r
                        result = result.replace(c, "\\" + c);\r
                }\r
+\r
                if (!(result.startsWith("\"") && result.endsWith("\"")) && result.length() != 0)\r
                        result += "*";\r
                return result;\r
        }\r
 \r
-       private String getCriteriasRegexPattern(String criteria) {\r
-               String[] criterias = criteria.replace("*", "").replace("+", " ").split(" ");\r
-               if (criteria.startsWith("\"") && criteria.endsWith("\""))\r
-                       criterias = new String[] { criteria.replace("\"", "") };\r
-\r
-               StringBuilder sb = new StringBuilder();\r
-               for (String word : criterias) {\r
-                       if (sb.length() > 0)\r
-                               sb.append("|");\r
-                       sb.append(word);\r
-               }\r
-               return sb.toString();\r
-       }\r
-\r
-       private long getTotalCount(SearchOptions options) {\r
+       private SearchResult<ArchivedMedia> getSearchResults(SearchOptions options) {\r
                long start = System.currentTimeMillis();\r
-               long result = 0;\r
+\r
+               SearchResult<ArchivedMedia> result = new SearchResult<>();\r
 \r
                ResultSet rs = null;\r
                PreparedStatement st = null;\r
-\r
                DefaultContext context = manager.getDbContext();\r
                Connection connection = context.getConnection();\r
+\r
                try {\r
-                       logger.info("Query total count");\r
-                       options.setCountOnly(true);\r
-                       // creating a query for checking resultset size\r
-                       st = createStatement(connection, options.getText(), options);\r
+                       st = createStatement(connection, options);\r
                        rs = st.executeQuery();\r
-                       if (rs.next()) {\r
-                               result = rs.getLong("totalCount");\r
+\r
+                       rs.last();\r
+                       result.setItemCount(rs.getRow());\r
+\r
+                       // set begining position\r
+                       int fromResult = options.getFromResult();\r
+                       int toResult = options.getToResult();\r
+\r
+                       if (fromResult > -1) {\r
+                               if (fromResult <= result.getItemCount()) {\r
+                                       if (fromResult > 1) {\r
+                                               rs.absolute(fromResult - 1);\r
+                                       } else {\r
+                                               rs.beforeFirst();\r
+                                       }\r
+                               } else {\r
+                                       if (result.getItemCount() > 0) {\r
+                                               throw new Exception("Invalid searchResult 'from' position: " + fromResult + " total records: " + result.getItemCount());\r
+                                       }\r
+                               }\r
+                       } else {\r
+                               rs.beforeFirst();\r
+                       }\r
+\r
+                       int maxRecords = toResult - fromResult;\r
+\r
+                       while (rs.next() && maxRecords > 0) {\r
+                               ArchivedMedia am = createArchiveMedia(rs);\r
+                               result.addItem(am.getMedia().getId(), am);\r
+\r
+                               maxRecords--;\r
                        }\r
+\r
+                       mergeRelevantDescriptions(connection, result, options.getText());\r
+\r
+                       logger.info("Query result processed");\r
                        connection.commit();\r
                } catch (Exception e) {\r
                        try {\r
@@ -289,54 +194,35 @@ public class MediaFinder implements IMediaFinder {
                        try {\r
                                if (rs != null)\r
                                        rs.close();\r
-                       } catch (Exception e2) {\r
+                       } catch (Exception e1) {\r
                        }\r
-\r
                        try {\r
                                if (st != null)\r
                                        st.close();\r
-                       } catch (Exception e2) {\r
+                       } catch (Exception e1) {\r
                        }\r
 \r
                        manager.putDbContext(context);\r
                }\r
                long end = System.currentTimeMillis();\r
-               logger.info("getNumberOfRecords execution time is {} s", (float) (end - start) / 1000);\r
+               logger.info("getSearchResults execution time is {} s", (float) (end - start) / 1000);\r
                return result;\r
        }\r
 \r
-       private void getSearchResults(SearchResult<ArchivedMedia> searchResults, SearchOptions options) {\r
-               long start = System.currentTimeMillis();\r
-               ResultSet rs = null;\r
+       private void mergeRelevantDescriptions(Connection connection, SearchResult<ArchivedMedia> searchResult, String criteria) {\r
                PreparedStatement st = null;\r
-\r
-               DefaultContext context = manager.getDbContext();\r
-               Connection connection = context.getConnection();\r
-\r
+               ResultSet rs = null;\r
                try {\r
-                       options.setCountOnly(false);\r
-                       st = createStatement(connection, options.getText(), options);\r
+                       SQL query = SearchSQL.descriptionsQuery(criteria, searchResult.getKeys());\r
+                       st = connection.prepareStatement(query.toString());\r
                        rs = st.executeQuery();\r
-\r
-                       List<ArchivedMedia> resultList = null;\r
                        while (rs.next()) {\r
-                               ArchivedMedia am = createArchiveMedia(rs);\r
-                               // am.setRelevant(rs.getString("description"));\r
-                               if (resultList == null) {\r
-                                       resultList = new ArrayList<>();\r
-                                       searchResults.setItems(resultList);\r
-                               }\r
-                               resultList.add(am);\r
+                               long mediaId = rs.getLong("mediaid");\r
+                               String description = rs.getString("description");\r
+                               searchResult.getItem(mediaId).setRelevant(description);\r
                        }\r
-                       logger.info("Query result processed");\r
-                       connection.commit();\r
                } catch (Exception e) {\r
-                       try {\r
-                               connection.rollback();\r
-                       } catch (Exception e1) {\r
-                               logger.throwing(e1);\r
-                       }\r
-                       manager.throwError(e);\r
+                       logger.error(e.getMessage());\r
                } finally {\r
                        try {\r
                                if (rs != null)\r
@@ -348,19 +234,7 @@ public class MediaFinder implements IMediaFinder {
                                        st.close();\r
                        } catch (Exception e1) {\r
                        }\r
-\r
-                       manager.putDbContext(context);\r
                }\r
-               long end = System.currentTimeMillis();\r
-               logger.info("getSearchResults execution time is {} s", (float) (end - start) / 1000);\r
-       }\r
-\r
-       private String formatSimpleSearchValue(String value) {\r
-               String result = value;\r
-               if (value.endsWith("*"))\r
-                       result = value.replace("*", "");\r
-               result = result.trim();\r
-               return result;\r
        }\r
 \r
        private ArchivedMedia createArchiveMedia(ResultSet rs) throws SQLException {\r
@@ -384,7 +258,7 @@ public class MediaFinder implements IMediaFinder {
                media.setModified(rs.getTimestamp("modified"));\r
                media.setArchived(rs.getTimestamp("archived"));\r
                media.setLength(rs.getLong("length"));\r
-               // media.setMediaFilesCount(rs.getInt("mediafilecount"));\r
+               media.setFileCount(rs.getInt("filecount"));\r
                media.setMediaFilesName(rs.getString("mediafilehouseid"));\r
                media.setMediaFilesCount(1);\r
 \r
@@ -398,93 +272,11 @@ public class MediaFinder implements IMediaFinder {
        public SearchResult<ArchivedMedia> search(SearchOptions options, IExecutionDurationNotification cb) {\r
                Instant started = Instant.now();\r
                manager.traceIn();\r
-               SearchResult<ArchivedMedia> result = new SearchResult<>();\r
-\r
-               if (options.getFromResult() == 0) {\r
-                       long numberOfRecords = getTotalCount(options);\r
-                       logger.info("Number of records {}", numberOfRecords);\r
-\r
-                       result.setItemCount(numberOfRecords);\r
-               }\r
-\r
-               getSearchResults(result, options);\r
+               SearchResult<ArchivedMedia> result = getSearchResults(options);\r
                manager.traceOut();\r
                Instant finished = Instant.now();\r
                if (Objects.nonNull(cb))\r
                        cb.notify(Duration.between(started, finished));\r
                return result;\r
        }\r
-\r
-       public BasicDBObject simpleSearch(BasicDBObject searchParameters) {\r
-               BasicDBObject result = new BasicDBObject();\r
-               BasicDBList items = new BasicDBList();\r
-               result.put("data", items);\r
-\r
-               String criteria = searchParameters.getString("criteria");\r
-               String criteriasPattern = getCriteriasRegexPattern(criteria);\r
-               String textCriteria = formatSearchValue(criteria);\r
-\r
-               int paginationSize = searchParameters.getInt("size");\r
-               int page = searchParameters.getInt("page");\r
-               if (page == 1) {\r
-                       SQL sql = new SQL();\r
-                       sql.SELECT("COUNT(*) resultcount");\r
-                       sql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md");\r
-                       sql.WHERE("vi.mediafileid = md.mediafileid");\r
-                       if (textCriteria != null && textCriteria.trim().length() > 0) {\r
-                               sql.AND();\r
-                               sql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria));\r
-                       }\r
-\r
-                       String query = sql.toString();\r
-                       manager.executeQuery(query, rs -> {\r
-                               int resultCount = rs.getInt("resultcount");\r
-                               int pageCount = (int) Math.floor(resultCount / paginationSize);\r
-                               logger.info("Result count {}, pagecount {}", resultCount, pageCount);\r
-                               result.put("last_page", pageCount);\r
-                               return false;\r
-                       }, st -> {\r
-\r
-                       });\r
-               }\r
-               SQL sql = new SQL();\r
-               String relevantField = String.format("HIGHLIGHT(md.description, '<span class=''rhl''>', '</span>', '%s') AS relevant", criteriasPattern);\r
-               sql.SELECT("vi.itemid", "vi.itemtitle", "vi.mediaid", "vi.mediatitle", "vi.mediacreation", "vi.medialength", "vi.mediaitemtypename", "vi.mediahouseid",\r
-                               "vi.mediarelativepath", relevantField);\r
-               sql.FROM("VW_ITEMS_WITH_PATH vi", "MEDIADESCRIPTION md");\r
-               sql.WHERE("vi.mediafileid = md.mediafileid");\r
-               if (textCriteria != null && textCriteria.trim().length() > 0) {\r
-                       sql.AND();\r
-                       sql.WHERE(String.format("CONTAINS(md.description, '%s') >= 1", textCriteria));\r
-               }\r
-               sql.LIMIT(paginationSize);\r
-               int offset = (page - 1) * paginationSize;\r
-               sql.OFFSET(offset);\r
-               sql.ORDER_BY("vi.mediacreation DESC");\r
-               String query = sql.toString();\r
-               logger.info(query);\r
-\r
-               result.put("last_row", offset);\r
-\r
-               manager.executeQuery(query, rs -> {\r
-                       BasicDBObject item = new BasicDBObject();\r
-                       item.put("itemId", rs.getString("itemid"));\r
-                       item.put("itemTitle", rs.getString("itemtitle"));\r
-                       item.put("mediaId", rs.getString("mediaid"));\r
-                       item.put("mediaTitle", rs.getString("mediatitle"));\r
-                       item.put("creation", rs.getString("mediacreation"));\r
-                       item.put("length", rs.getInt("medialength"));\r
-                       item.put("typeName", rs.getString("mediaitemtypename"));\r
-                       item.put("houseId", rs.getString("mediahouseid"));\r
-                       item.put("fileName", rs.getString("mediarelativepath"));\r
-                       item.put("relevant", rs.getString("relevant"));\r
-                       items.add(item);\r
-                       result.put("last_row", result.getInt("last_row") + 1);\r
-                       return true;\r
-               }, st -> {\r
-\r
-               });\r
-               return result;\r
-       }\r
-\r
 }\r
index 34299a5807a2003ec165f35a6bf5d3091536fd12..23aa24e7fcf888ae26e13c3fe48c552bbfb48fcf 100644 (file)
@@ -1,26 +1,37 @@
 package user.jobengine.search;\r
 \r
+import java.util.ArrayList;\r
+import java.util.LinkedHashMap;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
 public class SearchResult<T> {\r
 \r
        private long itemCount;\r
-       private List<T> items;\r
+       private Map<Long, T> items = new LinkedHashMap<>();\r
 \r
        public long getItemCount() {\r
                return itemCount;\r
        }\r
 \r
        public List<T> getItems() {\r
-               return items;\r
+               return new ArrayList<>(items.values());\r
        }\r
 \r
-       public void setItemCount(long itemCount) {\r
-               this.itemCount = itemCount;\r
+       public List<Long> getKeys() {\r
+               return new ArrayList<>(items.keySet());\r
+       }\r
+\r
+       public void addItem(Long id, T item) {\r
+               items.put(id, item);\r
        }\r
 \r
-       public void setItems(List<T> items) {\r
-               this.items = items;\r
+       public T getItem(Long id) {\r
+               return items.get(id);\r
+       }\r
+\r
+       public void setItemCount(long itemCount) {\r
+               this.itemCount = itemCount;\r
        }\r
 \r
 }
\ No newline at end of file
index f9291daad4254d46d646102e996c837c4f19aa1d..0c7f26f04feeb778b3ba48053c7f256a9f5a39c0 100644 (file)
@@ -377,18 +377,6 @@ public class TestItem extends TestBase {
        // }\r
        // }\r
 \r
-       @Test\r
-       public void testSearchItem_byHouseID() {\r
-\r
-               // TestDB.createStaticItemTypes();\r
-               // Fixture\r
-               // Exercise\r
-               Item result = manager.getItemByHouseID("11111", null);\r
-\r
-               // Verify\r
-               assertNotNull(result);\r
-       }\r
-\r
        @Test\r
        public void testSetAttribute() {\r
                // Fixture\r
index d9690125ffa66d9150f7b48ad82e80738e001edd..51aeea0db9d62cd394ea08f399f69af57421a318 100644 (file)
@@ -340,7 +340,8 @@ public class MediaCubeService {
                logger.info("Request: {}", searchParameters.toPrettyString(""));\r
                try {\r
                        IItemManager manager = ComponentBinder.getItemManager();\r
-                       BasicDBObject searchResult = manager.simpleSearch(searchParameters);\r
+//                     BasicDBObject searchResult = manager.search(searchParameters, null);\r
+                       BasicDBObject searchResult = null;\r
                        result = Response.ok(searchResult).build();\r
                } catch (Exception e) {\r
                        result = Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();\r
index aecc8865e5ee5e24b4f2ae1c4f9f0ed882334b8d..42408eb0f6628d6910d9a8c730f2370a5a078871 100644 (file)
@@ -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: .
index c603236e474cd3c7b1d7c341feadbabc021fce5f..a0358436417b40d749f411afe09d80cca0ed56e1 100644 (file)
@@ -7,12 +7,14 @@
 \r
 .tagify{\r
 /*     --tags-border-color:#DDD;*/\r
-       --tags-border-color: #1d1d1d;\r
+/*dark --tags-border-color: #1d1d1d;*/\r
+       --tags-border-color: #cfcfcf;\r
        --tags-disabled-bg:#F1F1F1;\r
 /*     --tags-hover-border-color:#CCC;*/\r
-       --tags-hover-border-color: #1d1d1d;\r
+       --tags-hover-border-color: #cfcfcf;\r
 /*     --tags-focus-border-color:#3595f6;*/\r
-       --tags-focus-border-color: #1d1d1d;\r
+       --tags-focus-border-color: #cfcfcf;\r
+\r
        --tag-bg:#1d1d1d;\r
        --tag-hover:#D3E2E2;\r
 /*\r
index 27c2f0e8e551a56f4ed5548578f10c7120deee30..b54f30330abdd8c92201c27940761c6a1335b362 100644 (file)
@@ -79,6 +79,8 @@ player.ready(function(){
     var duration;\r
     \r
     this.on('loadedmetadata', function(){ \r
+/*\r
+       //kulon csikba az idok\r
        container= player.getChild('controlBar').addChild('timecodeContainer');\r
        start= container.addChild('startTime'); \r
        current= container.addChild('currentTime');\r
@@ -88,6 +90,7 @@ player.ready(function(){
        current.updateTextContent(SMPTEToString(secondsToSMPTEWithSOM(player.currentTime())));\r
        end.updateTextContent(SMPTEToString(secondsToSMPTEWithSOM(player.duration())));\r
        duration.updateTextContent(SMPTEToString(secondsToSMPTE(player.duration())));\r
+*/     \r
     });\r
     \r
     this.on('timeupdate', function(){\r
@@ -165,6 +168,8 @@ videojs.setFormatTime(customTimeFormat);
 \r
 var Component = videojs.getComponent('Component');\r
 \r
+/*\r
+//kulon csikba az idok\r
 var timecodeContainer = videojs.extend(Component, {\r
   constructor: function(player, options) {\r
     Component.apply(this, arguments);\r
@@ -187,6 +192,7 @@ var timecodeContainer = videojs.extend(Component, {
 });\r
 videojs.registerComponent('timecodeContainer', timecodeContainer);\r
 \r
+\r
 var timeBox = videojs.extend(timecodeContainer, {\r
   constructor: function(player, options) {\r
     Component.apply(this, arguments);\r
@@ -231,6 +237,7 @@ videojs.registerComponent('startTime', timeBox);
 videojs.registerComponent('currentTime', currenttimeBox);\r
 videojs.registerComponent('endTime', timeBox);\r
 videojs.registerComponent('duration', timeBox);\r
+*/\r
 \r
 function createBreakPoint() {\r
        var current = player.currentTime();\r
index 365b35ab984d21638d8212d896af8b5e7bff8376..f712d6db07380b81fd12656da6dc6a20141427e9 100644 (file)
                                </menupopup>\r
                        </menu>\r
                        <menuitem label="Mini monitor" onClick="@command('createFloatingJobMonitor')" />\r
-<!--                   <menu label="Megjelenés"> -->\r
-<!--                           <menupopup> -->\r
-<!--                                   <menuitem label="Világos" onClick="@command('applyTheme', name='silvertail')" /> -->\r
-<!--                                   <menuitem label="Sötét" onClick="@command('applyTheme', action='userdark')" /> -->\r
-<!--                           </menupopup> -->\r
-<!--                   </menu> -->\r
+                       <menu label="Megjelenés" disabled="true">\r
+                               <menupopup>\r
+                                       <menuitem label="Világos" onClick="@command('applyTheme', name='silvertail')" />\r
+                                       <menuitem label="Sötét" onClick="@command('applyTheme', name='userdark')" />\r
+                               </menupopup>\r
+                       </menu>\r
 \r
                        <menuitem id="basketIMenuItem" label="@load(lm.basketMenuLabel)" iconSclass="z-icon-shopping-cart" \r
                                style="float: right" onClick="@command('showBasket')" disabled="false" />\r
index 8e7baa852441090fd7f53ea7672aab1123e43cf1..094a147c24acc595aa7ad4e08ec5b7d22096eb36 100644 (file)
        <!-- csak igy jo a list sebessege -->\r
 \r
        <div id="scdiv" width="100%" height="100%" viewModel="@id('vm') @init('user.jobengine.zk.model.GridSearchModel')">\r
-               <timer id="timer" delay="500" repeats="true" onTimer="@command('uiTick')" />\r
+               <timer id="timer" delay="500" repeats="false" onTimer="@command('uiTick')" />\r
                <div id="tagListener" onChange="@command('onTagChanged')" />\r
 \r
                <borderlayout width="100%" height="100%">\r
                        <west id="searchWest" border="none" flex="true" size="60%" splittable="true" minsize="500" onSize="@command('onWestResize')">\r
                                <div height="100%" width="100%">\r
-                               \r
                                        <search-filters />\r
-                                       \r
                                        <groupbox vflex="true" closable="false">\r
-                                       \r
                                                <search-results />\r
-<!--                                           <tabbox id="resultsTab" vflex="true" hflex="true" orient="top"> -->\r
-<!--                                                   <tabs visible="true"> -->\r
-<!--                                                           <tab id="tab0" label="Lista"  /> -->\r
-<!--                                                           <tab id="tab1" label="Fa" /> -->\r
-<!--                                                           <tab id="tab2" label="Villám" selected="true" /> -->\r
-<!--                                                   </tabs> -->\r
-<!--                                                   <tabpanels> -->\r
-<!--                                                           <tabpanel> -->\r
-<!--                                                                   <search-results /> -->\r
-<!--                                                           </tabpanel>                                      -->\r
-<!--                                                           <tabpanel> -->\r
-<!--                                                                   <grouped-search-results /> -->\r
-<!--                                                           </tabpanel>                                      -->\r
-<!--                                                           <tabpanel> -->\r
-<!--                                                                   <tabulator-search-results /> -->\r
-<!--                                                           </tabpanel>                                      -->\r
-<!--                                                   </tabpanels> -->\r
-<!--                                           </tabbox>                                        -->\r
-                                       \r
                                        </groupbox>\r
                                </div>\r
                        </west>\r
@@ -77,7 +55,7 @@
                        <!-- media player -->\r
                        <center border="none">\r
                                <borderlayout height="100%" width="100%">\r
-                                       <north border="none" size="60%" splittable="true" minsize="250" collapsible="true">\r
+                                       <north border="none" size="50%" splittable="true" minsize="250" collapsible="true">\r
                                                <div align="center" height="100%" width="100%">\r
                                                        <h:video-js id="myVideoDiv" \r
                                                                class="video-js vjs-big-play-centered"\r
index 1ee917fee75224d27cadcd331615ed1b7bfbab95..184682638db28cbba58306a5904ce4e76a1d276e 100644 (file)
@@ -1,11 +1,14 @@
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:h="xhtml" xmlns:c="client">\r
        <div height="100%" width="100%">\r
                <style>\r
+<!--\r
+dark \r
                #detail-tagify-chdex > tags {\r
                        border: 1px solid lightgray;\r
                        background: #303030;\r
                        color: #e3e3e3;\r
                }\r
+ -->\r
                </style>\r
                <toolbar width="100%" style="min-height:40px; border-bottom:1px solid darkgray">\r
                        <toolbarbutton iconSclass="z-icon-reply" autodisable="self" onClick="@command('showInResults')"\r
index ce48119792df9ae50f25a46ecb1b96d139779aad..e82c9922f1b7bee615e09da721c05db0a0a2cef6 100644 (file)
@@ -8,9 +8,7 @@
 #2.7.6 TSM Metadata provider, javitott GroovyClassLoader\r
 #2.7.5 ArchiveItem disableProxy, MediaFile disableProxy\r
 \r
-#!!! = NINCS PUBLIKALVA MEG SEHOL\r
-\r
-footer=2016-2021 Â© Copyright User Rendszerház Kft.\r
+footer=2016-2023 Â© Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
 login_dialogtitle=Bejelentkezés\r
index fdc23887841a68eafa5f7b1eef5c3664b4ce0d75..2a73ef58e47db569b18ddd428bf362510f63412a 100644 (file)
@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 import org.zkoss.bind.BindUtils;\r
 import org.zkoss.bind.annotation.Command;\r
 \r
 public class AsyncBaseModel extends BaseModel {\r
-//     private static final Logger logger = LogManager.getLogger();\r
+       private static final Logger logger = LogManager.getLogger();\r
        private List<UITask> uiTasks = new ArrayList<>();\r
 \r
        protected void doKeepAlive() {\r
@@ -28,8 +30,7 @@ public class AsyncBaseModel extends BaseModel {
 \r
        @Command\r
        public void uiTick() {\r
-               // logger.info("{} tick {}", this.getClass().getSimpleName(),\r
-               // System.currentTimeMillis());\r
+               // logger.info("{} tick {}", this.getClass().getSimpleName(), System.currentTimeMillis());\r
                doKeepAlive();\r
                synchronized (uiTasks) {\r
                        for (UITask task : uiTasks) {\r
index 6c2b29c302910a56c711bcc36eb657fb70e1be81..3f496e233baa213950954a44d5651c29174ec4f3 100644 (file)
@@ -40,7 +40,6 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
        private SearchOptions options;\r
        private IExecutionDurationNotification cb;\r
 \r
-       private boolean enableCache = true;\r
        private int cacheSize = SessionUtil.getMediaCubeConfig().getSearchResultsListCacheSize();\r
 \r
        public CachedListModel(SearchOptions options, IExecutionDurationNotification cb) {\r
@@ -72,8 +71,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
        protected SearchResult<ArchivedMedia> createSearchResult(int startPos, int endPos) {\r
                options.setFromResult(startPos);\r
                options.setToResult(endPos);\r
-               SearchResult<ArchivedMedia> sr = itemManager.search(options, cb);\r
-               return sr;\r
+               return itemManager.search(options, cb);\r
        }\r
 \r
        public void fireListEvent() {\r
@@ -107,7 +105,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 \r
        @Override\r
        public ArchivedMedia getElementAt(int index) {\r
-               logger.info("getElementAt {}", index);\r
+               // logger.info("getElementAt {}", index);\r
                ArchivedMedia ret = cache.get(index);\r
                if (ret == null) {\r
                        loadCache(index);\r
@@ -139,22 +137,18 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
                        SearchResult<ArchivedMedia> sr = null;\r
                        int startPos = 0;\r
 \r
-                       if (enableCache) {\r
-                               int halfSize = this.cacheSize / 2;\r
-                               int rowLimit = this.cacheSize; // 200\r
-                               if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0\r
-                                                                                                       // cache=0-200, forIndex=150\r
-                                                                                                       // startPos=50 cache=50-250\r
-                                       startPos = (forIndex - halfSize);\r
-                               }\r
+                       int halfSize = this.cacheSize / 2;\r
+                       int rowLimit = this.cacheSize; // 200\r
+                       if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0\r
+                                                                                               // cache=0-200, forIndex=150\r
+                                                                                               // startPos=50 cache=50-250\r
+                               startPos = (forIndex - halfSize);\r
+                       }\r
 \r
-                               int endPos = (startPos + rowLimit);\r
-                               endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;\r
+                       int endPos = (startPos + rowLimit);\r
+                       endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;\r
 \r
-                               sr = createSearchResult(startPos, endPos);\r
-                       } else {\r
-                               sr = createSearchResult(startPos, 0);\r
-                       }\r
+                       sr = createSearchResult(startPos, endPos);\r
 \r
                        if (sr != null) {\r
 \r
index a4a04c70ae11d92f3a0eb7085ee633983a936803..b8032b8d5fa01d6aae09634ec20074c39549b706 100644 (file)
@@ -221,12 +221,11 @@ public class GridSearchModel extends AsyncBaseModel {
                // A MediaFileServlet a services/proxy alatt szolgal ki\r
                // Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4',\r
                // 'video/mp4')");\r
+               Selectors.wireComponents(view, this, false);\r
+               Selectors.wireEventListeners(view, this);\r
 \r
                try {\r
 \r
-                       Selectors.wireComponents(view, this, false);\r
-                       Selectors.wireEventListeners(view, this);\r
-\r
                        boolean typeFiltersVisible = SessionUtil.getTypeFiltersVisibility();\r
                        if (typeFiltersVisible) {\r
                                toggleShowTypeFilters.setChecked(true);\r
@@ -282,6 +281,7 @@ public class GridSearchModel extends AsyncBaseModel {
                paginal.addEventListener("onPaging", event -> {\r
                        PagingEvent evt = (PagingEvent) event;\r
                        preventAfterRender = false;\r
+                       // ensureVisible(0);\r
                });\r
 \r
                for (Component child : itemsGrid.getColumns().getChildren()) {\r
@@ -423,7 +423,6 @@ public class GridSearchModel extends AsyncBaseModel {
        }\r
 \r
        void ensureVisible(int pos) {\r
-\r
                registerTask(() -> {\r
                        logger.info("Scrolling to pos {} begin", pos);\r
                        List<Component> children = itemsGrid.getRows().getChildren();\r
@@ -480,7 +479,7 @@ public class GridSearchModel extends AsyncBaseModel {
                return itemSelectedValidator;\r
        }\r
 \r
-       public String getLowresMediaFilePath() throws Exception {\r
+       public String getLowresMediaFilePath() {\r
                String ret = null;\r
                if (selectedObject != null) {\r
                        List<MediaFile> mediaFiles = selectedObject.getMedia().getMediaFiles();\r
@@ -502,13 +501,17 @@ public class GridSearchModel extends AsyncBaseModel {
                                        StoreUri sourceStoreUri = store.getSourceStoreUri(RemoteStoreProtocol.HTTP);\r
 \r
                                        if (sourceStoreUri != null && sourceStoreUri.isStream()) {\r
-\r
-                                               String noProtocolUri = sourceStoreUri.toString(true);\r
-                                               String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false);\r
-                                               if (!base.endsWith("/"))\r
-                                                       base += "/";\r
-                                               String relative = mf.getRelativePath().replace("\\", "/");\r
-                                               ret = base + relative;\r
+                                               try {\r
+                                                       String noProtocolUri = sourceStoreUri.toString(true);\r
+                                                       String base = noProtocolUri.startsWith("/") ? noProtocolUri : sourceStoreUri.toString(false);\r
+                                                       if (!base.endsWith("/"))\r
+                                                               base += "/";\r
+                                                       String relative = mf.getRelativePath().replace("\\", "/");\r
+                                                       ret = base + relative;\r
+\r
+                                               } catch (Exception e) {\r
+                                                       Clients.showNotification(e.getMessage(), "error", btnSearch, "start_center", 3000);\r
+                                               }\r
                                                logger.info("Found lowres on store {}, url is {}", store.getName(), ret);\r
                                                break;\r
                                        }\r
@@ -672,13 +675,16 @@ public class GridSearchModel extends AsyncBaseModel {
                                highlight(selectedObject, true);\r
                                notifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");\r
                        } else {\r
-                               if (!preventAfterRender) {\r
-                                       preventAfterRender = true;\r
 \r
-                                       if (positionToScroll != -1) {\r
-                                               ensureVisible(positionToScroll);\r
-                                       }\r
-                               }\r
+                               ensureVisible(0);\r
+//\r
+//                             if (!preventAfterRender) {\r
+//                                     preventAfterRender = true;\r
+//\r
+//                                     if (positionToScroll != -1) {\r
+//                                             ensureVisible(positionToScroll);\r
+//                                     }\r
+//                             }\r
                        }\r
                } catch (Exception e) {\r
                        handleSearchError(e);\r
@@ -1091,31 +1097,30 @@ public class GridSearchModel extends AsyncBaseModel {
 \r
                        // tags\r
                        setMediaTags(mediaId);\r
-\r
-                       try {\r
-                               // proxy\r
-                               String video = getLowresMediaFilePath();\r
-                               if (video == null) {\r
-                                       Clients.evalJavaScript("setSource(null, null)");\r
-                               } else {\r
-                                       String srcType = null;\r
-                                       if (video.endsWith(".m3u8"))\r
-                                               srcType = "application/x-mpegURL";\r
-                                       else\r
-                                               srcType = "video/mp4";\r
-\r
-                                       Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType));\r
-                               }\r
-\r
-                       } catch (Exception e) {\r
-                               logger.error(e);\r
-                       }\r
-\r
+                       final String proxyUrl = getLowresMediaFilePath();\r
+                       registerTask(() -> {\r
+                               loadProxy(proxyUrl);\r
+                       });\r
+                       timer.start();\r
                } else\r
                        Clients.evalJavaScript("addMediaTags([]);");\r
 \r
        }\r
 \r
+       private void loadProxy(String video) {\r
+               if (video == null) {\r
+                       Clients.evalJavaScript("setSource(null, null)");\r
+               } else {\r
+                       String srcType = null;\r
+                       if (video.endsWith(".m3u8"))\r
+                               srcType = "application/x-mpegURL";\r
+                       else\r
+                               srcType = "video/mp4";\r
+\r
+                       Clients.evalJavaScript(String.format("setSource('%s', '%s')", video, srcType));\r
+               }\r
+       }\r
+\r
        private void setSettingsPageSize(int pageSize) {\r
                List<Component> searchSettingItems = searchSettings.getChildren();\r
                for (Component c : searchSettingItems) {\r
index 81fe4984bc3e06fc1925adb1236ed30f4ee0bd1b..c14f536bcef509af726749a73c2e59b9da0c3985 100644 (file)
@@ -1,7 +1,5 @@
 package user.jobengine.zk.model;\r
 \r
-import java.util.Arrays;\r
-\r
 import user.jobengine.db.ArchivedMedia;\r
 import user.jobengine.db.Media;\r
 import user.jobengine.db.SearchOptions;\r
@@ -25,7 +23,7 @@ public class InitializedCachedListModel extends CachedListModel {
                ArchivedMedia archivedMedia = new ArchivedMedia();\r
                archivedMedia.setMedia(media);\r
                archivedMedia.setItem(itemManager.getItem(media.getItemId()));\r
-               sr.setItems(Arrays.asList(archivedMedia));\r
+               sr.addItem(archivedMedia.getMedia().getId(), archivedMedia);\r
                return sr;\r
        }\r
 \r