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

diff --git a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java
index 8368dc79665231dbe877b8d833f1a8b84a10c74b..53a900d56d75d8ef41113694e611e1043f5c11da 100644 (file)
--- a/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java
+++ b/server/hu.user.mediacube.executors.tests/src/hu/user/mediacube/executors/tests/SupportCheckItem.java
@@ -104,38 +104,51 @@ public class SupportCheckItem {
        @Test\r
        public void process() throws SQLException {\r
                final Connection[] con = { null };\r
-               manager.executeQuery(\r
-                               "select itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated from vw_items where mediatype = 'ECHO műsor' order by mediacreated desc",\r
-                               rs -> {\r
-\r
-                                       long itemId = rs.getLong("itemId");\r
-                                       String itemHouseId = rs.getString("itemHouseId");\r
-                                       itemHouseId = itemHouseId == null ? "" : itemHouseId;\r
-                                       String itemTitle = rs.getString("itemTitle");\r
-                                       itemTitle = itemTitle == null ? "" : itemTitle;\r
-                                       String mediaFileHouseId = rs.getString("mediaFileHouseId");\r
-                                       Timestamp mediaCreated = rs.getTimestamp("mediaCreated");\r
-                                       try {\r
-                                               PlanAirProcessor p = new PlanAirProcessor(mediaFileHouseId);\r
-                                               if (p.getType() == MetadataType.TrafficMaterial) {\r
-                                                       con[0] = p.process(con[0]);\r
-                                                       String itemHouseId2 = p.getItemHouseId() == null ? "" : p.getItemHouseId();\r
-                                                       String itemTitle2 = p.getItemTitle() == null ? "" : p.getItemTitle();\r
-                                                       if (!itemHouseId2.equals(itemHouseId) || !itemTitle2.equals(itemTitle)) {\r
-\r
-                                                               System.out.println(\r
-                                                                               "Item " + itemId + " : wrong | " + mediaCreated + ", " + mediaFileHouseId + ", " + itemHouseId + ", " + itemTitle);\r
-                                                               System.out.println("\t good | " + itemHouseId2 + ", " + itemTitle2);\r
-                                                       }\r
-\r
-                                               }\r
-                                       } catch (Exception e) {\r
-                                               e.printStackTrace();\r
+               final int[] count = { 0 };\r
+               final int[] processed = { 0 };\r
+               String sqlb = "select %s from vw_items where (mediatype = 'ECHO műsor' or mediatype = 'Műsor')"; // and mediaFileHouseId like '%%M109138A%%'\r
+               String sqlc = String.format(sqlb, "count(*)");\r
+               String sql = String.format(sqlb + "  order by mediacreated desc", "itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated");\r
+\r
+               manager.executeQuery(sqlc, rs -> {\r
+                       count[0] = rs.getInt(1);\r
+                       return true;\r
+               }, null);\r
+               manager.executeQuery(sql, rs -> {\r
+                       processed[0]++;\r
+                       long itemId = rs.getLong("itemId");\r
+                       String itemHouseId = rs.getString("itemHouseId");\r
+                       itemHouseId = itemHouseId == null ? "" : itemHouseId;\r
+                       String itemTitle = rs.getString("itemTitle");\r
+                       itemTitle = itemTitle == null ? "" : itemTitle;\r
+                       String mediaFileHouseId = rs.getString("mediaFileHouseId");\r
+                       Timestamp mediaCreated = rs.getTimestamp("mediaCreated");\r
+                       try {\r
+                               if (mediaFileHouseId.length() > 7)\r
+                                       mediaFileHouseId = mediaFileHouseId.substring(0, 8);\r
+\r
+                               PlanAirProcessor p = new PlanAirProcessor(mediaFileHouseId);\r
+                               if (p.getType() == MetadataType.TrafficMaterial) {\r
+                                       con[0] = p.process(con[0]);\r
+                                       String itemHouseId2 = p.getItemHouseId() == null ? "" : p.getItemHouseId();\r
+                                       String itemTitle2 = p.getItemTitle() == null ? "" : p.getItemTitle();\r
+                                       if (!itemHouseId2.equals(itemHouseId) || !itemTitle2.equals(itemTitle)) {\r
+\r
+                                               System.out.println("Item " + itemId + " : wrong | " + mediaCreated + ", " + mediaFileHouseId + ", " + itemHouseId + ", " + itemTitle);\r
+                                               System.out.println("\t good | " + itemHouseId2 + ", " + itemTitle2 + ", " + (processed[0] * 100) / count[0] + "%");\r
+\r
                                        }\r
-                                       return true;\r
-                               }, null);\r
 \r
-               con[0].close();\r
+                               }\r
+                       } catch (Exception e) {\r
+                               e.printStackTrace();\r
+                       }\r
+                       processed[0]++;\r
+                       return true;\r
+               }, null);\r
+\r
+               if (con[0] != null)\r
+                       con[0].close();\r
        }\r
 \r
 }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
index 2d76a1b82785a8b34167a48b1d15393fa4e4a753..7e1d683607b5758a40fcfd4ca9067912dc4c4484 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CreateMissingLowresStep.java
@@ -34,7 +34,7 @@ public class CreateMissingLowresStep extends JobStep {
                try {\r
                        if (media == null) {\r
                                logger.info(new MediaCubeUndoMarker(marker.getSessionID()), "Nincs feldolgozandó hiány.");\r
-                               //                              throw new Exception("Nincs feldolgozandó hiány.");\r
+                               // throw new Exception("Nincs feldolgozandó hiány.");\r
                                jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));\r
                                return null;\r
                        }\r

diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
index fba24139e0b3f72fe528097a650eb45949e50157..66c283635bc737b132cc75e831dcdd7b1da24fb3 100644 (file)
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
@@ -5,6 +5,7 @@ import org.apache.logging.log4j.Logger;
 \r
 import user.jobengine.server.IJobEngine;\r
 import user.jobengine.server.IJobRuntime;\r
+import user.jobengine.server.messages.CancelRequest;\r
 import user.mediacube.metadata.interfaces.IMetadataProvider;\r
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;\r
 import user.mediacube.metadata.interfaces.MetadataProviderType;\r
@@ -35,10 +36,10 @@ public class FakeStep extends JobStep {
                                jobRuntime.incrementProgress((i + 1) * count);\r
                                Thread.sleep(100);\r
 \r
-                               if (i == 2)\r
-                                       throw new Exception("TESZT");\r
+                               jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));\r
                                logger.info("Progress {}", jobRuntime.getProgress());\r
                        }\r
+\r
                } catch (Exception e) {\r
                        logger.error(jobRuntime.getMarker(), e.getMessage());\r
                        throw e;\r

diff --git a/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java b/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java
index c919b24f411cbef3996a7461bb85d60bf845fa57..62c64de16e72aaae58e5a0650c54b6103d9fb4fd 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java
+++ b/server/user.jobengine.osgi.db/src/user/commons/pool/ContextPool.java
@@ -84,6 +84,7 @@ public class ContextPool extends ResourcePool {
                try {\r
                        if (context == null)\r
                                return;\r
+\r
                        if (context.isClosed() == false) {\r
                                context.close();\r
                        }\r

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
index 73db46f8bcc20a9acc29fec29e80a05f3a354425..1f80e07d2a1673a810eeee785f950ee48cb2943c 100644 (file)
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -443,6 +443,11 @@ public class ItemManager extends MemoryCache implements IItemManager {
                ResultSet rs = null;\r
                PreparedStatement st = null;\r
                try {\r
+                       //st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);\r
+                       //                      rs.last();\r
+                       //                      int size = rs.getRow();\r
+                       //                      rs.beforeFirst();\r
+\r
                        st = connection.prepareStatement(query);\r
                        if (decorator != null)\r
                                decorator.decorate(st);\r