From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 11 Dec 2019 15:56:14 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=80dc82f9b48fe18b4b60c2c667ce87fde79a6d51;p=mediacube.git

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

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 8368dc79..53a900d5 100644
--- 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
 	public void process() throws SQLException {
 		final Connection[] con = { null };
-		manager.executeQuery(
-				"select itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated from vw_items where mediatype = 'ECHO műsor' order by mediacreated desc",
-				rs -> {
-
-					long itemId = rs.getLong("itemId");
-					String itemHouseId = rs.getString("itemHouseId");
-					itemHouseId = itemHouseId == null ? "" : itemHouseId;
-					String itemTitle = rs.getString("itemTitle");
-					itemTitle = itemTitle == null ? "" : itemTitle;
-					String mediaFileHouseId = rs.getString("mediaFileHouseId");
-					Timestamp mediaCreated = rs.getTimestamp("mediaCreated");
-					try {
-						PlanAirProcessor p = new PlanAirProcessor(mediaFileHouseId);
-						if (p.getType() == MetadataType.TrafficMaterial) {
-							con[0] = p.process(con[0]);
-							String itemHouseId2 = p.getItemHouseId() == null ? "" : p.getItemHouseId();
-							String itemTitle2 = p.getItemTitle() == null ? "" : p.getItemTitle();
-							if (!itemHouseId2.equals(itemHouseId) || !itemTitle2.equals(itemTitle)) {
-
-								System.out.println(
-										"Item " + itemId + " : wrong | " + mediaCreated + ", " + mediaFileHouseId + ", " + itemHouseId + ", " + itemTitle);
-								System.out.println("\t good | " + itemHouseId2 + ", " + itemTitle2);
-							}
-
-						}
-					} catch (Exception e) {
-						e.printStackTrace();
+		final int[] count = { 0 };
+		final int[] processed = { 0 };
+		String sqlb = "select %s from vw_items where (mediatype = 'ECHO műsor' or mediatype = 'Műsor')"; // and mediaFileHouseId like '%%M109138A%%'
+		String sqlc = String.format(sqlb, "count(*)");
+		String sql = String.format(sqlb + "  order by mediacreated desc", "itemid, itemhouseid, itemtitle, mediaid, mediafilehouseid, mediacreated");
+
+		manager.executeQuery(sqlc, rs -> {
+			count[0] = rs.getInt(1);
+			return true;
+		}, null);
+		manager.executeQuery(sql, rs -> {
+			processed[0]++;
+			long itemId = rs.getLong("itemId");
+			String itemHouseId = rs.getString("itemHouseId");
+			itemHouseId = itemHouseId == null ? "" : itemHouseId;
+			String itemTitle = rs.getString("itemTitle");
+			itemTitle = itemTitle == null ? "" : itemTitle;
+			String mediaFileHouseId = rs.getString("mediaFileHouseId");
+			Timestamp mediaCreated = rs.getTimestamp("mediaCreated");
+			try {
+				if (mediaFileHouseId.length() > 7)
+					mediaFileHouseId = mediaFileHouseId.substring(0, 8);
+
+				PlanAirProcessor p = new PlanAirProcessor(mediaFileHouseId);
+				if (p.getType() == MetadataType.TrafficMaterial) {
+					con[0] = p.process(con[0]);
+					String itemHouseId2 = p.getItemHouseId() == null ? "" : p.getItemHouseId();
+					String itemTitle2 = p.getItemTitle() == null ? "" : p.getItemTitle();
+					if (!itemHouseId2.equals(itemHouseId) || !itemTitle2.equals(itemTitle)) {
+
+						System.out.println("Item " + itemId + " : wrong | " + mediaCreated + ", " + mediaFileHouseId + ", " + itemHouseId + ", " + itemTitle);
+						System.out.println("\t good | " + itemHouseId2 + ", " + itemTitle2 + ", " + (processed[0] * 100) / count[0] + "%");
+
 					}
-					return true;
-				}, null);
 
-		con[0].close();
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			processed[0]++;
+			return true;
+		}, null);
+
+		if (con[0] != null)
+			con[0].close();
 	}
 
 }
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 2d76a1b8..7e1d6836 100644
--- 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 {
 			if (media == null) {
 				logger.info(new MediaCubeUndoMarker(marker.getSessionID()), "Nincs feldolgozandó hiány.");
-				//				throw new Exception("Nincs feldolgozandó hiány.");
+				// throw new Exception("Nincs feldolgozandó hiány.");
 				jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));
 				return null;
 			}
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 fba24139..66c28363 100644
--- 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;
 
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
+import user.jobengine.server.messages.CancelRequest;
 import user.mediacube.metadata.interfaces.IMetadataProvider;
 import user.mediacube.metadata.interfaces.IMetadataProviderFactory;
 import user.mediacube.metadata.interfaces.MetadataProviderType;
@@ -35,10 +36,10 @@ public class FakeStep extends JobStep {
 				jobRuntime.incrementProgress((i + 1) * count);
 				Thread.sleep(100);
 
-				if (i == 2)
-					throw new Exception("TESZT");
+				jobEngine.sendMessage(new CancelRequest(jobRuntime.getId()));
 				logger.info("Progress {}", jobRuntime.getProgress());
 			}
+
 		} catch (Exception e) {
 			logger.error(jobRuntime.getMarker(), e.getMessage());
 			throw e;
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 c919b24f..62c64de1 100644
--- 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 {
 			if (context == null)
 				return;
+
 			if (context.isClosed() == false) {
 				context.close();
 			}
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 73db46f8..1f80e07d 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemManager.java
@@ -443,6 +443,11 @@ public class ItemManager extends MemoryCache implements IItemManager {
 		ResultSet rs = null;
 		PreparedStatement st = null;
 		try {
+			//st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+			//			rs.last();
+			//			int size = rs.getRow();
+			//			rs.beforeFirst();
+
 			st = connection.prepareStatement(query);
 			if (decorator != null)
 				decorator.decorate(st);