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

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 098cc1d61426f33ce568760507a35750d6314d68..a7ce69cd341b10032225caefea8f551ff99637dd 100644 (file)
--- 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();\r
                sql.append("SELECT ");\r
                sql.append(columNames);\r
-               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");\r
+               sql.append(\r
+                               " 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");\r
                if (typeIDs != null) {\r
                        sql.append(" AND m.itemtypeid IN ");\r
                        sql.append(typeCriteria.toString());\r
@@ -161,7 +162,8 @@ public class ItemDAOEx {
                columns.append("m.itemtypeid mediaitemtypeid,");\r
                columns.append("m.houseid mediahouseid,");\r
                columns.append("m.title mediatitle,");\r
-               columns.append("mf.houseid mediafilehouseid");\r
+               columns.append("mf.houseid mediafilehouseid,");\r
+               columns.append("vw_mf.mediafilecount");\r
                return columns.toString();\r
        }\r
 \r

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 3d2fdbc330b418279913f9ed9b16472f0732552f..a556b8323097e36070285d39a7a05d3aa854edd9 100644 (file)
--- 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;
        }