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

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
index c0448ffb0382b7dc3f5b792a95055087793ab03c..4ed74109f399dcb655d4a3e3a79b896642d1701d 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
@@ -1,6 +1,7 @@
 package user.jobengine.zk.model;\r
 \r
 import java.util.ArrayList;\r
+import java.util.Arrays;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 \r
@@ -17,6 +18,7 @@ import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.IItemManager;\r
 import user.jobengine.db.Item;\r
 import user.jobengine.db.ItemManager;\r
+import user.jobengine.db.Media;\r
 import user.jobengine.db.SearchResult;\r
 \r
 /**\r
@@ -68,6 +70,24 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
                docSelection.clear();\r
        }\r
 \r
+       protected SearchResult<ArchivedMedia> createSearchResult(int startPos, int endPos) {\r
+               SearchResult<ArchivedMedia> sr = this.itemManager.search(formatSearchValue(searchValue), searchFilters, orderBy, orderAscending, startPos, endPos);\r
+               return sr;\r
+       }\r
+\r
+       //TODO szarmaztatott osztalyba\r
+       protected SearchResult<ArchivedMedia> createSearchResult1(int startPos, int endPos) {\r
+               long mediaID = 0;\r
+               Media media = itemManager.getMedia(mediaID);\r
+               SearchResult<ArchivedMedia> sr = new SearchResult<>();\r
+               sr.setItemCount(1);\r
+               ArchivedMedia archivedMedia = new ArchivedMedia();\r
+               archivedMedia.setMedia(media);\r
+               archivedMedia.setItem(itemManager.getItem(media.getItemId()));\r
+               sr.setItems(Arrays.asList(archivedMedia));\r
+               return sr;\r
+       }\r
+\r
        public void fireListEvent() {\r
                clearCache();\r
                fireEvent(ListDataEvent.STRUCTURE_CHANGED, -1, -1);\r
@@ -153,7 +173,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
                        int endPos = (startPos + rowLimit);\r
                        endPos = ((this.resultSetSize < 0) || (endPos <= this.resultSetSize)) ? endPos : this.resultSetSize;\r
 \r
-                       SearchResult<ArchivedMedia> sr = this.itemManager.search(formatSearchValue(searchValue), searchFilters, orderBy, orderAscending, startPos, endPos);\r
+                       SearchResult<ArchivedMedia> sr = createSearchResult(startPos, endPos);\r
 \r
                        if (sr != null) {\r
                                if (this.resultSetSize < 0) {\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 26a10251b995a0dcde3b30d869e7b74d2e8c3713..b686def412abc52c8300cc9277fa81d02a4cd8d9 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -149,6 +149,14 @@ public class SearchModel extends AsyncBaseModel {
                        Column column = (Column) child;\r
                        column.addEventListener("onSort", evt -> doSort(evt));\r
                }\r
+               //TODO\r
+               //? mediaID = Executions.getCurrent().getParameter("showMediaID")\r
+               // doSearchByMedia(mediaID)\r
+               // selectMediaArchive()\r
+\r
+               //TODO ??? kellhet\r
+               //NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");\r
+\r
        }\r
 \r
        @Command\r