From 4bdf85efff0f97054876bb04055972f1ae484a31 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 18 Jul 2018 08:26:01 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31190

---
 .../src/user/jobengine/db/ItemDAOEx.java      |  6 ++--
 .../src/user/jobengine/db/Media.java          | 31 ++++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index 098cc1d6..a7ce69cd 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -76,7 +76,8 @@ public class ItemDAOEx {
 		StringBuilder sql = new StringBuilder();
 		sql.append("SELECT ");
 		sql.append(columNames);
-		sql.append(" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md WHERE i.id = md.itemid AND m.id = md.mediaid AND mf.id = md.mediafileid");
+		sql.append(
+				" FROM ITEM i, MEDIA m, MEDIAFILE mf, MEDIADESCRIPTION md, VW_MEDIAFILES vw_mf WHERE i.id = md.itemid AND m.id = md.mediaid AND mf.id = md.mediafileid AND m.id=vw_mf.mediaid");
 		if (typeIDs != null) {
 			sql.append(" AND m.itemtypeid IN ");
 			sql.append(typeCriteria.toString());
@@ -161,7 +162,8 @@ public class ItemDAOEx {
 		columns.append("m.itemtypeid mediaitemtypeid,");
 		columns.append("m.houseid mediahouseid,");
 		columns.append("m.title mediatitle,");
-		columns.append("mf.houseid mediafilehouseid");
+		columns.append("mf.houseid mediafilehouseid,");
+		columns.append("vw_mf.mediafilecount");
 		return columns.toString();
 	}
 
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
index 3d2fdbc3..a556b832 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java
@@ -26,6 +26,8 @@ public class Media extends DynamicAttributes {
 	private String title = null;
 	private boolean isPartialEnabled;
 	private byte[] poster = null;
+	private String mediaFilesName;
+	private int mediaFilesCount = -1;
 
 	public void appendMediaFile(MediaFile mediaFile) {
 		checkParameter("MediaFile", mediaFile, true);
@@ -72,19 +74,24 @@ public class Media extends DynamicAttributes {
 	}
 
 	public int getMediaFilesCount() {
-		return getMediaFiles() == null ? 0 : getMediaFiles().size();
+		if (mediaFilesCount == -1)
+			mediaFilesCount = getMediaFiles() == null ? 0 : getMediaFiles().size();
+		return mediaFilesCount;
 	}
 
 	public String getMediaFilesName() {
-		String result = null;
-		if (getMediaFiles() != null && getMediaFiles().size() > 0) {
-			for (MediaFile mf : getMediaFiles()) {
-				result = mf.getHouseId();
-				if (result != null)
-					break;
+		if (mediaFilesName == null) {
+			List<MediaFile> files = getMediaFiles();
+			if (files != null && files.size() > 0) {
+				for (MediaFile mf : files) {
+					mediaFilesName = mf.getHouseId();
+					if (mediaFilesName != null)
+						break;
+				}
 			}
 		}
-		return result;
+
+		return mediaFilesName;
 	}
 
 	public byte[] getPoster() {
@@ -129,6 +136,14 @@ public class Media extends DynamicAttributes {
 		this.mediaFiles = mediaFiles;
 	}
 
+	public void setMediaFilesCount(int mediaFilesCount) {
+		this.mediaFilesCount = mediaFilesCount;
+	}
+
+	public void setMediaFilesName(String mediaFilesName) {
+		this.mediaFilesName = mediaFilesName;
+	}
+
 	public void setPoster(byte[] poster) {
 		this.poster = poster;
 	}
-- 
2.54.0